Replace Isaac64 by Random123 (#3188)

neuronsimulator · Nov 9, 2024 · 625f3d1 · 625f3d1
1 parent a5d0015
commit 625f3d1
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 365 deletions.
diff --git a/cmake/NeuronFileLists.cmake b/cmake/NeuronFileLists.cmake
@@ -10,7 +10,6 @@ set(STRUCTURED_HEADER_FILES_TO_INSTALL
     neuron/model_data_fwd.hpp)
 set(HEADER_FILES_TO_INSTALL
     gnu/mcran4.h
-    gnu/nrnisaac.h
     gnu/nrnran123.h
     nrniv/backtrace_utils.h
     nrniv/bbsavestate.h

diff --git a/src/gnu/CMakeLists.txt b/src/gnu/CMakeLists.txt
@@ -6,14 +6,11 @@ add_library(
   Erlang.cpp
   Geom.cpp
   HypGeom.cpp
-  isaac64.cpp
-  Isaac64RNG.cpp
   LogNorm.cpp
   MCellRan4RNG.cpp
   mcran4.cpp
   NegExp.cpp
   Normal.cpp
-  nrnisaac.cpp
   nrnran123.cpp
   Poisson.cpp
   Rand.cpp

diff --git a/src/gnu/Isaac64RNG.cpp b/src/gnu/Isaac64RNG.cpp
diff --git a/src/gnu/Isaac64RNG.hpp b/src/gnu/Isaac64RNG.hpp
diff --git a/src/gnu/Rand.hpp b/src/gnu/Rand.hpp
@@ -9,7 +9,7 @@ struct Object;
  * 0: ACG
  * 1: unused
  * 2: MCellRan4
- * 3: Isaac64
+ * 3: unused
  * 4: Random123
  */
 class Rand {

diff --git a/src/gnu/isaac64.cpp b/src/gnu/isaac64.cpp
diff --git a/src/gnu/isaac64.h b/src/gnu/isaac64.h
diff --git a/src/gnu/nrnisaac.cpp b/src/gnu/nrnisaac.cpp
diff --git a/src/gnu/nrnisaac.h b/src/gnu/nrnisaac.h
diff --git a/src/ivoc/ivocmain.cpp b/src/ivoc/ivocmain.cpp
@@ -234,14 +234,6 @@ extern std::string nrnmpi_load();
 void nrnmpi_load_or_exit();
 #endif
 
-// some things are defined in libraries earlier than they are used so...
-#include <nrnisaac.h>
-static void force_load() {
-    if (always_false) {
-        nrnisaac_new();
-    }
-}
-
 #ifdef MINGW
 // see iv/src/OS/directory.cpp
 #include <sys/stat.h>
@@ -382,7 +374,6 @@ int ivocmain_session(int argc, const char** argv, const char** env, int start_se
     // extern char** environ;
     int i;
     //	prargs("at beginning", argc, argv);
-    force_load();
     nrn_global_argc = argc;
     // https://en.cppreference.com/w/cpp/language/main_function, note that argv is
     // of length argc + 1 and argv[argc] is null.