Skip to content

Commit

Permalink
Work on fixing CIs
Browse files Browse the repository at this point in the history
  • Loading branch information
paugier committed Feb 4, 2024
1 parent a979285 commit 4f0339e
Show file tree
Hide file tree
Showing 7 changed files with 4,975 additions and 832 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
- name: Run tests
run: |
ls /usr/lib/x86_64-linux-gnu/libfftw3*
nox --session "tests(with_cov=True, with_mpi=False)"
make cleanall
nox --session "tests(with_cov=True, with_mpi=True)"
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/ci-pixi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ on:

jobs:
tests:
runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ["windows-2022", "macos-latest"]
python-version: ["3.9", "3.10", "3.11"]
# os: ["windows-2022", "macos-latest"]
# python-version: ["3.9", "3.10", "3.11"]
os: ["windows-2022"]
python-version: ["3.10"]
defaults:
run:
shell: bash -l {0}
Expand All @@ -25,6 +27,11 @@ jobs:
run: |
pixi run install-editable
pixi run pip install plugins/fluidfft-fftw -v --no-build-isolation --no-deps
- name: Show meson-log.txt
if: always()
run: |
cat build/cp310/meson-logs/meson-log.txt
cat 'D:\a\fluidfft\fluidfft\.pixi\env\Scripts\transonic-get-include'
- name: Tests
run: |
pixi run pytest -v tests plugins/fluidfft-fftw
10 changes: 6 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ workflow:

pixi-test:
stage: pixi
image: $DOCKER_IMAGE_PATH:pixi
image: registry.heptapod.net:443/fluiddyn/fluidsim/ci/default:pixi
script:
- pixi info
- pixi run install-editable
- pixi run pip install plugins/fluidfft-fftw -v --no-build-isolation --no-deps
- pixi run pip install plugins/fluidfft-mpi_with_fftw -v --no-build-isolation --no-deps
- pixi run pytest -v tests plugins/fluidfft-fftw
- pixi run mpirun -np 2 pytest -v plugins/fluidfft-mpi_with_fftw
- pixi run pytest -v tests
- pixi run pytest -v plugins/fluidfft-fftw
# - pixi run pip install plugins/fluidfft-mpi_with_fftw -v --no-build-isolation --no-deps
# - pixi run mpirun -np 2 pytest -v plugins/fluidfft-mpi_with_fftw


# Build an image for the other tasks; this should be a scheduled job, as
Expand Down Expand Up @@ -95,6 +96,7 @@ tests_mpi:
- job: "image:build"
optional: true
script:
- ls /usr/lib/x86_64-linux-gnu/libfftw3*
- nox -s "tests(with_cov=True, with_mpi=True)"


Expand Down
10 changes: 5 additions & 5 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def tests(session, with_mpi, with_cov):
session.install(
"-e", "plugins/fluidfft-mpi_with_fftw", "--no-build-isolation", "-v"
)
session.install("-e", "plugins/fluidfft-fftwmpi", "--no-build-isolation", "-v")
# session.install("-e", "plugins/fluidfft-fftwmpi", "--no-build-isolation", "-v")

def run_command(command, **kwargs):
session.run(*command.split(), **kwargs)
Expand Down Expand Up @@ -96,10 +96,10 @@ def run_command(command, **kwargs):
"mpirun -np 2 --oversubscribe pytest -v plugins/fluidfft-mpi_with_fftw",
external=True,
)
run_command(
"mpirun -np 2 --oversubscribe pytest -v plugins/fluidfft-fftwmpi",
external=True,
)
# run_command(
# "mpirun -np 2 --oversubscribe pytest -v plugins/fluidfft-fftwmpi",
# external=True,
# )

if with_cov:
if with_mpi:
Expand Down
Loading

0 comments on commit 4f0339e

Please sign in to comment.