[deprecated code 3] remove InitArguments

masterleinad · Oct 18, 2023 · dfd0a6d · dfd0a6d
1 parent e6c51df
commit dfd0a6d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 88 deletions.
diff --git a/core/src/Kokkos_Core_fwd.hpp b/core/src/Kokkos_Core_fwd.hpp
@@ -75,9 +75,6 @@ template <class ExecutionSpace, class MemorySpace>
 struct Device;
 
 // forward declare here so that backend initializer calls can use it.
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_3
-struct InitArguments;
-#endif
 class InitializationSettings;
 
 }  // namespace Kokkos

diff --git a/core/src/impl/Kokkos_InitializationSettings.hpp b/core/src/impl/Kokkos_InitializationSettings.hpp
@@ -24,32 +24,6 @@
 
 namespace Kokkos {
 
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_3
-struct InitArguments {
-  int num_threads;
-  int num_numa;
-  int device_id;
-  int ndevices;
-  int skip_device;
-  bool disable_warnings;
-  bool tune_internals;
-  bool tool_help        = false;
-  std::string tool_lib  = {};
-  std::string tool_args = {};
-
-  KOKKOS_DEPRECATED_WITH_COMMENT("Use InitializationSettings instead!")
-  InitArguments(int nt = -1, int nn = -1, int dv = -1, bool dw = false,
-                bool ti = false)
-      : num_threads{nt},
-        num_numa{nn},
-        device_id{dv},
-        ndevices{-1},
-        skip_device{9999},
-        disable_warnings{dw},
-        tune_internals{ti} {}
-};
-#endif
-
 class InitializationSettings {
 #define KOKKOS_IMPL_DECLARE(TYPE, NAME)                                    \
  private:                                                                  \
@@ -80,41 +54,6 @@ class InitializationSettings {
 #undef KOKKOS_IMPL_INIT_ARGS_DATA_MEMBER_TYPE
 #undef KOKKOS_IMPL_INIT_ARGS_DATA_MEMBER
 #undef KOKKOS_IMPL_DECLARE
-
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_3
- public:
-  InitializationSettings() = default;
-
-  InitializationSettings(InitArguments const& old) {
-    if (old.num_threads != -1) {
-      set_num_threads(old.num_threads);
-    }
-    if (old.device_id != -1) {
-      set_device_id(old.device_id);
-    }
-    if (old.ndevices != -1) {
-      set_num_devices(old.ndevices);
-    }
-    if (old.skip_device != 9999) {
-      set_skip_device(old.skip_device);
-    }
-    if (old.disable_warnings) {
-      set_disable_warnings(true);
-    }
-    if (old.tune_internals) {
-      set_tune_internals(true);
-    }
-    if (old.tool_help) {
-      set_tools_help(true);
-    }
-    if (!old.tool_lib.empty()) {
-      set_tools_libs(old.tool_lib);
-    }
-    if (!old.tool_args.empty()) {
-      set_tools_args(old.tool_args);
-    }
-  }
-#endif
 };
 
 }  // namespace Kokkos

diff --git a/core/unit_test/TestInitializationSettings.cpp b/core/unit_test/TestInitializationSettings.cpp
@@ -20,30 +20,6 @@
 
 namespace {
 
-#ifdef KOKKOS_ENABLE_DEPRECATED_CODE_3
-void take_initialization_settings(Kokkos::InitializationSettings const&) {}
-
-TEST(defaultdevicetype,
-     init_arguments_implicit_conversion_to_initialization_settings) {
-  Kokkos::InitArguments arguments;
-  take_initialization_settings(arguments);  // check that conversion is implicit
-  arguments.device_id      = 1;
-  arguments.tune_internals = true;
-  Kokkos::InitializationSettings settings{arguments};
-  EXPECT_FALSE(settings.has_num_threads());
-  EXPECT_TRUE(settings.has_device_id());
-  EXPECT_EQ(settings.get_device_id(), 1);
-  EXPECT_FALSE(settings.has_num_devices());
-  EXPECT_FALSE(settings.has_skip_device());
-  EXPECT_FALSE(settings.has_disable_warnings());
-  EXPECT_TRUE(settings.has_tune_internals());
-  EXPECT_TRUE(settings.get_tune_internals());
-  EXPECT_FALSE(settings.has_tools_help());
-  EXPECT_FALSE(settings.has_tools_libs());
-  EXPECT_FALSE(settings.has_tools_args());
-}
-#endif
-
 TEST(defaultdevicetype, initialization_settings) {
   auto const settings = Kokkos::InitializationSettings()
                             .set_num_threads(255)