From 792a31b8be4d0637d9b95b3fe576f29af5cd3507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Zuzek?= Date: Fri, 8 Jul 2022 13:42:06 +0200 Subject: [PATCH 1/5] Fix deprecated Kokkos::InitArguments --- ...okkosKernels_Example_Distance2GraphColor.cpp | 4 +++- ...KokkosKernels_Example_HashmapAccumulator.cpp | 4 +++- .../blas/blas1/KokkosBlas_dot_mv_perf_test.cpp | 4 +++- .../blas/blas1/KokkosBlas_dot_perf_test.cpp | 4 +++- .../blas1/KokkosBlas_team_dot_perf_test.cpp | 4 +++- .../blas/blas2/KokkosBlas2_gemv_perf_test.cpp | 4 +++- .../KokkosBlas3_gemm_standalone_perf_test.cpp | 4 +++- perf_test/graph/KokkosGraph_color.cpp | 4 +++- perf_test/graph/KokkosGraph_color_d2.cpp | 4 +++- perf_test/graph/KokkosGraph_triangle.cpp | 4 +++- perf_test/sparse/KokkosSparse_block_pcg.cpp | 8 +++++--- perf_test/sparse/KokkosSparse_pcg.cpp | 17 ++++++++--------- perf_test/sparse/KokkosSparse_spadd.cpp | 4 +++- perf_test/sparse/KokkosSparse_spgemm.cpp | 4 +++- perf_test/sparse/KokkosSparse_spgemm_jacobi.cpp | 4 +++- 15 files changed, 52 insertions(+), 25 deletions(-) diff --git a/example/graph/KokkosKernels_Example_Distance2GraphColor.cpp b/example/graph/KokkosKernels_Example_Distance2GraphColor.cpp index 99b398e40c..e921ed06cd 100644 --- a/example/graph/KokkosKernels_Example_Distance2GraphColor.cpp +++ b/example/graph/KokkosKernels_Example_Distance2GraphColor.cpp @@ -526,7 +526,9 @@ int main(int argc, char* argv[]) { params.use_openmp; // Assumption is that use_openmp variable is provided // as number of threads const int device_id = 0; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); // Print out information about the configuration of the run if verbose_level // >= 5 diff --git a/example/hashmap_accumulator/KokkosKernels_Example_HashmapAccumulator.cpp b/example/hashmap_accumulator/KokkosKernels_Example_HashmapAccumulator.cpp index 9909c55720..aec112b584 100644 --- a/example/hashmap_accumulator/KokkosKernels_Example_HashmapAccumulator.cpp +++ b/example/hashmap_accumulator/KokkosKernels_Example_HashmapAccumulator.cpp @@ -384,7 +384,9 @@ int main(int argc, char* argv[]) { params.use_openmp; // Assumption is that use_openmp variable is provided // as number of threads - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); if (params.verbose) { Kokkos::print_configuration(std::cout); diff --git a/perf_test/blas/blas1/KokkosBlas_dot_mv_perf_test.cpp b/perf_test/blas/blas1/KokkosBlas_dot_mv_perf_test.cpp index a57b534f32..7b353cf160 100644 --- a/perf_test/blas/blas1/KokkosBlas_dot_mv_perf_test.cpp +++ b/perf_test/blas/blas1/KokkosBlas_dot_mv_perf_test.cpp @@ -199,7 +199,9 @@ int main(int argc, char** argv) { const int num_threads = std::max(params.use_openmp, params.use_threads); - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); bool useThreads = params.use_threads != 0; bool useOMP = params.use_openmp != 0; diff --git a/perf_test/blas/blas1/KokkosBlas_dot_perf_test.cpp b/perf_test/blas/blas1/KokkosBlas_dot_perf_test.cpp index a46f4d6b20..50840ddea6 100644 --- a/perf_test/blas/blas1/KokkosBlas_dot_perf_test.cpp +++ b/perf_test/blas/blas1/KokkosBlas_dot_perf_test.cpp @@ -196,7 +196,9 @@ int main(int argc, char** argv) { const int num_threads = std::max(params.use_openmp, params.use_threads); - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); bool useThreads = params.use_threads != 0; bool useOMP = params.use_openmp != 0; diff --git a/perf_test/blas/blas1/KokkosBlas_team_dot_perf_test.cpp b/perf_test/blas/blas1/KokkosBlas_team_dot_perf_test.cpp index f8a2a5aa43..eeb49d6502 100644 --- a/perf_test/blas/blas1/KokkosBlas_team_dot_perf_test.cpp +++ b/perf_test/blas/blas1/KokkosBlas_team_dot_perf_test.cpp @@ -188,7 +188,9 @@ int main(int argc, char** argv) { const int num_threads = std::max(params.use_openmp, params.use_threads); - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); bool useThreads = params.use_threads != 0; bool useOMP = params.use_openmp != 0; diff --git a/perf_test/blas/blas2/KokkosBlas2_gemv_perf_test.cpp b/perf_test/blas/blas2/KokkosBlas2_gemv_perf_test.cpp index a82ece030b..98e974229b 100644 --- a/perf_test/blas/blas2/KokkosBlas2_gemv_perf_test.cpp +++ b/perf_test/blas/blas2/KokkosBlas2_gemv_perf_test.cpp @@ -180,7 +180,9 @@ int main(int argc, char** argv) { const int num_threads = std::max(params.use_openmp, params.use_threads); const int device_id = std::max(params.use_cuda, params.use_hip) - 1; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); // Create booleans to handle pthreads, openmp and cuda params and initialize // to true; diff --git a/perf_test/blas/blas3/KokkosBlas3_gemm_standalone_perf_test.cpp b/perf_test/blas/blas3/KokkosBlas3_gemm_standalone_perf_test.cpp index 595292ebd7..6497db8de3 100644 --- a/perf_test/blas/blas3/KokkosBlas3_gemm_standalone_perf_test.cpp +++ b/perf_test/blas/blas3/KokkosBlas3_gemm_standalone_perf_test.cpp @@ -158,7 +158,9 @@ int main(int argc, char** argv) { // as number of threads const int device_id = params.use_cuda - 1; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); bool useOMP = params.use_openmp != 0; bool useCUDA = params.use_cuda != 0; diff --git a/perf_test/graph/KokkosGraph_color.cpp b/perf_test/graph/KokkosGraph_color.cpp index cc19c19675..8a97d77a38 100644 --- a/perf_test/graph/KokkosGraph_color.cpp +++ b/perf_test/graph/KokkosGraph_color.cpp @@ -536,7 +536,9 @@ int main(int argc, char **argv) { params.use_openmp; // Assumption is that use_openmp variable is provided // as number of threads const int device_id = std::max(params.use_cuda, params.use_hip) - 1; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); Kokkos::print_configuration(std::cout); #if defined(KOKKOS_ENABLE_OPENMP) diff --git a/perf_test/graph/KokkosGraph_color_d2.cpp b/perf_test/graph/KokkosGraph_color_d2.cpp index b47fe21a70..b824ced38a 100644 --- a/perf_test/graph/KokkosGraph_color_d2.cpp +++ b/perf_test/graph/KokkosGraph_color_d2.cpp @@ -632,7 +632,9 @@ int main(int argc, char* argv[]) { device_id = params.use_cuda - 1; else if (params.use_hip) device_id = params.use_hip - 1; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); // Print out verbose information about the configuration of the run. // Kokkos::print_configuration(std::cout); diff --git a/perf_test/graph/KokkosGraph_triangle.cpp b/perf_test/graph/KokkosGraph_triangle.cpp index 17e4a08de4..90ec6c2a61 100644 --- a/perf_test/graph/KokkosGraph_triangle.cpp +++ b/perf_test/graph/KokkosGraph_triangle.cpp @@ -296,7 +296,9 @@ int main(int argc, char **argv) { params.use_openmp; // Assumption is that use_openmp variable is provided // as number of threads const int device_id = 0; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); #if defined(KOKKOS_ENABLE_OPENMP) diff --git a/perf_test/sparse/KokkosSparse_block_pcg.cpp b/perf_test/sparse/KokkosSparse_block_pcg.cpp index 25d7a65fdd..73f4683525 100644 --- a/perf_test/sparse/KokkosSparse_block_pcg.cpp +++ b/perf_test/sparse/KokkosSparse_block_pcg.cpp @@ -381,7 +381,7 @@ int main(int argc, char **argv) { int cmdline[CMD_COUNT]; char *mtx_bin_file = NULL; int block_size = 5; - struct Kokkos::InitArguments kargs; + struct Kokkos::InitializationSettings kargs; for (int i = 0; i < CMD_COUNT; ++i) cmdline[i] = 0; @@ -389,9 +389,11 @@ int main(int argc, char **argv) { if (0 == Test::string_compare_no_case(argv[i], "--serial")) { cmdline[CMD_USE_SERIAL] = 1; } else if (0 == Test::string_compare_no_case(argv[i], "--threads")) { - kargs.num_threads = cmdline[CMD_USE_THREADS] = atoi(argv[++i]); + cmdline[CMD_USE_THREADS] = atoi(argv[++i]); + kargs.set_num_threads(cmdline[CMD_USE_THREADS]); } else if (0 == Test::string_compare_no_case(argv[i], "--openmp")) { - kargs.num_threads = cmdline[CMD_USE_OPENMP] = atoi(argv[++i]); + cmdline[CMD_USE_OPENMP] = atoi(argv[++i]); + kargs.set_num_threads(cmdline[CMD_USE_OPENMP]); } else if (0 == Test::string_compare_no_case(argv[i], "--cuda")) { cmdline[CMD_USE_CUDA] = 1; } else if (0 == Test::string_compare_no_case(argv[i], "--mtx")) { diff --git a/perf_test/sparse/KokkosSparse_pcg.cpp b/perf_test/sparse/KokkosSparse_pcg.cpp index b485158125..51c2cbb01b 100644 --- a/perf_test/sparse/KokkosSparse_pcg.cpp +++ b/perf_test/sparse/KokkosSparse_pcg.cpp @@ -370,17 +370,16 @@ int main(int argc, char **argv) { return 0; } - Kokkos::InitArguments init_args; // Construct with default args, change - // members based on exec space + // Construct with default args, change members based on exec space + Kokkos::InitializationSettings init_args; - init_args.device_id = cmdline[CMD_DEVICE]; + init_args.set_device_id(cmdline[CMD_DEVICE]); + init_args.set_num_threads( + std::max(cmdline[CMD_USE_THREADS], cmdline[CMD_USE_OPENMP])); if (cmdline[CMD_USE_NUMA] && cmdline[CMD_USE_CORE_PER_NUMA]) { - init_args.num_threads = - std::max(cmdline[CMD_USE_THREADS], cmdline[CMD_USE_OPENMP]); - init_args.num_numa = cmdline[CMD_USE_NUMA]; - } else { - init_args.num_threads = - std::max(cmdline[CMD_USE_THREADS], cmdline[CMD_USE_OPENMP]); + KokkosKernels::Impl::throw_runtime_exception( + "NUMA init arg is no longer supported by Kokkos"); + // init_args.num_numa = cmdline[CMD_USE_NUMA]; } Kokkos::initialize(init_args); diff --git a/perf_test/sparse/KokkosSparse_spadd.cpp b/perf_test/sparse/KokkosSparse_spadd.cpp index 5a273e6694..5448843168 100644 --- a/perf_test/sparse/KokkosSparse_spadd.cpp +++ b/perf_test/sparse/KokkosSparse_spadd.cpp @@ -476,7 +476,9 @@ int main(int argc, char** argv) { // as number of threads const int device_id = params.use_cuda - 1; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); // Kokkos::print_configuration(std::cout); // First, make sure that requested TPL (if any) is actually available diff --git a/perf_test/sparse/KokkosSparse_spgemm.cpp b/perf_test/sparse/KokkosSparse_spgemm.cpp index 9fada4caaa..da705fcdf2 100644 --- a/perf_test/sparse/KokkosSparse_spgemm.cpp +++ b/perf_test/sparse/KokkosSparse_spgemm.cpp @@ -294,7 +294,9 @@ int main(int argc, char** argv) { const int device_id = params.use_cuda ? params.use_cuda - 1 : params.use_hip - 1; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); Kokkos::print_configuration(std::cout); #if defined(KOKKOS_ENABLE_OPENMP) diff --git a/perf_test/sparse/KokkosSparse_spgemm_jacobi.cpp b/perf_test/sparse/KokkosSparse_spgemm_jacobi.cpp index 98942acb27..aa3969e6c8 100644 --- a/perf_test/sparse/KokkosSparse_spgemm_jacobi.cpp +++ b/perf_test/sparse/KokkosSparse_spgemm_jacobi.cpp @@ -259,7 +259,9 @@ int main(int argc, char** argv) { const int num_threads = std::max(params.use_openmp, params.use_threads); const int device_id = params.use_cuda - 1; - Kokkos::initialize(Kokkos::InitArguments(num_threads, -1, device_id)); + Kokkos::initialize(Kokkos::InitializationSettings() + .set_num_threads(num_threads) + .set_device_id(device_id)); Kokkos::print_configuration(std::cout); #if defined(KOKKOS_ENABLE_OPENMP) From 01b14d209ffe0a208712d1fe76ff71e494b2bc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Zuzek?= Date: Mon, 11 Jul 2022 20:29:48 +0200 Subject: [PATCH 2/5] Fix: don't use Kokkos private headers --- src/graph/impl/KokkosGraph_Distance2Color_impl.hpp | 1 - src/sparse/KokkosSparse_csc2csr.hpp | 9 +-------- src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp | 1 - unit_test/common/Test_Common_set_bit_count.hpp | 1 - unit_test/sparse/Test_Sparse_spgemm.hpp | 1 - unit_test/sparse/Test_Sparse_spgemm_jacobi.hpp | 1 - unit_test/sparse/Test_Sparse_spiluk.hpp | 1 - unit_test/sparse/Test_Sparse_sptrsv.hpp | 5 ++--- 8 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/graph/impl/KokkosGraph_Distance2Color_impl.hpp b/src/graph/impl/KokkosGraph_Distance2Color_impl.hpp index ed40646711..c8dddcefb8 100644 --- a/src/graph/impl/KokkosGraph_Distance2Color_impl.hpp +++ b/src/graph/impl/KokkosGraph_Distance2Color_impl.hpp @@ -51,7 +51,6 @@ #include #include -#include #include #include diff --git a/src/sparse/KokkosSparse_csc2csr.hpp b/src/sparse/KokkosSparse_csc2csr.hpp index 83a96c3c02..32f0c2b745 100644 --- a/src/sparse/KokkosSparse_csc2csr.hpp +++ b/src/sparse/KokkosSparse_csc2csr.hpp @@ -43,14 +43,7 @@ */ #include "KokkosKernels_Utils.hpp" -#include -#include -#include -#include -#include -#include -#include -#include +#include #ifndef _KOKKOSSPARSE_CSC2CSR_HPP #define _KOKKOSSPARSE_CSC2CSR_HPP diff --git a/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp b/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp index 90c35dbaf8..fd32eb08fe 100644 --- a/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp +++ b/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp @@ -50,7 +50,6 @@ #endif #include "KokkosKernels_Utils.hpp" -#include #include namespace KokkosSparse { diff --git a/unit_test/common/Test_Common_set_bit_count.hpp b/unit_test/common/Test_Common_set_bit_count.hpp index a085cc0024..c6163b8db4 100644 --- a/unit_test/common/Test_Common_set_bit_count.hpp +++ b/unit_test/common/Test_Common_set_bit_count.hpp @@ -48,7 +48,6 @@ #include "KokkosKernels_BitUtils.hpp" #include "KokkosKernels_SimpleUtils.hpp" #include "KokkosKernels_PrintUtils.hpp" -#include #include #include diff --git a/unit_test/sparse/Test_Sparse_spgemm.hpp b/unit_test/sparse/Test_Sparse_spgemm.hpp index a1e33c0ca6..35473046d8 100644 --- a/unit_test/sparse/Test_Sparse_spgemm.hpp +++ b/unit_test/sparse/Test_Sparse_spgemm.hpp @@ -47,7 +47,6 @@ #include "KokkosSparse_Utils.hpp" #include "KokkosSparse_SortCrs.hpp" -#include #include #include diff --git a/unit_test/sparse/Test_Sparse_spgemm_jacobi.hpp b/unit_test/sparse/Test_Sparse_spgemm_jacobi.hpp index f9db6f4d8d..4ac707c249 100644 --- a/unit_test/sparse/Test_Sparse_spgemm_jacobi.hpp +++ b/unit_test/sparse/Test_Sparse_spgemm_jacobi.hpp @@ -47,7 +47,6 @@ #include "KokkosSparse_Utils.hpp" #include "KokkosSparse_SortCrs.hpp" -#include #include #include diff --git a/unit_test/sparse/Test_Sparse_spiluk.hpp b/unit_test/sparse/Test_Sparse_spiluk.hpp index 8f9ef99063..863bdf0808 100644 --- a/unit_test/sparse/Test_Sparse_spiluk.hpp +++ b/unit_test/sparse/Test_Sparse_spiluk.hpp @@ -45,7 +45,6 @@ #include #include -#include #include #include diff --git a/unit_test/sparse/Test_Sparse_sptrsv.hpp b/unit_test/sparse/Test_Sparse_sptrsv.hpp index 08c5494c88..c470747202 100644 --- a/unit_test/sparse/Test_Sparse_sptrsv.hpp +++ b/unit_test/sparse/Test_Sparse_sptrsv.hpp @@ -45,7 +45,6 @@ #include #include -#include #include #include @@ -122,7 +121,7 @@ void run_test_sptrsv_mtx() { bool is_lower_tri = true; std::cout << "Create handle" << std::endl; kh.create_sptrsv_handle(SPTRSVAlgorithm::SEQLVLSCHD_TP1, nrows, is_lower_tri); - + std::cout << "Prepare linear system" << std::endl; // Create known_lhs, generate rhs, then solve for lhs to compare to known_lhs ValuesType known_lhs("known_lhs", nrows); @@ -239,7 +238,7 @@ void run_test_sptrsv_mtx() { bool is_lower_tri = false; std::cout << "Create handle" << std::endl; kh.create_sptrsv_handle(SPTRSVAlgorithm::SEQLVLSCHD_TP1, nrows, is_lower_tri); - + std::cout << "Prepare linear system" << std::endl; // Create known_lhs, generate rhs, then solve for lhs to compare to known_lhs ValuesType known_lhs("known_lhs", nrows); From 87b5723e9c5b46e39641c773fa37438bc8500956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Zuzek?= Date: Mon, 11 Jul 2022 20:30:03 +0200 Subject: [PATCH 3/5] Remove unused/duplicated headers --- src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp | 1 - unit_test/common/Test_Common_set_bit_count.hpp | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp b/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp index fd32eb08fe..e6f0c26497 100644 --- a/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp +++ b/src/sparse/impl/KokkosSparse_spgemm_mkl2phase_impl.hpp @@ -50,7 +50,6 @@ #endif #include "KokkosKernels_Utils.hpp" -#include namespace KokkosSparse { namespace Impl { diff --git a/unit_test/common/Test_Common_set_bit_count.hpp b/unit_test/common/Test_Common_set_bit_count.hpp index c6163b8db4..937a2fdf1b 100644 --- a/unit_test/common/Test_Common_set_bit_count.hpp +++ b/unit_test/common/Test_Common_set_bit_count.hpp @@ -51,9 +51,6 @@ #include #include -#include -#include - // const char *input_filename = "sherman1.mtx"; // const char *input_filename = "Si2.mtx"; // const char *input_filename = "wathen_30_30.mtx"; From 8e6986d13651ea84b965a41fca356df431a71cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Zuzek?= Date: Tue, 12 Jul 2022 19:55:11 +0200 Subject: [PATCH 4/5] Fix: Use default layout for temp views in batched GESV --- src/batched/dense/impl/KokkosBatched_Gesv_Impl.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/batched/dense/impl/KokkosBatched_Gesv_Impl.hpp b/src/batched/dense/impl/KokkosBatched_Gesv_Impl.hpp index 616df45df9..a9e10a1ebd 100644 --- a/src/batched/dense/impl/KokkosBatched_Gesv_Impl.hpp +++ b/src/batched/dense/impl/KokkosBatched_Gesv_Impl.hpp @@ -545,7 +545,6 @@ struct TeamGesv { #endif using ScratchPadMatrixViewType = Kokkos::View< typename MatrixType::non_const_value_type **, - typename MatrixType::array_layout, typename MatrixType::execution_space::scratch_memory_space>; const int n = A.extent(0); @@ -682,7 +681,6 @@ struct TeamVectorGesv { #endif using ScratchPadMatrixViewType = Kokkos::View< typename MatrixType::non_const_value_type **, - typename MatrixType::array_layout, typename MatrixType::execution_space::scratch_memory_space>; const int n = A.extent(0); From 0060bcd8d02672bf486861807fe385614bad7e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Zuzek?= Date: Tue, 12 Jul 2022 19:55:11 +0200 Subject: [PATCH 5/5] Fix: call print_configuration() on instances (no longer static) --- perf_test/graph/KokkosGraph_triangle.cpp | 6 +++--- perf_test/sparse/KokkosSparse_block_pcg.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/perf_test/graph/KokkosGraph_triangle.cpp b/perf_test/graph/KokkosGraph_triangle.cpp index 90ec6c2a61..be0b57492a 100644 --- a/perf_test/graph/KokkosGraph_triangle.cpp +++ b/perf_test/graph/KokkosGraph_triangle.cpp @@ -303,7 +303,7 @@ int main(int argc, char **argv) { #if defined(KOKKOS_ENABLE_OPENMP) if (params.use_openmp) { - Kokkos::OpenMP::print_configuration(std::cout); + Kokkos::OpenMP().print_configuration(std::cout); #ifdef KOKKOSKERNELS_MULTI_MEM KokkosKernels::Experiment::run_multi_mem_triangle< size_type, idx, Kokkos::OpenMP, Kokkos::OpenMP::memory_space, @@ -319,7 +319,7 @@ int main(int argc, char **argv) { #if defined(KOKKOS_ENABLE_CUDA) if (params.use_cuda) { - Kokkos::Cuda::print_configuration(std::cout); + Kokkos::Cuda().print_configuration(std::cout); #ifdef KOKKOSKERNELS_MULTI_MEM KokkosKernels::Experiment::run_multi_mem_triangle< size_type, idx, Kokkos::Cuda, Kokkos::Cuda::memory_space, @@ -335,7 +335,7 @@ int main(int argc, char **argv) { #if defined(KOKKOS_ENABLE_HIP) if (params.use_hip) { - Kokkos::Experimental::HIP::print_configuration(std::cout); + Kokkos::Experimental::HIP().print_configuration(std::cout); KokkosKernels::Experiment::run_multi_mem_triangle< size_type, idx, Kokkos::Experimental::HIP, Kokkos::Experimental::HIPSpace, Kokkos::Experimental::HIPSpace>(params); diff --git a/perf_test/sparse/KokkosSparse_block_pcg.cpp b/perf_test/sparse/KokkosSparse_block_pcg.cpp index 73f4683525..8e453b4d01 100644 --- a/perf_test/sparse/KokkosSparse_block_pcg.cpp +++ b/perf_test/sparse/KokkosSparse_block_pcg.cpp @@ -437,7 +437,7 @@ int main(int argc, char **argv) { if (cmdline[CMD_USE_SERIAL]) { using myExecSpace = Kokkos::Serial; - Kokkos::Serial::print_configuration(std::cout); + myExecSpace().print_configuration(std::cout); using crsMat_t = typename KokkosSparse::CrsMatrix