From 4912d1d04293af13094dfc201d1c8fee046625ac Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Wed, 25 Jan 2023 09:29:05 -0700 Subject: [PATCH] Update --kokkos-threads to --kokkos-num-threads The former has been deprecated for the latter. --- .../cont/kokkos/internal/RuntimeDeviceConfigurationKokkos.h | 6 +++--- .../testing/UnitTestKokkosRuntimeDeviceConfiguration.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vtkm/cont/kokkos/internal/RuntimeDeviceConfigurationKokkos.h b/vtkm/cont/kokkos/internal/RuntimeDeviceConfigurationKokkos.h index de073480f..4293b8b6b 100644 --- a/vtkm/cont/kokkos/internal/RuntimeDeviceConfigurationKokkos.h +++ b/vtkm/cont/kokkos/internal/RuntimeDeviceConfigurationKokkos.h @@ -95,7 +95,7 @@ public: return RuntimeDeviceConfigReturnCode::NOT_APPLIED; } this->KokkosArguments.insert(this->KokkosArguments.begin(), - "--kokkos-threads=" + std::to_string(value)); + "--kokkos-num-threads=" + std::to_string(value)); return RuntimeDeviceConfigReturnCode::SUCCESS; } @@ -131,7 +131,7 @@ public: VTKM_CONT virtual RuntimeDeviceConfigReturnCode GetThreads(vtkm::Id& value) const override final { - return GetArgFromList(this->KokkosArguments, "--kokkos-threads", value); + return GetArgFromList(this->KokkosArguments, "--kokkos-num-threads", value); } VTKM_CONT virtual RuntimeDeviceConfigReturnCode GetNumaRegions( @@ -149,7 +149,7 @@ public: protected: /// Store a copy of the current arguments when initializing the Kokkos subsystem later /// Appends a copy of the argv values in the KokkosArguments vector: this assumes the - /// argv values contain kokkos command line arguments (like --kokkos-threads, etc) + /// argv values contain kokkos command line arguments (like --kokkos-num-threads, etc) VTKM_CONT virtual void ParseExtraArguments(int& argc, char* argv[]) override final { if (argc > 0 && argv) diff --git a/vtkm/cont/kokkos/testing/UnitTestKokkosRuntimeDeviceConfiguration.cxx b/vtkm/cont/kokkos/testing/UnitTestKokkosRuntimeDeviceConfiguration.cxx index f1d66ad15..afe45adc1 100644 --- a/vtkm/cont/kokkos/testing/UnitTestKokkosRuntimeDeviceConfiguration.cxx +++ b/vtkm/cont/kokkos/testing/UnitTestKokkosRuntimeDeviceConfiguration.cxx @@ -26,7 +26,7 @@ TestingRuntimeDeviceConfiguration::TestRunti { int argc; char** argv; - vtkm::cont::testing::Testing::MakeArgs(argc, argv, "--kokkos-numa=4"); + vtkm::cont::testing::Testing::MakeArgs(argc, argv, "--kokkos-print-configuration"); auto deviceOptions = TestingRuntimeDeviceConfiguration::DefaultInitializeConfigOptions(); deviceOptions.VTKmDeviceInstance.SetOption(0); internal::RuntimeDeviceConfigurationBase& config =