Skip to content

Commit 67629c7

Browse files
authored
remove unconditional mpi4py build
1 parent eedbecb commit 67629c7

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

.github/workflows/nestbuildmatrix.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -563,19 +563,16 @@ jobs:
563563
564564
- name: "Install Linux system dependencies"
565565
run: |
566-
sudo apt-get update
567566
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md
567+
sudo apt-get update
568568
sudo apt-get install \
569569
ccache \
570-
python3-all-dev jq libpcre3 libpcre3-dev \
570+
python3-all-dev \
571+
jq \
572+
libpcre3 libpcre3-dev \
571573
pkg-config
572-
573574
# not sure why these would be required:
574575
# sudo apt-get install tcl8.6 tcl8.6-dev tk8.6-dev
575-
576-
# Install MPI dependencies regardless of whether we compile NEST with or without MPI, so the installation of MPI4Py works
577-
sudo apt-get install openmpi-bin
578-
579576
sudo ldconfig
580577
581578
- name: "Install Readline dependencies"
@@ -592,7 +589,7 @@ jobs:
592589

593590
- name: "Install OpenMPI development dependencies"
594591
if: "${{ contains(matrix.use, 'mpi') }}"
595-
run: "sudo apt-get install libopenmpi-dev"
592+
run: "sudo apt-get install openmpi-bin libopenmpi-dev"
596593

597594
- name: "Install GSL system dependencies"
598595
if: "${{ contains(matrix.use, 'gsl') }}"
@@ -635,14 +632,24 @@ jobs:
635632
636633
- name: "Install Python dependencies"
637634
run: |
638-
python -m pip install --upgrade pip setuptools
635+
python -m pip install --upgrade pip setuptools cython
639636
python -c "import setuptools; print('package location:', setuptools.__file__)"
640-
python -m pip install --force-reinstall --upgrade scipy 'junitparser>=2' numpy pytest pytest-timeout pytest-xdist cython matplotlib terminaltables pandoc pandas
641-
# Install mpi4py regardless of whether we compile NEST with or without MPI, so regressiontests/issue-1703.py will run in both cases
642-
python -m pip install --force-reinstall --upgrade mpi4py
637+
pip list
638+
639+
- name: "Install Python test dependencies"
640+
# These could go to a separate venv…
641+
run: |
642+
python -m pip install 'junitparser>=2' pytest pytest-timeout pytest-xdist terminaltables
643+
python -m pip install numpy scipy pandas matplotlib
643644
test \! -e "=2" # assert junitparser is correctly quoted and '>' is not interpreted as shell redirect
644645
python -c "import pytest; print('package location:', pytest.__file__)"
645-
pip list
646+
647+
- name: "Install Python doc dependencies"
648+
run: "python -m pip install pandoc"
649+
650+
- name: "Install Python mpi dependencies"
651+
if: "${{ contains(matrix.use, 'mpi') }}"
652+
run: "python -m pip install --force-reinstall --upgrade mpi4py"
646653

647654
- name: "Install h5py"
648655
if: "${{ contains(matrix.use, 'hdf5') }}"

0 commit comments

Comments
 (0)