diff --git a/.github/fluidfft-site.cfg b/.github/fluidfft-site-mpi.cfg similarity index 100% rename from .github/fluidfft-site.cfg rename to .github/fluidfft-site-mpi.cfg diff --git a/.github/fluidfft-site-macos.cfg b/.github/fluidfft-site-seq.cfg similarity index 100% rename from .github/fluidfft-site-macos.cfg rename to .github/fluidfft-site-seq.cfg diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 831f97d..869f286 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -37,8 +37,9 @@ jobs: - name: Run tests run: | - cp .github/fluidfft-site.cfg $HOME/.fluidfft-site.cfg + cp .github/fluidfft-site-seq.cfg $HOME/.fluidfft-site.cfg nox --session "tests(with_cov=True, with_mpi=False)" + cp .github/fluidfft-site-mpi.cfg $HOME/.fluidfft-site.cfg nox --session "tests(with_cov=True, with_mpi=True)" coverage xml diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index a77bbf4..10835d6 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -24,7 +24,7 @@ jobs: use-mamba: true - name: Install run: | - cp .github/fluidfft-site-macos.cfg $HOME/.fluidfft-site.cfg + cp .github/fluidfft-site-seq.cfg $HOME/.fluidfft-site.cfg pip install -e . -v --no-build-isolation --no-deps - name: Tests run: | diff --git a/noxfile.py b/noxfile.py index b973ea6..f2b8de3 100644 --- a/noxfile.py +++ b/noxfile.py @@ -71,7 +71,7 @@ def run_command(command, **kwargs): if with_mpi: if with_cov: command = ( - "mpirun -np 2 --oversubscribe coverage run -p -m pytest --exitfirst src" + "mpirun -np 2 --oversubscribe coverage run -p -m pytest -v -s --exitfirst src" ) else: diff --git a/pyproject.toml b/pyproject.toml index d736b73..30edcd5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,7 @@ fluidfft-bench-analysis = "fluidfft.bench_analysis:run" "fft3d.mpi_with_p3dfft" = "fluidfft.fft3d.mpi_with_p3dfft" # should be in fluidfft-pfft -"fft3d.mpi_with_pfft" = "fluidfft.fft3d.mpi_with_pfft" +# "fft3d.mpi_with_pfft" = "fluidfft.fft3d.mpi_with_pfft" # should be in fluidfft-mpi4pyfft (a pure Python package) "fft3d.mpi_with_mpi4pyfft" = "fluidfft.fft3d.mpi_with_mpi4pyfft"