Add mode packages and cpic app

bsc/cpic/default.nix

@@ -0,0 +1,54 @@
+{
+  stdenv
+, libconfig
+, nanos6
+, llvm-ompss2
+, mpi
+, uthash
+, overrideCC
+, llvmPackages_10
+, fftw
+}:
+
+with stdenv.lib;
+
+let
+  buildStdenv = overrideCC stdenv [ llvm-ompss2 ];
+in
+buildStdenv.mkDerivation rec {
+  name = "cpic";
+
+  src = "${builtins.getEnv "HOME"}/cpic";
+#  src = builtins.fetchGit {
+#    url = "https://github.com/rodarima/cpic";
+##    rev = "73bd70448587f0925b89e24c8f17e412ea3958e6";
+#    ref = "master";
+#  };
+
+#  patchPhase = ''
+#    echo LD=$LD
+#    echo CC=$CC
+#    echo ===================================================
+#    env
+#    echo ===================================================
+#    echo ${buildStdenv}
+#    echo ===================================================
+#  '';
+
+  configurePhase = ''
+    ls -l /
+    export NANOS6_HOME="${nanos6}"
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    libconfig
+    nanos6
+    llvm-ompss2
+    mpi
+    uthash
+    llvmPackages_10.bintools
+    fftw
+  ];
+}

bsc/dummy/default.nix

@@ -0,0 +1,14 @@
+{
+  stdenv
+}:
+
+{
+    hello = stdenv.mkDerivation rec {
+      name = "dummy";
+
+      src = null;
+      dontUnpack = true;
+
+      buildPhase = ''ls -l /'';
+    };
+}

bsc/llvm-ompss2/default.nix

@@ -15,7 +15,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "10.0.0";
+  version = "11.0.0";
   name = "llvm-ompss2-${version}";
   enableParallelBuilding = true;
 
@@ -31,8 +31,11 @@ stdenv.mkDerivation rec {
     libffi
     pkg-config
   ];
+
   cmakeBuildType = if enableDebug then "Debug" else "Release";
+
   dontUseCmakeBuildDir = true;
+
   preConfigure = ''
     mkdir -p build
     cd build

bsc/openmpi/default.nix

@@ -0,0 +1,109 @@
+{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
+, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
+, libpsm2, libfabric
+
+# Enable CUDA support
+, cudaSupport ? false, cudatoolkit ? null
+
+# Enable the Sun Grid Engine bindings
+, enableSGE ? false
+
+# Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default
+, enablePrefix ? false
+
+# Enable libfabric support (necessary for Omnipath networks) on x86_64 linux
+, fabricSupport ? stdenv.isLinux && stdenv.isx86_64
+
+# Enable mpi_cxx.so
+, enableCxx ? false
+
+}:
+
+assert !cudaSupport || cudatoolkit != null;
+
+let
+  version = "4.0.3";
+
+  cudatoolkit_joined = symlinkJoin {
+    name = "${cudatoolkit.name}-unsplit";
+    paths = [ cudatoolkit.out cudatoolkit.lib ];
+  };
+in stdenv.mkDerivation rec {
+  pname = "openmpi";
+  inherit version;
+
+  src = with stdenv.lib.versions; fetchurl {
+    url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
+    sha256 = "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl";
+  };
+
+  postPatch = ''
+    patchShebangs ./
+
+    # Ensure build is reproducible
+    ts=`date -d @$SOURCE_DATE_EPOCH`
+    sed -i 's/OPAL_CONFIGURE_USER=.*/OPAL_CONFIGURE_USER="nixbld"/' configure
+    sed -i 's/OPAL_CONFIGURE_HOST=.*/OPAL_CONFIGURE_HOST="localhost"/' configure
+    sed -i "s/OPAL_CONFIGURE_DATE=.*/OPAL_CONFIGURE_DATE=\"$ts\"/" configure
+    find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \;
+  '';
+
+  buildInputs = with stdenv; [ gfortran zlib ]
+    ++ lib.optionals isLinux [ libnl numactl ]
+    ++ lib.optionals cudaSupport [ cudatoolkit ]
+    ++ [ libevent hwloc ]
+    ++ lib.optional (isLinux || isFreeBSD) rdma-core
+    ++ lib.optional fabricSupport [ libpsm2 libfabric ];
+
+  nativeBuildInputs = [ perl ];
+
+  configureFlags = with stdenv; lib.optional (!cudaSupport) "--disable-mca-dso"
+    ++ lib.optional isLinux  "--with-libnl=${libnl.dev}"
+    ++ lib.optional enableSGE "--with-sge"
+    ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default"
+    # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build
+    # 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.optional enableCxx "--enable-mpi-cxx"
+    ;
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    rm -f $out/lib/*.la
+   '';
+
+  postFixup = ''
+    # default compilers should be indentical to the
+    # compilers at build time
+
+    sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \
+      $out/share/openmpi/mpicc-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \
+       $out/share/openmpi/ortecc-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \
+       $out/share/openmpi/mpic++-wrapper-data.txt
+
+    sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:'  \
+       $out/share/openmpi/mpifort-wrapper-data.txt
+  '';
+
+  doCheck = true;
+
+  passthru = {
+    inherit cudaSupport cudatoolkit;
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.open-mpi.org/";
+    description = "Open source MPI-3 implementation";
+    longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
+    maintainers = with maintainers; [ markuskowa ];
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+  };
+}

default.nix

@@ -11,11 +11,18 @@ let
   callPackages = callPackagesWith (pkgs // self.bsc);
 
   self.bsc = rec {
-    # Load the current implementations
-    #mpi = pkgs.mpich;
-    mpi = pkgs.openmpi;
 
-    # Load the compiler
+    # Custom OpenMPI with mpi_cxx enabled for TAMPI
+    openmpi = callPackage ./bsc/openmpi/default.nix {
+      enableCxx = true;
+    };
+
+    # Load the default implementation
+    #mpi = pkgs.mpich;
+    #mpi = pkgs.openmpi;
+    mpi = openmpi; # Our OpenMPI variant
+
+    # Load the default compiler
     #stdenv = pkgs.gcc7Stdenv;
     #stdenv = pkgs.gcc9Stdenv;
     #stdenv = pkgs.gcc10Stdenv;
@@ -38,5 +45,14 @@ let
     };
 
     llvm-ompss2 = callPackage ./bsc/llvm-ompss2/default.nix { };
+
+    cpic = callPackage ./bsc/cpic/default.nix {
+      mpi = mpi;
+      nanos6 = nanos6-git;
+      llvm-ompss2 = llvm-ompss2;
+    };
+
+    dummy = callPackage ./bsc/dummy/default.nix { };
+
   };
 in pkgs // self