Merge branch 'master' into cornu/less_sparse13

neuronsimulator · Oct 18, 2024 · 91941dd · 91941dd
2 parents 8dc1cf4 + 33263d0
commit 91941dd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -148,19 +148,6 @@ spack_setup:
     # BLUECONFIGS_BRANCH does not correspond to a Spack package called blueconfigs
     SPACK_SETUP_IGNORE_PACKAGE_VARIABLES: BLUECONFIGS
 
-simulation_stack:
-  stage: .pre
-  # Take advantage of GitHub PR description parsing in the spack_setup job.
-  needs: [spack_setup]
-  trigger:
-    branch: $BLUECONFIGS_BRANCH
-    project: hpc/sim/blueconfigs
-    # NEURON CI status depends on the BlueConfigs CI status.
-    strategy: depend
-  variables:
-    GITLAB_PIPELINES_BRANCH: $GITLAB_PIPELINES_BRANCH
-    SPACK_ENV_FILE_URL: $SPACK_SETUP_COMMIT_MAPPING_URL
-
 # Performance seems to be terrible when we get too many jobs on a single node.
 .build:
   extends: [.spack_build]

diff --git a/src/gnu/mcran4.cpp b/src/gnu/mcran4.cpp
@@ -92,19 +92,6 @@ uint32_t nrnRan4int(uint32_t* idx1, uint32_t idx2) {
     /*n ^= (((u >> 16) | (u << 16)) ^ 0x178b0f3c) + w * v;*/
     n ^= (((u >> 16) | (u << 16)) ^ 0xe874f0c3) + w * v;
     return n;
-
-    w = n ^ 0x03bcdc3c;
-    v = w >> 16;
-    w &= 0xffff;
-    u = (v - w) * (v + w);
-    m ^= (((u >> 16) | (u << 16)) ^ 0x96aa3a59) + w * v;
-
-    w = m ^ 0x0f33d1b2;
-    v = w >> 16;
-    w &= 0xffff;
-    u = (v - w) * (v + w);
-    n ^= (((u >> 16) | (u << 16)) ^ 0xaa5835b9) + w * v;
-    return n;
 }
 
 /*
@@ -128,7 +115,7 @@ uint32_t nrnRan4int(uint32_t* idx1, uint32_t idx2) {
 */
 static const double SHIFT32 = 1.0 / 4294967296.0; /* 2^-32 */
 double nrnRan4dbl(uint32_t* idx1, uint32_t idx2) {
-    uint32_t hi, lo, extra;
+    uint32_t hi;
     hi = (uint32_t) nrnRan4int(idx1, idx2); /*top 32 bits*/
                                             /*
                                             //    lo = (extra                               // low bits

diff --git a/src/nrnpython/CMakeLists.txt b/src/nrnpython/CMakeLists.txt
@@ -74,7 +74,7 @@ else()
     target_link_libraries(nrnpython ${NRN_DEFAULT_PYTHON_LIBRARIES})
   endif()
   target_link_libraries(nrnpython fmt::fmt)
-  target_include_directories(nrnpython PUBLIC ${PROJECT_SOURCE_DIR}/${NRN_3RDPARTY_DIR}/eigen)
+  target_include_directories(nrnpython SYSTEM PUBLIC ${PROJECT_SOURCE_DIR}/${NRN_3RDPARTY_DIR}/eigen)
   target_include_directories(nrnpython PUBLIC ${PROJECT_BINARY_DIR}/src/nrniv/oc_generated)
   make_nanobind_target(nanobind ${NRN_DEFAULT_PYTHON_INCLUDES})
   target_link_libraries(nrnpython nanobind)