Skip to content

Commit d46685e

Browse files
authored
Re-enable Windows conda check using cmd.exe (#3474)
* Re-enable Windows conda check using cmd.exe * Fix. * Remove run on push.
1 parent 683b63a commit d46685e

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

.github/workflows/conda.yml

+21-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ jobs:
1515
name: Install and test
1616
strategy:
1717
matrix:
18-
# NOTE: Re-enable windows-2022 after iimpi libfabric.dll issue fixed.
19-
os: [ubuntu-latest, macos-13, macos-14]
18+
os: [ubuntu-latest, macos-13, macos-14, windows-2022]
2019
python-version: ["3.9", "3.10", "3.11", "3.12"]
20+
petsc-scalar-type: ["real"]
21+
include:
22+
- os: ubuntu-latest
23+
python-version: "3.12"
24+
petsc-scalar-type: "complex"
2125
runs-on: ${{ matrix.os }}
2226
timeout-minutes: 30
2327
# This is necessary to ensure conda environment is activated in every step.
@@ -31,16 +35,29 @@ jobs:
3135
auto-update-conda: true
3236
python-version: ${{ matrix.python-version }}
3337

38+
# TODO: These could probably be merged into one cross-platform step.
3439
- name: Install DOLFINx with MPICH (Unix-like)
3540
if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
3641
run: |
37-
conda install -c conda-forge fenics-dolfinx mpich
42+
conda install -c conda-forge fenics-dolfinx mpich petsc=*=${{ matrix.petsc-scalar-type }}*
3843
- name: Install DOLFINx (Windows)
3944
if: ${{ runner.os == 'Windows' }}
4045
run: |
4146
conda install -c conda-forge fenics-dolfinx
4247
43-
- name: Test
48+
- name: Test (Unix-like)
49+
if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }}
50+
run: |
51+
conda info
52+
conda list
53+
mpiexec --version
54+
mpiexec -v -np 1 python -c "from mpi4py import MPI; import dolfinx; dolfinx.mesh.create_rectangle(comm=MPI.COMM_WORLD, points=((0, 0), (2, 1)), n=(32, 16))"
55+
mpiexec -v -np 2 python -c "from mpi4py import MPI; import dolfinx; dolfinx.mesh.create_rectangle(comm=MPI.COMM_WORLD, points=((0, 0), (2, 1)), n=(32, 16))"
56+
57+
# NOTE: Late 2024, Intel MPI is only correctly setup using cmd.exe.
58+
- name: Test (Windows)
59+
if: ${{ runner.os == 'Windows' }}
60+
shell: cmd /C CALL {0}
4461
run: |
4562
conda info
4663
conda list

0 commit comments

Comments
 (0)