[email protected]+ workaround for Random123.

CMake/MakefileBuildOptions.cmake

@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (C) 2016-2021 Blue Brain Project
+# Copyright (C) 2016-2022 Blue Brain Project
 #
 # See top-level LICENSE file for details.
 # =============================================================================
@@ -72,9 +72,17 @@ endforeach()
 # PGI compiler adds --c++14;-A option for C++14, remove ";"
 string(REPLACE ";" " " CXX14_STD_FLAGS "${CMAKE_CXX14_STANDARD_COMPILE_OPTION}")
 string(TOUPPER "${CMAKE_BUILD_TYPE}" _BUILD_TYPE)
-set(CORENRN_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${_BUILD_TYPE}} ${CXX14_STD_FLAGS} ${NVHPC_ACC_COMP_FLAGS} ${NVHPC_CXX_INLINE_FLAGS}"
-)
+list(TRANSFORM CORENRN_COMPILE_DEFS PREPEND -D OUTPUT_VARIABLE CORENRN_COMPILE_DEF_FLAGS)
+string(
+  JOIN
+  " "
+  CORENRN_CXX_FLAGS
+  ${CMAKE_CXX_FLAGS}
+  ${CMAKE_CXX_FLAGS_${_BUILD_TYPE}}
+  ${CXX14_STD_FLAGS}
+  ${NVHPC_ACC_COMP_FLAGS}
+  ${NVHPC_CXX_INLINE_FLAGS}
+  ${CORENRN_COMPILE_DEF_FLAGS})
 
 # =============================================================================
 # nmodl/mod2c related options : TODO

CMakeLists.txt

@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2016 - 2021 Blue Brain Project/EPFL
+# Copyright (c) 2016 - 2022 Blue Brain Project/EPFL
 #
 # See top-level LICENSE file for details.
 # =============================================================================
@@ -238,7 +238,15 @@ endif()
 # =============================================================================
 if(CORENRN_HAVE_NVHPC_COMPILER)
   # PGI with llvm code generation doesn't have necessary assembly intrinsic headers
-  add_definitions(-DEIGEN_DONT_VECTORIZE=1)
+  list(APPEND CORENRN_COMPILE_DEFS EIGEN_DONT_VECTORIZE=1)
+  if(NOT CORENRN_ENABLE_GPU AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL 21.11)
+    # Random123 does not play nicely with NVHPC 21.11+'s detection of ABM features if it detects the
+    # compiler to be PGI or NVHPC, see: https://github.com/BlueBrain/CoreNeuron/issues/724 and
+    # https://github.com/DEShawResearch/random123/issues/6. In fact in GPU builds Random123
+    # (mis)detects nvc++ as nvcc because we pass the -cuda option and we therefore avoid the
+    # problem. If GPU support is disabled, we define R123_USE_INTRIN_H=0 to avoid the problem.
+    list(APPEND CORENRN_COMPILE_DEFS R123_USE_INTRIN_H=0)
+  endif()
 endif()
 
 # ~~~

coreneuron/CMakeLists.txt

@@ -1,9 +1,13 @@
 # =============================================================================
-# Copyright (c) 2016 - 2021 Blue Brain Project/EPFL
+# Copyright (c) 2016 - 2022 Blue Brain Project/EPFL
 #
 # See top-level LICENSE file for details.
 # =============================================================================
 
+# Add compiler flags that should apply to all CoreNEURON targets, but which should not leak into
+# other included projects.
+add_compile_definitions(${CORENRN_COMPILE_DEFS})
+
 # put libraries (e.g. dll) in bin directory
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 

coreneuron/gpu/nrn_acc_manager.cpp

@@ -76,6 +76,8 @@ void cnrn_target_set_default_device(int device_num) {
 #endif
 }
 
+#ifdef CORENEURON_ENABLE_GPU
+
 static Memb_list* copy_ml_to_device(const Memb_list* ml, int type) {
     // As we never run code for artificial cell inside GPU we don't copy it.
     int is_art = corenrn.get_is_artificial()[type];
@@ -259,6 +261,8 @@ static void delete_ml_from_device(Memb_list* ml, int type) {
     cnrn_target_delete(ml);
 }
 
+#endif
+
 /* note: threads here are corresponding to global nrn_threads array */
 void setup_nrnthreads_on_device(NrnThread* threads, int nthreads) {
 #ifdef CORENEURON_ENABLE_GPU
@@ -891,6 +895,7 @@ void update_nrnthreads_on_host(NrnThread* threads, int nthreads) {
  * from GPU to CPU.
  */
 void update_weights_from_gpu(NrnThread* threads, int nthreads) {
+#ifdef CORENEURON_ENABLE_GPU
     for (int i = 0; i < nthreads; i++) {
         NrnThread* nt = threads + i;
         size_t n_weight = nt->n_weight;
@@ -900,6 +905,7 @@ void update_weights_from_gpu(NrnThread* threads, int nthreads) {
             nrn_pragma_omp(target update from(weights [0:n_weight]))
         }
     }
+#endif
 }
 
 /** Cleanup device memory that is being tracked by the OpenACC runtime.

coreneuron/utils/vrecord.cpp

@@ -104,7 +104,9 @@ void VecPlayContinuous::deliver(double tt, NetCvode* ns) {
 }
 
 void VecPlayContinuous::continuous(double tt) {
+#ifdef CORENEURON_ENABLE_GPU
     NrnThread* nt = nrn_threads + ith_;
+#endif
     // clang-format off
 
     nrn_pragma_acc(kernels present(this) if(nt->compute_gpu))