Skip to content

Commit

Permalink
Fix pyom MPI build with gcc (#688)
Browse files Browse the repository at this point in the history
* fix pyom MPI build with gcc

* use newer os for tests

* do not build mpi pyom
  • Loading branch information
dionhaefner authored Dec 30, 2024
1 parent dbb0a89 commit f42cdc7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false

matrix:
os: [ubuntu-20.04]
os: [ubuntu-24.04]
python-version: ["3.9", "3.12"]
backend: [numpy, jax]

Expand Down Expand Up @@ -97,13 +97,12 @@ jobs:
for patchfile in ./patches/*.patch; do
git apply --whitespace=fix $patchfile
done
make -C py_src -j 4
make -C py_src -j 4 pyOM_code.so
popd
- name: Export paths
run: |
echo "PYOM2_LIB=$(readlink -f $PYOM2_DIR/py_src/pyOM_code.*.so)" >> $GITHUB_ENV
echo "PYOM2_LIB_MPI=$(readlink -f $PYOM2_DIR/py_src/pyOM_code_MPI.*.so)" >> $GITHUB_ENV
- name: Run tests
run: |
Expand Down
6 changes: 3 additions & 3 deletions vendor/pyom2/pyOM2_site_specific_meson
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# fortran front end
F90 = mpif90
CDFFLAGS = $(shell nf-config --fflags --flibs)
MPIFLAGS =
MPIFLAGS = -fallow-argument-mismatch
F90FLAGS = -llapack -lblas -fconvert=big-endian -O3 -Wall #-check bounds

# python front end
F2PYFLAGS = --backend meson --dep lapack
F2PY_MPIFLAGS = --dep mpi
F2PYFLAGS = --backend meson --dep lapack --f90flags="$(F90FLAGS)"
F2PY_MPIFLAGS = --dep mpi --f90flags="$(MPIFLAGS) $(F90FLAGS)"

0 comments on commit f42cdc7

Please sign in to comment.