Fix passing CORENRN_NMODL_FLAGS to nrnivmodl_makefile (#461)

* Fix passing CORENRN_NMODL_FLAGS to nrnivmodl_makefile : bug from previous changes
* Use nvhpc and latest cuda in jenkins pipeline
* Use -D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1 (BlueBrain/spack/pull/1004)

Author: iomaganaris

CMake/MakefileBuildOptions.cmake

@@ -12,7 +12,7 @@ set(CMAKE_ISPC_FLAGS "${CMAKE_ISPC_FLAGS} --pic")
 # note that inlining is done by default
 set(NMODL_COMMON_ARGS "passes --inline")
 
-if ("${CORENRN_NMODL_FLAGS}" STREQUAL "")
+if (NOT "${CORENRN_NMODL_FLAGS}" STREQUAL "")
   set(NMODL_COMMON_ARGS "${NMODL_COMMON_ARGS} ${CORENRN_NMODL_FLAGS}")
 endif()
 

tests/jenkins/install_coreneuron.sh

@@ -11,8 +11,7 @@ CORENRN_TYPE="$1"
 
 if [ "${CORENRN_TYPE}" = "GPU-non-unified" ] || [ "${CORENRN_TYPE}" = "GPU-unified" ]; then
     # PGI compiler issue in unstable :  BSD-204
-    module unload unstable && module load archive/2020-12
-    module load pgi/19.10 cuda hpe-mpi cmake boost
+    module load nvhpc cuda hpe-mpi cmake boost
     mkdir build_${CORENRN_TYPE}
 else
     module load boost intel hpe-mpi cmake
@@ -36,6 +35,7 @@ if [ "${CORENRN_TYPE}" = "GPU-non-unified" ]; then
         -DTEST_EXEC_PREFIX="srun;-n;6;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta;--gres=gpu:2;--mem;0;-t;00:05:00" \
         -DAUTO_TEST_WITH_SLURM=OFF \
         -DAUTO_TEST_WITH_MPIEXEC=OFF \
+        -DCMAKE_CXX_FLAGS="-D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1" \
         $WORKSPACE/
 elif [ "${CORENRN_TYPE}" = "GPU-unified" ]; then
     cmake \
@@ -46,6 +46,7 @@ elif [ "${CORENRN_TYPE}" = "GPU-unified" ]; then
         -DTEST_EXEC_PREFIX="srun;-n;6;--account=proj16;--partition=$SALLOC_PARTITION;--constraint=volta;--gres=gpu:2;--mem;0;-t;00:05:00" \
         -DAUTO_TEST_WITH_SLURM=OFF \
         -DAUTO_TEST_WITH_MPIEXEC=OFF \
+        -DCMAKE_CXX_FLAGS="-D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1" \
         $WORKSPACE/
 elif [ "${CORENRN_TYPE}" = "AoS" ] || [ "${CORENRN_TYPE}" = "SoA" ]; then
     CORENRN_ENABLE_SOA=ON