From cc61cb86a3c46c8770c4ddea0eb9dc77168a8aab Mon Sep 17 00:00:00 2001 From: paugier Date: Mon, 5 Feb 2024 08:50:01 +0100 Subject: [PATCH] Fix fftw_mpi --- noxfile.py | 11 +++++------ plugins/fluidfft-fftwmpi/meson.build | 3 ++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/noxfile.py b/noxfile.py index 34164ab..124a6f0 100644 --- a/noxfile.py +++ b/noxfile.py @@ -17,7 +17,6 @@ """ import os -import shlex from pathlib import Path from functools import partial @@ -63,7 +62,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) @@ -96,10 +95,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: diff --git a/plugins/fluidfft-fftwmpi/meson.build b/plugins/fluidfft-fftwmpi/meson.build index f278bba..95e16de 100644 --- a/plugins/fluidfft-fftwmpi/meson.build +++ b/plugins/fluidfft-fftwmpi/meson.build @@ -17,7 +17,8 @@ mpi_dep = dependency('mpi', language: 'cpp') # fftwmpi_dep = dependency('fftw3-mpi', static: false) compiler = meson.get_compiler('cpp') -fftwmpi_dep = compiler.find_library('fftw_mpi', required: true) +# fftw_mpi is not found on Ubuntu +fftwmpi_dep = compiler.find_library('fftw_mpi', required: false) py_mod = import('python') py = py_mod.find_installation('python3', pure: false)