Apply patch provided by Goran Jelic-Cizmek for compatibility with NEURON 9

https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/ebrains-spack-builds/-/blob/master/packages/py-pynn/pynn-0.12.3-neuron-9.0.0.patch?ref_type=heads

Author: apdavison

pyNN/neuron/nmodl/gif.mod

@@ -55,8 +55,13 @@ VERBATIM
 #include<stdio.h>
 #include<math.h>
 
+#ifndef NRN_VERSION_GTEQ_8_2_0
 double nrn_random_pick(void* r);
 void* nrn_random_arg(int argpos);
+#define RANDCAST
+#else
+#define RANDCAST (Rand*)
+#endif
 ENDVERBATIM
 
 ASSIGNED {
@@ -199,7 +204,7 @@ VERBATIM
             : each instance. However, the corresponding hoc Random
             : distribution MUST be set to Random.negexp(1)
             */
-            value = nrn_random_pick(_p_rng);
+            value = nrn_random_pick(RANDCAST _p_rng);
             //printf("random stream for this simulation = %lf\n",value);
             return value;
         }else{
@@ -208,7 +213,7 @@ ENDVERBATIM
             : independent of nhost or which host this instance is on
             : is desired, since each instance on this cpu draws from
             : the same stream
-            value = scop_random(1)
+            value = scop_random()
 VERBATIM
         }
 ENDVERBATIM

pyNN/neuron/nmodl/netstim2.mod

@@ -72,8 +72,13 @@ FUNCTION invl(mean (ms)) (ms) {
 	}
 }
 VERBATIM
+#ifndef NRN_VERSION_GTEQ_8_2_0
 double nrn_random_pick(void* r);
 void* nrn_random_arg(int argpos);
+#define RANDCAST
+#else
+#define RANDCAST (Rand*)
+#endif
 ENDVERBATIM
 
 FUNCTION erand() {
@@ -84,7 +89,7 @@ VERBATIM
 		: each instance. However, the corresponding hoc Random
 		: distribution MUST be set to Random.negexp(1)
 		*/
-		_lerand = nrn_random_pick(_p_donotuse);
+		_lerand = nrn_random_pick(RANDCAST _p_donotuse);
 	}else{
 		/* only can be used in main thread */
 		if (_nt != nrn_threads) {

pyNN/neuron/nmodl/quantal_stp.mod

@@ -82,8 +82,13 @@ NET_RECEIVE(w, available, t_last (ms)) {
 }
 
 VERBATIM
+#ifndef NRN_VERSION_GTEQ_8_2_0
 double nrn_random_pick(void* r);
 void* nrn_random_arg(int argpos);
+#define RANDCAST
+#else
+#define RANDCAST (Rand*)
+#endif
 ENDVERBATIM
 
 PROCEDURE setRNG() {
@@ -110,12 +115,12 @@ VERBATIM
             : each instance. However, the corresponding hoc Random
             : distribution MUST be set to Random.negexp(1)
             */
-            value = nrn_random_pick(_p_rng);
+            value = nrn_random_pick(RANDCAST _p_rng);
             //printf("random stream for this simulation = %lf\n",value);
             return value;
         } else {
 ENDVERBATIM
-            value = scop_random(1)
+            value = scop_random()
 VERBATIM
         }
 ENDVERBATIM

pyNN/neuron/nmodl/stochastic_synapse.mod

@@ -21,8 +21,13 @@ VERBATIM
 #include<stdio.h>
 #include<math.h>
 
+#ifndef NRN_VERSION_GTEQ_8_2_0
 double nrn_random_pick(void* r);
 void* nrn_random_arg(int argpos);
+#define RANDCAST
+#else
+#define RANDCAST (Rand*)
+#endif
 
 ENDVERBATIM
 
@@ -63,12 +68,12 @@ VERBATIM
             : each instance. However, the corresponding hoc Random
             : distribution MUST be set to Random.negexp(1)
             */
-            value = nrn_random_pick(_p_rng);
+            value = nrn_random_pick(RANDCAST _p_rng);
             //printf("random stream for this simulation = %lf\n",value);
             return value;
         } else {
 ENDVERBATIM
-            value = scop_random(1)
+            value = scop_random()
 VERBATIM
         }
 ENDVERBATIM

pyNN/neuron/nmodl/stochastic_tsodyksmarkram.mod

@@ -85,8 +85,13 @@ NET_RECEIVE(w, p_surv, t_surv) {
 }
 
 VERBATIM
+#ifndef NRN_VERSION_GTEQ_8_2_0
 double nrn_random_pick(void* r);
 void* nrn_random_arg(int argpos);
+#define RANDCAST
+#else
+#define RANDCAST (Rand*)
+#endif
 ENDVERBATIM
 
 PROCEDURE setRNG() {
@@ -113,12 +118,12 @@ VERBATIM
             : each instance. However, the corresponding hoc Random
             : distribution MUST be set to Random.negexp(1)
             */
-            value = nrn_random_pick(_p_rng);
+            value = nrn_random_pick(RANDCAST _p_rng);
             //printf("random stream for this simulation = %lf\n",value);
             return value;
         } else {
 ENDVERBATIM
-            value = scop_random(1)
+            value = scop_random()
 VERBATIM
         }
 ENDVERBATIM

pyNN/neuron/nmodl/tsodyksmarkram.mod

@@ -5,6 +5,7 @@ Andrew Davison, UNIC, CNRS, 2013
 ENDCOMMENT
 
 NEURON {
+    THREADSAFE
     POINT_PROCESS TsodyksMarkramWA
     RANGE tau_rec, tau_facil, U, u0, tau_syn
     POINTER wsyn

pyNN/neuron/simulator.py

@@ -92,11 +92,13 @@ def load_mechanisms(path):
     else:
         arch_list = [platform.machine(), 'i686', 'x86_64', 'powerpc', 'umac']
         for arch in arch_list:
-            lib_path = os.path.join(path, arch, '.libs', 'libnrnmech.so')
-            if os.path.exists(lib_path):
-                h.nrn_load_dll(lib_path)
-                nrn_dll_loaded.append(path)
-                return
+            path_list = ['.so', '.dylib']
+            for p in path_list:
+                lib_path = os.path.join(path, arch, f'libnrnmech{p}')
+                if os.path.exists(lib_path):
+                    h.nrn_load_dll(lib_path)
+                    nrn_dll_loaded.append(path)
+                    return
     raise IOError(
         f"NEURON mechanisms not found in {path}. "
         "You may need to run 'nrnivmodl' in this directory.")