Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous fixes #1201

Merged
merged 5 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions include/dlaf/eigensolver/band_to_tridiag.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ TridiagResult<T, Device::CPU> band_to_tridiagonal(blas::Uplo uplo, SizeType band
switch (uplo) {
case blas::Uplo::Lower:
return BandToTridiag<B, D, T>::call_L(band_size, mat_a);
break;
case blas::Uplo::Upper:
DLAF_UNIMPLEMENTED(uplo);
break;
Expand Down Expand Up @@ -161,7 +160,6 @@ TridiagResult<T, Device::CPU> band_to_tridiagonal(comm::CommunicatorGrid& grid,
switch (uplo) {
case blas::Uplo::Lower:
return BandToTridiag<backend, device, T>::call_L(grid, band_size, mat_a);
break;
case blas::Uplo::Upper:
DLAF_UNIMPLEMENTED(uplo);
break;
Expand Down
1 change: 1 addition & 0 deletions include/dlaf/eigensolver/band_to_tridiag/mc.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <dlaf/common/vector.h>
#include <dlaf/communication/communicator.h>
#include <dlaf/communication/communicator_grid.h>
#include <dlaf/communication/datatypes.h>
#include <dlaf/communication/index.h>
#include <dlaf/communication/kernels.h>
#include <dlaf/eigensolver/band_to_tridiag/api.h>
Expand Down
2 changes: 0 additions & 2 deletions include/dlaf/eigensolver/gen_to_std/impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,6 @@ void GenToStd<backend, device, T>::call_L(comm::CommunicatorGrid& grid, Matrix<T
if (kk_rank.col() == this_rank.col()) {
// panel partial update
for (SizeType i_local = at_offset.rows(); i_local < distr.localNrTiles().rows(); ++i_local) {
const LocalTileIndex local_idx(Coord::Row, i_local);
const LocalTileIndex ik(i_local, distr.localTileFromGlobalTile<Coord::Col>(k));

hemmPanelTile<backend>(thread_priority::high, a_diag, mat_l.read(ik), mat_a.readwrite(ik));
Expand Down Expand Up @@ -759,7 +758,6 @@ void GenToStd<backend, device, T>::call_U(comm::CommunicatorGrid& grid, Matrix<T
if (kk_rank.row() == this_rank.row()) {
// panel partial update
for (SizeType j_local = at_offset.cols(); j_local < distr.localNrTiles().cols(); ++j_local) {
const LocalTileIndex local_idx(Coord::Col, j_local);
const LocalTileIndex ki(distr.localTileFromGlobalTile<Coord::Row>(k), j_local);

hemmPanelTile<backend>(thread_priority::high, a_diag, mat_u.read(ki), mat_a.readwrite(ki));
Expand Down
2 changes: 0 additions & 2 deletions include/dlaf/eigensolver/tridiag_solver/merge.h
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,6 @@ void mergeSubproblems(const SizeType i_begin, const SizeType i_split, const Size
namespace di = dlaf::internal;
using pika::execution::thread_priority;

const GlobalTileIndex idx_gl_begin(i_begin, i_begin);
const LocalTileIndex idx_loc_begin(i_begin, i_begin);
const SizeType nrtiles = i_end - i_begin;
const LocalTileSize sz_loc_tiles(nrtiles, nrtiles);
Expand Down Expand Up @@ -1834,7 +1833,6 @@ void mergeDistSubproblems(comm::CommunicatorPipeline<comm::CommunicatorType::Ful
const SizeType n_lower = global_tile_element_distance<Coord::Row>(dist, i_split, i_end);

// The local size of the subproblem
const GlobalTileIndex idx_gl_begin(i_begin, i_begin);
const LocalTileIndex idx_loc_begin{dist.next_local_tile_from_global_tile<Coord::Row>(i_begin),
dist.next_local_tile_from_global_tile<Coord::Col>(i_begin)};
const LocalTileIndex idx_loc_end{dist.next_local_tile_from_global_tile<Coord::Row>(i_end),
Expand Down
2 changes: 2 additions & 0 deletions include/dlaf/matrix/panel.h
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ struct Panel<axis, const T, D, StoreTransposed::No> {
return {mat_size - i_tile * mb, nb};
case Coord::Row:
return {mb, mat_size - i_tile * nb};
default:
return DLAF_UNREACHABLE(LocalElementSize);
}
}

Expand Down
2 changes: 0 additions & 2 deletions include/dlaf/multiplication/hermitian.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ void hermitian_multiplication(blas::Side side, blas::Uplo uplo, const T alpha, M
switch (uplo) {
case blas::Uplo::Lower:
return multiplication::internal::Hermitian<B, D, T>::call_LL(alpha, mat_a, mat_b, beta, mat_c);
break;
case blas::Uplo::Upper:
DLAF_UNIMPLEMENTED(uplo);
break;
Expand Down Expand Up @@ -130,7 +129,6 @@ void hermitian_multiplication(comm::CommunicatorGrid& grid, blas::Side side, bla
case blas::Uplo::Lower:
return multiplication::internal::Hermitian<B, D, T>::call_LL(grid, alpha, mat_a, mat_b, beta,
mat_c);
break;
case blas::Uplo::Upper:
DLAF_UNIMPLEMENTED(uplo);
break;
Expand Down
2 changes: 1 addition & 1 deletion miniapp/include/dlaf/miniapp/options.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ T stringToBlasEnum(const std::string& option_name, const std::string& x,
}
}
std::string option_name_dashes = "--" + option_name;
DLAF_MINIAPP_INVALID_OPTION_VALUE(option_name, x, valid_values_stream.str());
DLAF_MINIAPP_INVALID_OPTION_VALUE(option_name_dashes, x, valid_values_stream.str());
}

return static_cast<T>(std::toupper(x[0]));
Expand Down
2 changes: 2 additions & 0 deletions src/eigensolver/bt_band_to_tridiag/gpu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// SPDX-License-Identifier: BSD-3-Clause
//

#include <complex>

#include <dlaf/eigensolver/bt_band_to_tridiag/impl.h>

namespace dlaf::eigensolver::internal {
Expand Down
1 change: 0 additions & 1 deletion test/unit/c_api/eigensolver/test_eigensolver_c_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ void testEigensolver(const blas::Uplo uplo, const SizeType m, const SizeType mb,
// Here we need to resume it manually to build the matrices with DLA-Future
pika::resume();

const LocalElementSize size(m, m);
const TileElementSize block_size(mb, mb);

Matrix<const T, Device::CPU> reference = [&]() {
Expand Down
Loading