Miscellaneous fixes (#1201)

eth-cscs · Oct 25, 2024 · 86ac3ce · 86ac3ce
1 parent ba5ca6d
commit 86ac3ce
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 10 deletions.
diff --git a/include/dlaf/eigensolver/band_to_tridiag.h b/include/dlaf/eigensolver/band_to_tridiag.h
@@ -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;
@@ -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;

diff --git a/include/dlaf/eigensolver/band_to_tridiag/mc.h b/include/dlaf/eigensolver/band_to_tridiag/mc.h
@@ -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>

diff --git a/include/dlaf/eigensolver/gen_to_std/impl.h b/include/dlaf/eigensolver/gen_to_std/impl.h
@@ -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));
@@ -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));

diff --git a/include/dlaf/eigensolver/tridiag_solver/merge.h b/include/dlaf/eigensolver/tridiag_solver/merge.h
@@ -1084,7 +1084,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);
@@ -1837,7 +1836,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),

diff --git a/include/dlaf/matrix/panel.h b/include/dlaf/matrix/panel.h
@@ -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);
     }
   }
 

diff --git a/include/dlaf/multiplication/hermitian.h b/include/dlaf/multiplication/hermitian.h
@@ -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;
@@ -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;

diff --git a/miniapp/include/dlaf/miniapp/options.h b/miniapp/include/dlaf/miniapp/options.h
@@ -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]));

diff --git a/src/eigensolver/bt_band_to_tridiag/gpu.cpp b/src/eigensolver/bt_band_to_tridiag/gpu.cpp
@@ -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 {

diff --git a/test/unit/c_api/eigensolver/test_eigensolver_c_api.cpp b/test/unit/c_api/eigensolver/test_eigensolver_c_api.cpp
@@ -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 = [&]() {