From 748be1ed033933ee330dab2a73a52a5d18878f62 Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 2 Oct 2024 09:42:42 -0400 Subject: [PATCH] Re-enable MPI for windows. --- .github/workflows/main.yml | 11 ++++++++++- pyproject.toml | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c9740a9..74e7ce13 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - uses: mpi4py/setup-mpi@v1 if: ${{ contains(matrix.os, 'windows') }} with: - mpi: intel + mpi: intelmpi # Else, use the default for the OS and setup-mpi action - uses: mpi4py/setup-mpi@v1 @@ -55,7 +55,16 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v4 + + # Use intel mpi on windows + - uses: mpi4py/setup-mpi@v1 + if: ${{ contains(matrix.os, 'windows') }} + with: + mpi: intelmpi + + # Else, use the default for the OS and setup-mpi action - uses: mpi4py/setup-mpi@v1 + if: ${{ !contains(matrix.os, 'windows') }} # Used to host cibuildwheel - uses: actions/setup-python@v5 diff --git a/pyproject.toml b/pyproject.toml index 3c604970..9ff46862 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -171,7 +171,7 @@ before-all = "python -m pip install mpi4py --extra-index-url https://pypi.anacon before-test = [ "python -m pip install mpi4py --extra-index-url https://pypi.anaconda.org/mpi4py/simple", ] -test-command = "python -m mpi4py -m pytest {project}/tests" +#test-command = "mpiexec python -m mpi4py -m pytest {project}/tests" [tool.cibuildwheel.macos] before-all = [