Merge branch 'develop' into feature/new_mpi_comm_pugs

src/utils/PugsUtils.cpp

@@ -83,6 +83,7 @@ initialize(int& argc, char* argv[])
 {
   bool enable_fpe     = true;
   bool enable_signals = true;
+  int nb_threads      = -1;
 
   std::string filename;
   {
@@ -97,9 +98,8 @@ initialize(int& argc, char* argv[])
       return os.str();
     });
 
-    int threads = -1;
-    app.add_option("--threads", threads, "Number of Kokkos threads")
-      ->check(CLI::Range(1, std::numeric_limits<decltype(threads)>::max()));
+    app.add_option("--threads", nb_threads, "Number of Kokkos threads")
+      ->check(CLI::Range(1, std::numeric_limits<decltype(nb_threads)>::max()));
 
     bool enable_color = true;
     app.add_flag("--color,!--no-color", enable_color, "Colorize console output [default: true]");
@@ -150,7 +150,15 @@ initialize(int& argc, char* argv[])
   SignalManager::init(enable_signals);
 
   setDefaultOMPEnvironment();
-  Kokkos::initialize(argc, argv);
+  {
+    Kokkos::InitArguments args;
+    args.num_threads      = nb_threads;
+    args.num_numa         = -1;
+    args.device_id        = -1;
+    args.disable_warnings = true;
+
+    Kokkos::initialize(args);
+  }
 
   if (ConsoleManager::showPreamble()) {
     std::cout << "----------------- " << rang::fg::green << "pugs exec info" << rang::fg::reset