From 0e2f98d69d01b0c5a89a3ea930b620907a484f94 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Jul 2020 17:33:39 +0200 Subject: [PATCH 1/2] ucx: 1.7.0 -> 1.8.1 --- pkgs/development/libraries/ucx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 9ec8ca660cf..1961e8aef68 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.7.0"; + version = "1.8.1"; in stdenv.mkDerivation { name = "ucx-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "149p8s7jrg7pbbq0hw0qm8va119bsl19q4scgk94vjqliyc1s33h"; + sha256 = "0yfnx4shgydkp447kipavjzgl6z58jan6l7znhdi8ry4zbgk568a"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; From fe2c68a79158fc744c2baef48cd59240280d1da3 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 Jul 2020 17:34:07 +0200 Subject: [PATCH 2/2] openmpi: build with ucx support --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 13f633ac0df..61e3165dd3f 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin -, libpsm2, libfabric, pmix +, libpsm2, libfabric, pmix, ucx # Enable CUDA support , cudaSupport ? false, cudatoolkit ? null @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl pmix ] + ++ lib.optionals isLinux [ libnl numactl pmix ucx ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] ++ lib.optional (isLinux || isFreeBSD) rdma-core