Merge pull request #93280 from markuskowa/upd-ucx

ucx: 1.7.0 -> 1.8.1, build openmpi with ucx
This commit is contained in:
markuskowa 2020-07-18 23:19:02 +02:00 committed by GitHub
commit 5ac114beed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
, libpsm2, libfabric, pmix , libpsm2, libfabric, pmix, ucx
# Enable CUDA support # Enable CUDA support
, cudaSupport ? false, cudatoolkit ? null , cudaSupport ? false, cudatoolkit ? null
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
''; '';
buildInputs = with stdenv; [ gfortran zlib ] buildInputs = with stdenv; [ gfortran zlib ]
++ lib.optionals isLinux [ libnl numactl pmix ] ++ lib.optionals isLinux [ libnl numactl pmix ucx ]
++ lib.optionals cudaSupport [ cudatoolkit ] ++ lib.optionals cudaSupport [ cudatoolkit ]
++ [ libevent hwloc ] ++ [ libevent hwloc ]
++ lib.optional (isLinux || isFreeBSD) rdma-core ++ lib.optional (isLinux || isFreeBSD) rdma-core

View File

@ -3,7 +3,7 @@
}: }:
let let
version = "1.7.0"; version = "1.8.1";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "ucx-${version}"; name = "ucx-${version}";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
owner = "openucx"; owner = "openucx";
repo = "ucx"; repo = "ucx";
rev = "v${version}"; rev = "v${version}";
sha256 = "149p8s7jrg7pbbq0hw0qm8va119bsl19q4scgk94vjqliyc1s33h"; sha256 = "0yfnx4shgydkp447kipavjzgl6z58jan6l7znhdi8ry4zbgk568a";
}; };
nativeBuildInputs = [ autoreconfHook doxygen ]; nativeBuildInputs = [ autoreconfHook doxygen ];