Build src/gnu as its own library

Format
neuronsimulator · Jun 19, 2023 · 4fc6ad8 · 4fc6ad8
1 parent f21fd8d
commit 4fc6ad8
Show file tree

Hide file tree

Showing 36 changed files with 67 additions and 92 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -567,6 +567,7 @@ endif()
 # =============================================================================
 # Add project directories AFTER CMake modules
 # =============================================================================
+add_subdirectory(src/gnu)
 add_subdirectory(src/nrniv)
 
 # Collect the environment variables that are needed to execute NEURON from the build directory. This

diff --git a/cmake/NeuronFileLists.cmake b/cmake/NeuronFileLists.cmake
@@ -444,24 +444,6 @@ set(SCOPMATH_FILES_LIST
 
 set(NRNMPI_FILES_LIST nrnmpi.cpp bbsmpipack.cpp mpispike.cpp)
 
-set(NRNGNU_FILES_LIST
-    ACG.cpp
-    Binomial.cpp
-    DiscUnif.cpp
-    Erlang.cpp
-    Geom.cpp
-    HypGeom.cpp
-    LogNorm.cpp
-    MLCG.cpp
-    NegExp.cpp
-    Normal.cpp
-    Poisson.cpp
-    RNG.cpp
-    Random.cpp
-    RndInt.cpp
-    Uniform.cpp
-    Weibull.cpp)
-
 # nrnpython sources (only if ${NRN_ENABLE_PYTHON_DYNAMIC} is OFF}
 set(NRNPYTHON_FILES_LIST
     nrnpython.cpp
@@ -570,7 +552,6 @@ nrn_create_file_list(NRN_SPARSE13_SRC_FILES ${PROJECT_SOURCE_DIR}/src/sparse13
 nrn_create_file_list(NRN_SCOPMATH_SRC_FILES ${PROJECT_SOURCE_DIR}/src/scopmath
                      ${SCOPMATH_FILES_LIST})
 nrn_create_file_list(NRN_NRNMPI_SRC_FILES ${PROJECT_SOURCE_DIR}/src/nrnmpi ${NRNMPI_FILES_LIST})
-nrn_create_file_list(NRN_NRNGNU_SRC_FILES ${PROJECT_SOURCE_DIR}/src/gnu ${NRNGNU_FILES_LIST})
 nrn_create_file_list(NRN_NRNPYTHON_SRC_FILES ${PROJECT_SOURCE_DIR}/src/nrnpython
                      ${NRNPYTHON_FILES_LIST})
 nrn_create_file_list(NRN_MODFILE_BASE_NAMES src/nrnoc ${MODFILE_BASE_NAMES})

diff --git a/src/gnu/ACG.cpp b/src/gnu/ACG.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 // This may look like C code, but it is really -*- C++ -*-
 /* 
 Copyright (C) 1989 Free Software Foundation
@@ -20,7 +19,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <ACG.h>
+#include "ACG.h"
 #include <assert.h>
 
 //

diff --git a/src/gnu/ACG.h b/src/gnu/ACG.h
@@ -18,7 +18,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef _ACG_h
 #define _ACG_h 1 
 
-#include <RNG.h>
+#include "RNG.h"
 #include <math.h>
 #ifdef __GNUG__
 //#pragma interface

diff --git a/src/gnu/Binomial.cpp b/src/gnu/Binomial.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 /* 
 Copyright (C) 1988 Free Software Foundation
     written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -18,8 +17,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <Binomial.h>
+#include "Random.h"
+#include "Binomial.h"
 
 double Binomial::operator()()
 {

diff --git a/src/gnu/Binomial.h b/src/gnu/Binomial.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 #define _Binomial_h 1
 
-#include <Random.h>
+#include "Random.h"
 
 class Binomial: public Random {
 protected:

diff --git a/src/gnu/CMakeLists.txt b/src/gnu/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_library(
+  nrngnu STATIC
+  ACG.cpp
+  Binomial.cpp
+  DiscUnif.cpp
+  Erlang.cpp
+  Geom.cpp
+  HypGeom.cpp
+  LogNorm.cpp
+  MLCG.cpp
+  NegExp.cpp
+  Normal.cpp
+  Poisson.cpp
+  Random.cpp
+  RndInt.cpp
+  RNG.cpp
+  Uniform.cpp
+  Weibull.cpp)
+set_property(TARGET nrngnu PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/src/gnu/DiscUnif.cpp b/src/gnu/DiscUnif.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 /* 
 Copyright (C) 1988 Free Software Foundation
     written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -18,8 +17,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <DiscUnif.h>
+#include "Random.h"
+#include "DiscUnif.h"
 
 double DiscreteUniform::operator()()
 {

diff --git a/src/gnu/DiscUnif.h b/src/gnu/DiscUnif.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 #define _DiscreteUniform_h 1
 
-#include <Random.h>
+#include "Random.h"
 
 //
 //	The interval [lo..hi)

diff --git a/src/gnu/Erlang.cpp b/src/gnu/Erlang.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 /* 
 Copyright (C) 1988 Free Software Foundation
     written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -18,8 +17,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <Erlang.h>
+#include "Random.h"
+#include "Erlang.h"
 
 double Erlang::operator()()
 {

diff --git a/src/gnu/Erlang.h b/src/gnu/Erlang.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 #define _Erlang_h 1 
 
-#include <Random.h>
+#include "Random.h"
 
 class Erlang: public Random {
 protected:

diff --git a/src/gnu/Geom.cpp b/src/gnu/Geom.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 /* 
 Copyright (C) 1988 Free Software Foundation
     written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -18,8 +17,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <Geom.h>
+#include "Random.h"
+#include "Geom.h"
 
 double Geometric::operator()()
 {

diff --git a/src/gnu/Geom.h b/src/gnu/Geom.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 #define _Geometric_h 
 
-#include <Random.h>
+#include "Random.h"
 
 class Geometric: public Random {
 protected:

diff --git a/src/gnu/HypGeom.cpp b/src/gnu/HypGeom.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 
 /* 
 Copyright (C) 1988 Free Software Foundation
@@ -19,8 +18,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <HypGeom.h>
+#include "Random.h"
+#include "HypGeom.h"
 
 double HyperGeometric::operator()()
 {

diff --git a/src/gnu/HypGeom.h b/src/gnu/HypGeom.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 #define _HyperGeometric_h 
 
-#include <Random.h>
+#include "Random.h"
 
 class HyperGeometric: public Random {
 protected:

diff --git a/src/gnu/LogNorm.cpp b/src/gnu/LogNorm.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 /* 
 Copyright (C) 1988 Free Software Foundation
     written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -18,10 +17,10 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <Normal.h>
+#include "Random.h"
+#include "Normal.h"
 
-#include <LogNorm.h>
+#include "LogNorm.h"
 
 #ifndef M_E
 #define M_E 2.71828182845904523536

diff --git a/src/gnu/LogNorm.h b/src/gnu/LogNorm.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 #define _LogNormal_h 
 
-#include <Normal.h>
+#include "Normal.h"
 
 class LogNormal: public Normal {
 protected:

diff --git a/src/gnu/MLCG.cpp b/src/gnu/MLCG.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 // This may look like C code, but it is really -*- C++ -*-
 /* 
 Copyright (C) 1989 Free Software Foundation
@@ -18,7 +17,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <MLCG.h>
+#include "MLCG.h"
 //
 //	SEED_TABLE_SIZE must be a power of 2
 //

diff --git a/src/gnu/MLCG.h b/src/gnu/MLCG.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 //#pragma interface
 #endif
 
-#include <RNG.h>
+#include "RNG.h"
 #include <math.h>
 
 //

diff --git a/src/gnu/NegExp.cpp b/src/gnu/NegExp.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 /* 
 Copyright (C) 1988 Free Software Foundation
     written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -18,8 +17,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <NegExp.h>
+#include "Random.h"
+#include "NegExp.h"
 
 double NegativeExpntl::operator()()
 {

diff --git a/src/gnu/NegExp.h b/src/gnu/NegExp.h
@@ -27,7 +27,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 // 
 
-#include <Random.h>
+#include "Random.h"
 
 class NegativeExpntl: public Random {
 protected:

diff --git a/src/gnu/Normal.cpp b/src/gnu/Normal.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 /* 
 Copyright (C) 1988 Free Software Foundation
     written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -18,8 +17,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <Normal.h>
+#include "Random.h"
+#include "Normal.h"
 //
 //	See Simulation, Modelling & Analysis by Law & Kelton, pp259
 //

diff --git a/src/gnu/Normal.h b/src/gnu/Normal.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 #define _Normal_h 
 
-#include <Random.h>
+#include "Random.h"
 
 class Normal: public Random {
     char haveCachedNormal;

diff --git a/src/gnu/Poisson.cpp b/src/gnu/Poisson.cpp
@@ -1,5 +1,3 @@
-#include <../../nrnconf.h>
-
 /* 
 Copyright (C) 1988 Free Software Foundation
     written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -19,8 +17,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
-#include <Poisson.h>
+#include "Random.h"
+#include "Poisson.h"
 
 double Poisson::operator()()
 {

diff --git a/src/gnu/Poisson.h b/src/gnu/Poisson.h
@@ -21,7 +21,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #endif
 #define _Poisson_h 
 
-#include <Random.h>
+#include "Random.h"
 
 class Poisson: public Random {
 protected:

diff --git a/src/gnu/RNG.cpp b/src/gnu/RNG.cpp
@@ -1,4 +1,3 @@
-#include <../../nrnconf.h>
 // This may look like C code, but it is really -*- C++ -*-
 /* 
 Copyright (C) 1989 Free Software Foundation
@@ -19,7 +18,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #pragma implementation
 #endif
 #include <assert.h>
-#include <RNG.h>
+#include "RNG.h"
 
 // These two static fields get initialized by RNG::RNG().
 PrivateRNGSingleType RNG::singleMantissa;

diff --git a/src/gnu/RNG.h b/src/gnu/RNG.h
@@ -26,18 +26,9 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  * int32_t and uint32_t have been defined by the configure procedure.  Just
  * use these in place of the ones that libg++ used to provide. 
  */
-#if defined(HAVE_INTTYPES_H)
-#include <inttypes.h>
-#elif defined(HAVE_SYS_TYPES_H)
-#include <sys/types.h>
-#elif defined(HAVE__G_CONFIG_H)
-#include <_G_config.h>
-typedef _G_int32_t int32_t;
-typedef _G_uint32_t uint32_t;
-#endif
-
-#include <assert.h>
-#include <math.h>
+#include <cstdint>
+#include <cassert>
+#include <cmath>
 
 union PrivateRNGSingleType {		   	// used to access floats as unsigneds
     float s;

diff --git a/src/gnu/Random.cpp b/src/gnu/Random.cpp
@@ -1,5 +1,4 @@
-#include <../../nrnconf.h>
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <Random.h>
+#include "Random.h"
diff --git a/src/gnu/Random.h b/src/gnu/Random.h
@@ -23,7 +23,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <math.h>
 
-#include <RNG.h>
+#include "RNG.h"
 
 class Random {
 protected:

diff --git a/src/gnu/RndInt.cpp b/src/gnu/RndInt.cpp
@@ -1,5 +1,4 @@
-#include <../../nrnconf.h>
 #ifdef __GNUG__
 #pragma implementation
 #endif
-#include <RndInt.h>
+#include "RndInt.h"