From 03a0056065eeb1b48b30be1716042a5c521860ed Mon Sep 17 00:00:00 2001 From: Olli Lupton Date: Mon, 25 Oct 2021 10:56:56 +0200 Subject: [PATCH] Remove accelmath.h * Update mod2c submodule with mod2c#73, which does the same thing there. * Update nmodl submodule with nmodl#762, which fixes code generation for the SH_na8st.mod mechanism in the reduced_dentate model. --- coreneuron/sim/scopmath/crout_thread.cpp | 4 ---- coreneuron/sim/scopmath/sparse_thread.cpp | 4 ---- external/mod2c | 2 +- external/nmodl | 2 +- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/coreneuron/sim/scopmath/crout_thread.cpp b/coreneuron/sim/scopmath/crout_thread.cpp index 55c64c0b5..b180ea107 100644 --- a/coreneuron/sim/scopmath/crout_thread.cpp +++ b/coreneuron/sim/scopmath/crout_thread.cpp @@ -42,10 +42,6 @@ /* Functions called: makevector(), freevector() */ /* */ /*--------------------------------------------------------------*/ - -#if defined(__PGI) && defined(_OPENACC) -#include "accelmath.h" -#endif #include #include "coreneuron/mechanism/mech/cfile/scoplib.h" #include "coreneuron/sim/scopmath/newton_struct.h" diff --git a/coreneuron/sim/scopmath/sparse_thread.cpp b/coreneuron/sim/scopmath/sparse_thread.cpp index 2c57e77b0..75fbed5b4 100644 --- a/coreneuron/sim/scopmath/sparse_thread.cpp +++ b/coreneuron/sim/scopmath/sparse_thread.cpp @@ -6,10 +6,6 @@ * Duke University * ******************************************************************************/ - -#if defined(__PGI) && defined(_OPENACC) -#include "accelmath.h" -#endif #include #include "coreneuron/mechanism/mech/cfile/scoplib.h" #include "coreneuron/mechanism/mech/mod2c_core_thread.hpp" /* _threadargs, _STRIDE, etc. */ diff --git a/external/mod2c b/external/mod2c index bcf471291..9c1ca6ed3 160000 --- a/external/mod2c +++ b/external/mod2c @@ -1 +1 @@ -Subproject commit bcf471291ed615e3d2df7e06f0a27aa38888cff4 +Subproject commit 9c1ca6ed3fcefad9230b4cdf2f5e7fde6cce6d08 diff --git a/external/nmodl b/external/nmodl index b0fe32791..85dec3618 160000 --- a/external/nmodl +++ b/external/nmodl @@ -1 +1 @@ -Subproject commit b0fe32791c3ac3949f14ad70eeeaf32cf9bc431e +Subproject commit 85dec36180cc8d012db3392c06c065d39de79960