From 6c685776132ed8153981a91567113f3e0db0c79e Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 3 Apr 2019 05:04:16 +0200 Subject: [PATCH] Test SCALAPACK with -Werror --- tests/scalapack/scalapack_06.cc | 2 +- tests/scalapack/scalapack_06a.cc | 2 +- tests/scalapack/scalapack_06b.cc | 2 +- tests/scalapack/scalapack_06c.cc | 2 +- tests/scalapack/scalapack_12_a.cc | 6 ++++-- tests/scalapack/scalapack_12_b.cc | 6 ++++-- tests/scalapack/scalapack_12_c.cc | 6 ++++-- tests/scalapack/scalapack_12_d.cc | 6 ++++-- tests/scalapack/scalapack_13_a.cc | 6 ++++-- tests/scalapack/scalapack_13_b.cc | 6 ++++-- tests/scalapack/scalapack_14_a.cc | 6 ++++-- tests/scalapack/scalapack_14_b.cc | 6 ++++-- tests/scalapack/scalapack_15.cc | 2 +- tests/scalapack/scalapack_15_a.cc | 2 +- 14 files changed, 38 insertions(+), 22 deletions(-) diff --git a/tests/scalapack/scalapack_06.cc b/tests/scalapack/scalapack_06.cc index 78aee52954..1c6a434b71 100644 --- a/tests/scalapack/scalapack_06.cc +++ b/tests/scalapack/scalapack_06.cc @@ -104,7 +104,7 @@ test(const unsigned int size, &*work.begin(), &lwork, &info); - lwork = work[0]; + lwork = static_cast(work[0]); work.resize(lwork); syev(&jobz, &uplo, diff --git a/tests/scalapack/scalapack_06a.cc b/tests/scalapack/scalapack_06a.cc index 39cf9f63f6..7584d7041c 100644 --- a/tests/scalapack/scalapack_06a.cc +++ b/tests/scalapack/scalapack_06a.cc @@ -100,7 +100,7 @@ test(const unsigned int size, &*work.begin(), &lwork, &info); - lwork = work[0]; + lwork = static_cast(work[0]); work.resize(lwork); syev(&jobz, &uplo, diff --git a/tests/scalapack/scalapack_06b.cc b/tests/scalapack/scalapack_06b.cc index 707aecfeeb..4d02c8399f 100644 --- a/tests/scalapack/scalapack_06b.cc +++ b/tests/scalapack/scalapack_06b.cc @@ -105,7 +105,7 @@ test(const unsigned int size, &*work.begin(), &lwork, &info); - lwork = work[0]; + lwork = static_cast(work[0]); work.resize(lwork); syev(&jobz, &uplo, diff --git a/tests/scalapack/scalapack_06c.cc b/tests/scalapack/scalapack_06c.cc index 37a376c74c..d7c59d22fd 100644 --- a/tests/scalapack/scalapack_06c.cc +++ b/tests/scalapack/scalapack_06c.cc @@ -100,7 +100,7 @@ test(const unsigned int size, &*work.begin(), &lwork, &info); - lwork = work[0]; + lwork = static_cast(work[0]); work.resize(lwork); syev(&jobz, &uplo, diff --git a/tests/scalapack/scalapack_12_a.cc b/tests/scalapack/scalapack_12_a.cc index 8955491b6e..b89b755b45 100644 --- a/tests/scalapack/scalapack_12_a.cc +++ b/tests/scalapack/scalapack_12_a.cc @@ -44,8 +44,10 @@ test() std::cout << std::setprecision(10); ConditionalOStream pcout(std::cout, (this_mpi_process == 0)); - const unsigned int proc_rows = std::floor(std::sqrt(n_mpi_processes)); - const unsigned int proc_columns = std::floor(n_mpi_processes / proc_rows); + const auto proc_rows = + static_cast(std::floor(std::sqrt(n_mpi_processes))); + const auto proc_columns = + static_cast(std::floor(n_mpi_processes / proc_rows)); // create 2d process grid std::shared_ptr grid = std::make_shared(mpi_communicator, diff --git a/tests/scalapack/scalapack_12_b.cc b/tests/scalapack/scalapack_12_b.cc index 0f4cdb466c..be7843782a 100644 --- a/tests/scalapack/scalapack_12_b.cc +++ b/tests/scalapack/scalapack_12_b.cc @@ -45,8 +45,10 @@ test() std::cout << std::setprecision(10); ConditionalOStream pcout(std::cout, (this_mpi_process == 0)); - const unsigned int proc_rows = std::floor(std::sqrt(n_mpi_processes)); - const unsigned int proc_columns = std::floor(n_mpi_processes / proc_rows); + const auto proc_rows = + static_cast(std::floor(std::sqrt(n_mpi_processes))); + const auto proc_columns = + static_cast(std::floor(n_mpi_processes / proc_rows)); // create 2d process grid std::shared_ptr grid = std::make_shared(mpi_communicator, diff --git a/tests/scalapack/scalapack_12_c.cc b/tests/scalapack/scalapack_12_c.cc index 498a7ffc38..71a6c7ed49 100644 --- a/tests/scalapack/scalapack_12_c.cc +++ b/tests/scalapack/scalapack_12_c.cc @@ -45,8 +45,10 @@ test() std::cout << std::setprecision(10); ConditionalOStream pcout(std::cout, (this_mpi_process == 0)); - const unsigned int proc_rows = std::floor(std::sqrt(n_mpi_processes)); - const unsigned int proc_columns = std::floor(n_mpi_processes / proc_rows); + const auto proc_rows = + static_cast(std::floor(std::sqrt(n_mpi_processes))); + const auto proc_columns = + static_cast(std::floor(n_mpi_processes / proc_rows)); // create 2d process grid std::shared_ptr grid = std::make_shared(mpi_communicator, diff --git a/tests/scalapack/scalapack_12_d.cc b/tests/scalapack/scalapack_12_d.cc index 2f4f8e6d08..81202354e5 100644 --- a/tests/scalapack/scalapack_12_d.cc +++ b/tests/scalapack/scalapack_12_d.cc @@ -45,8 +45,10 @@ test() std::cout << std::setprecision(10); ConditionalOStream pcout(std::cout, (this_mpi_process == 0)); - const unsigned int proc_rows = std::floor(std::sqrt(n_mpi_processes)); - const unsigned int proc_columns = std::floor(n_mpi_processes / proc_rows); + const auto proc_rows = + static_cast(std::floor(std::sqrt(n_mpi_processes))); + const auto proc_columns = + static_cast(std::floor(n_mpi_processes / proc_rows)); // create 2d process grid std::shared_ptr grid = std::make_shared(mpi_communicator, diff --git a/tests/scalapack/scalapack_13_a.cc b/tests/scalapack/scalapack_13_a.cc index e3d55299ba..81c73d4809 100644 --- a/tests/scalapack/scalapack_13_a.cc +++ b/tests/scalapack/scalapack_13_a.cc @@ -44,8 +44,10 @@ test(const unsigned int block_size_i, const unsigned int block_size_j) std::cout << std::setprecision(10); ConditionalOStream pcout(std::cout, (this_mpi_process == 0)); - const unsigned int proc_rows = std::floor(std::sqrt(n_mpi_processes)); - const unsigned int proc_columns = std::floor(n_mpi_processes / proc_rows); + const auto proc_rows = + static_cast(std::floor(std::sqrt(n_mpi_processes))); + const auto proc_columns = + static_cast(std::floor(n_mpi_processes / proc_rows)); // create 2d process grid std::shared_ptr grid = std::make_shared(mpi_communicator, diff --git a/tests/scalapack/scalapack_13_b.cc b/tests/scalapack/scalapack_13_b.cc index 20fd3bd4bc..5334bdbc7a 100644 --- a/tests/scalapack/scalapack_13_b.cc +++ b/tests/scalapack/scalapack_13_b.cc @@ -44,8 +44,10 @@ test(const unsigned int block_size_i, const unsigned int block_size_j) std::cout << std::setprecision(10); ConditionalOStream pcout(std::cout, (this_mpi_process == 0)); - const unsigned int proc_rows = std::floor(std::sqrt(n_mpi_processes)); - const unsigned int proc_columns = std::floor(n_mpi_processes / proc_rows); + const auto proc_rows = + static_cast(std::floor(std::sqrt(n_mpi_processes))); + const auto proc_columns = + static_cast(std::floor(n_mpi_processes / proc_rows)); // create 2d process grid std::shared_ptr grid = std::make_shared(mpi_communicator, diff --git a/tests/scalapack/scalapack_14_a.cc b/tests/scalapack/scalapack_14_a.cc index 81324ccf31..c34e3e1ebd 100644 --- a/tests/scalapack/scalapack_14_a.cc +++ b/tests/scalapack/scalapack_14_a.cc @@ -45,8 +45,10 @@ test(const unsigned int block_size_i, const unsigned int block_size_j) std::cout << std::setprecision(10); ConditionalOStream pcout(std::cout, (this_mpi_process == 0)); - const unsigned int proc_rows = std::floor(std::sqrt(n_mpi_processes)); - const unsigned int proc_columns = std::floor(n_mpi_processes / proc_rows); + const auto proc_rows = + static_cast(std::floor(std::sqrt(n_mpi_processes))); + const auto proc_columns = + static_cast(std::floor(n_mpi_processes / proc_rows)); // create 2d process grid const std::vector sizes = {{400, 500}}; std::shared_ptr grid = diff --git a/tests/scalapack/scalapack_14_b.cc b/tests/scalapack/scalapack_14_b.cc index e32f5c6538..d79e17996a 100644 --- a/tests/scalapack/scalapack_14_b.cc +++ b/tests/scalapack/scalapack_14_b.cc @@ -45,8 +45,10 @@ test(const unsigned int block_size_i, const unsigned int block_size_j) std::cout << std::setprecision(10); ConditionalOStream pcout(std::cout, (this_mpi_process == 0)); - const unsigned int proc_rows = std::floor(std::sqrt(n_mpi_processes)); - const unsigned int proc_columns = std::floor(n_mpi_processes / proc_rows); + const auto proc_rows = + static_cast(std::floor(std::sqrt(n_mpi_processes))); + const auto proc_columns = + static_cast(std::floor(n_mpi_processes / proc_rows)); // create 2d process grid const std::vector sizes = {{400, 500}}; std::shared_ptr grid = diff --git a/tests/scalapack/scalapack_15.cc b/tests/scalapack/scalapack_15.cc index e29fc69cbb..1dd40e682b 100644 --- a/tests/scalapack/scalapack_15.cc +++ b/tests/scalapack/scalapack_15.cc @@ -128,7 +128,7 @@ test(const unsigned int size, &liwork, &info); - lwork = work[0]; + lwork = static_cast(work[0]); work.resize(lwork); liwork = iwork[0]; iwork.resize(liwork); diff --git a/tests/scalapack/scalapack_15_a.cc b/tests/scalapack/scalapack_15_a.cc index 59bc9368c8..515be289b3 100644 --- a/tests/scalapack/scalapack_15_a.cc +++ b/tests/scalapack/scalapack_15_a.cc @@ -128,7 +128,7 @@ test(const unsigned int size, &liwork, &info); - lwork = work[0]; + lwork = static_cast(work[0]); work.resize(lwork); liwork = iwork[0]; iwork.resize(liwork); -- 2.39.5