Unverified Commit 32d507e9 authored by markuskowa's avatar markuskowa Committed by GitHub
Browse files

Merge pull request #259736 from markuskowa/split-mpi 

MPI related packages: use multiple outputs
parents 094ca95e a0a2fe7d

pkgs/development/libraries/libfabric/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-7VOhdZOPBe1qh8OK8OTNKA5I4A5whl6aOubAzsUDSRw=";

  };



  outputs = [ "out" "dev" "man" ];



  nativeBuildInputs = [ pkg-config autoreconfHook ];



  buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optionals enablePsm2 [ libpsm2 ];

pkgs/development/libraries/mpich/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-NJLpitq2K1l+8NKS+yRZthI7yABwqKoKML5pYgdaEvA=";

  };



  outputs = [ "out" "doc" "man" ];



  configureFlags = [

    "--enable-shared"

    "--enable-sharedlib"

pkgs/development/libraries/mvapich/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-w5pEkvS+UN9hAHhXSLoolOI85FCpQSgYHVFtpXV3Ua4=";

  };



  outputs = [ "out" "doc" "man" ];



  nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ];

  propagatedBuildInputs = [ numactl rdma-core zlib opensm ];

  buildInputs = with lib; [

pkgs/development/libraries/openmpi/default.nix

+6 −4
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ in stdenv.mkDerivation rec { 
    find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \;

  '';



  outputs = [ "out" "man" ];



  buildInputs = [ zlib ]

    ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ]

    ++ lib.optionals cudaSupport [ cudatoolkit ]
@@ -56,8 +58,8 @@ in stdenv.mkDerivation rec { 
  configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso"

    ++ lib.optional (!fortranSupport) "--disable-mpi-fortran"

    ++ lib.optionals stdenv.isLinux  [

      "--with-libnl=${libnl.dev}"

      "--with-pmix=${pmix}"

      "--with-libnl=${lib.getDev libnl}"

      "--with-pmix=${lib.getDev pmix}"

      "--with-pmix-libdir=${pmix}/lib"

      "--enable-mpi-cxx"

    ] ++ lib.optional enableSGE "--with-sge"
@@ -66,13 +68,13 @@ in stdenv.mkDerivation rec { 
    # https://github.com/openucx/ucx

    # https://www.open-mpi.org/faq/?category=buildcuda

    ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ]

    ++ lib.optionals fabricSupport [ "--with-psm2=${libpsm2}" "--with-libfabric=${libfabric}" ]

    ++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ]

    ;



  enableParallelBuilding = true;



  postInstall = ''

    rm -f $out/lib/*.la

    find $out/lib/ -name "*.la" -exec rm -f \{} \;

   '';



  postFixup = ''

pkgs/development/libraries/pmix/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -23,15 +23,19 @@ stdenv.mkDerivation rec { 
  buildInputs = [ libevent hwloc munge zlib ];



  configureFlags = [

    "--with-libevent=${libevent.dev}"

    "--with-libevent=${lib.getDev libevent}"

    "--with-munge=${munge}"

    "--with-hwloc=${hwloc.dev}"

    "--with-hwloc=${lib.getDev hwloc}"

  ];



  preConfigure = ''

    ./autogen.pl

  '';



  postInstall = ''

    find $out/lib/ -name "*.la" -exec rm -f \{} \;

  '';



  enableParallelBuilding = true;



  meta = with lib; {