Merge branch 'master' into cornu/list_presyn

neuronsimulator · Dec 2, 2024 · beefbfb · beefbfb
2 parents 98d7ab2 + 17db974
commit beefbfb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -37,7 +37,8 @@ jobs:
     env:
       DISPLAY: ${{ ':0' }}
       MUSIC_INSTALL_DIR: /opt/MUSIC
-      MUSIC_VERSION: 1.2.0
+      # hash of commit containing mpi4py 4 fix
+      MUSIC_VERSION: '13f312338dcccebfe74d391b1b24f1b6d816ac6c'
 
     steps:
 
@@ -58,10 +59,10 @@ jobs:
         run: |
           python3 -m venv music-venv
           source music-venv/bin/activate
-          python3 -m pip install 'mpi4py<4' cython numpy setuptools
+          python3 -m pip install mpi4py cython numpy setuptools
           sudo mkdir -p $MUSIC_INSTALL_DIR
           sudo chown -R $USER $MUSIC_INSTALL_DIR
-          curl -L -o MUSIC.zip https://github.com/INCF/MUSIC/archive/refs/tags/${MUSIC_VERSION}.zip
+          curl -L -o MUSIC.zip https://github.com/INCF/MUSIC/archive/${MUSIC_VERSION}.zip
           unzip MUSIC.zip && mv MUSIC-* MUSIC && cd MUSIC
           ./autogen.sh
           ./configure --with-python-sys-prefix --prefix=$MUSIC_INSTALL_DIR --disable-anysource

diff --git a/.github/workflows/neuron-ci.yml b/.github/workflows/neuron-ci.yml
@@ -41,7 +41,8 @@ jobs:
       PY_MIN_VERSION: ${{ matrix.config.python_min_version || '3.9' }}
       PY_MAX_VERSION: ${{ matrix.config.python_max_version || '3.12' }}
       MUSIC_INSTALL_DIR: /opt/MUSIC
-      MUSIC_VERSION: 1.2.1
+      # hash of commit containing mpi4py 4 fix
+      MUSIC_VERSION: '13f312338dcccebfe74d391b1b24f1b6d816ac6c'
 
     strategy:
       matrix:
@@ -207,10 +208,10 @@ jobs:
         run: |
           python3 -m venv music-venv
           source music-venv/bin/activate
-          python3 -m pip install 'mpi4py<4' cython numpy setuptools
+          python3 -m pip install mpi4py cython numpy setuptools
           sudo mkdir -p $MUSIC_INSTALL_DIR
           sudo chown -R $USER $MUSIC_INSTALL_DIR
-          curl -L -o MUSIC.zip https://github.com/INCF/MUSIC/archive/refs/tags/${MUSIC_VERSION}.zip
+          curl -L -o MUSIC.zip https://github.com/INCF/MUSIC/archive/${MUSIC_VERSION}.zip
           unzip MUSIC.zip && mv MUSIC-* MUSIC && cd MUSIC
           ./autogen.sh
           # on some systems MPI library detection fails, provide exact flags/compilers

diff --git a/nrn_requirements.txt b/nrn_requirements.txt
@@ -4,7 +4,7 @@ setuptools<=70.3.0
 scikit-build
 matplotlib
 ipython
-mpi4py<4 # MUSIC not compatible with MPI 4
+mpi4py
 find_libpython
 -r packaging/python/build_requirements.txt
 -r packaging/python/test_requirements.txt