Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Update --kokkos-threads to --kokkos-num-threads

Browse Source 
The former has been deprecated for the latter.
This commit is contained in:
Kenneth Moreland 2023-01-25 09:29:05 -07:00
parent 9f77e11185
commit 4912d1d042
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/cont/kokkos/internal/RuntimeDeviceConfigurationKokkos.h
View File

@ -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)

2
vtkm/cont/kokkos/testing/UnitTestKokkosRuntimeDeviceConfiguration.cxx
View File

@ -26,7 +26,7 @@ TestingRuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagKokkos>::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 =