diff options
| author | Markus Kowalewski <markus.kowalewski@gmail.com> | 2018-09-20 23:31:47 +0200 |
|---|---|---|
| committer | Markus Kowalewski <markus.kowalewski@gmail.com> | 2018-09-26 23:39:18 +0200 |
| commit | 676825f6fe45dfddf17ff7659b98771802ba1519 (patch) | |
| tree | c3132cc910a0ce4a4474cb9e69795ea4da4159a1 /pkgs/development/python-modules/mpi4py | |
| parent | be02ab2f30d55874f477e140ba812d51e0674a7a (diff) | |
| download | nixpkgs-676825f6fe45dfddf17ff7659b98771802ba1519.tar nixpkgs-676825f6fe45dfddf17ff7659b98771802ba1519.tar.gz nixpkgs-676825f6fe45dfddf17ff7659b98771802ba1519.tar.bz2 nixpkgs-676825f6fe45dfddf17ff7659b98771802ba1519.tar.lz nixpkgs-676825f6fe45dfddf17ff7659b98771802ba1519.tar.xz nixpkgs-676825f6fe45dfddf17ff7659b98771802ba1519.tar.zst nixpkgs-676825f6fe45dfddf17ff7659b98771802ba1519.zip | |
mpi4py: Add patch to skip broken tests.
Fixes compilation with openmpi-3.1.2
Diffstat (limited to 'pkgs/development/python-modules/mpi4py')
| -rw-r--r-- | pkgs/development/python-modules/mpi4py/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6b69df61413..6d3897475ad 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }: +{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }: buildPythonPackage rec { pname = "mpi4py"; @@ -13,6 +13,13 @@ buildPythonPackage rec { inherit mpi; }; + patches = [ (fetchpatch { + # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE + url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; + sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; + }) + ]; + postPatch = '' substituteInPlace test/test_spawn.py --replace \ "unittest.skipMPI('openmpi(<3.0.0)')" \ @@ -37,8 +44,6 @@ buildPythonPackage rec { # Needed to run the tests reliably. See: # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30 export OMPI_MCA_rmaps_base_oversubscribe=yes - export OMPI_MCA_osc=sm - export OMPI_MCA_btl=self,vader ''; setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; |