public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58757 from markuskowa/upd-openmpi

Browse Source 
openmpi: 4.0.0 -> 4.0.1
This commit is contained in:
Orivej Desh (NixOS) 2019-05-27 12:32:21 +00:00 committed by GitHub
commit 4448d040c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/openmpi/default.nix
View File

@ -9,24 +9,16 @@
}: }:
let let
version = "4.0.0"; version = "4.0.1";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "openmpi-${version}"; name = "openmpi-${version}";
src = with stdenv.lib.versions; fetchurl { src = with stdenv.lib.versions; fetchurl {
url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2"; url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
sha256 = "0srnjwzsmyhka9hhnmqm86qck4w3xwjm8g6sbns58wzbrwv8l2rg"; sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";
}; };
patches = [ (fetchpatch {
# Fix a bug that ignores OMPI_MCA_rmaps_base_oversubscribe (upstream patch).
# This bug breaks the test from libs, such as scalapack,
# on machines with less than 4 cores.
url = https://github.com/open-mpi/ompi/commit/98c8492057e6222af6404b352430d0dd7553d253.patch;
sha256 = "1mpd8sxxprgfws96qqlzvqf58pn2vv2d0qa8g8cpv773sgw3b3gj";
}) ];
postPatch = '' postPatch = ''
patchShebangs ./ patchShebangs ./
''; '';

6
pkgs/development/python-modules/mpi4py/default.nix
View File

@ -13,6 +13,12 @@ buildPythonPackage rec {
inherit mpi; inherit mpi;
}; };
patches = [ ( fetchpatch {
# Upstream patch to ensure compatibility with openmpi-4.0.1
url = "https://github.com/mpi4py/mpi4py/commit/42f5e35a6a90454516c11131549a08cd766edbb0.patch";
sha256 = "1dm0i3amwj1cddzz1m9ssd7qp655c8rv1wzjs9ww3kzd90fm4w72";
})];
postPatch = '' postPatch = ''
substituteInPlace test/test_spawn.py --replace \ substituteInPlace test/test_spawn.py --replace \
"unittest.skipMPI('openmpi(<3.0.0)')" \ "unittest.skipMPI('openmpi(<3.0.0)')" \