mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-16 17:22:55 +00:00
Update --kokkos-threads to --kokkos-num-threads
The former has been deprecated for the latter.
This commit is contained in:
parent
9f77e11185
commit
4912d1d042
@ -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)
|
||||
|
@ -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 =
|
||||
|
Loading…
Reference in New Issue
Block a user