rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify package versions

Browse Source
This commit is contained in:
Rodrigo Arias 2020-07-20 11:59:58 +02:00
parent d634538223
commit 11b1652617
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
default.nix
View File

@ -11,20 +11,23 @@ let
# Load the default implementation # Load the default implementation
#mpi = pkgs.mpich; #mpi = pkgs.mpich;
#mpi = pkgs.openmpi; #mpi = pkgs.openmpi;
mpi = openmpi; # Our OpenMPI variant #mpi = openmpi; # Our OpenMPI variant
#mpi = intel-mpi; mpi = intel-mpi;
# Load the default compiler # Load the default compiler
#stdenv = pkgs.gcc10Stdenv; #stdenv = pkgs.gcc10Stdenv;
#stdenv = pkgs.gcc9Stdenv; stdenv = pkgs.gcc9Stdenv;
#stdenv = pkgs.gcc7Stdenv; #stdenv = pkgs.gcc7Stdenv;
stdenv = pkgs.llvmPackages_10.stdenv; #stdenv = pkgs.llvmPackages_10.stdenv;
#stdenv = pkgs.llvmPackages_9.stdenv; #stdenv = pkgs.llvmPackages_9.stdenv;
#stdenv = pkgs.llvmPackages_8.stdenv; #stdenv = pkgs.llvmPackages_8.stdenv;
#stdenv = pkgs.llvmPackages_7.stdenv; #stdenv = pkgs.llvmPackages_7.stdenv;
binutils = pkgs.binutils; binutils = pkgs.binutils;
coreutils = pkgs.coreutils; coreutils = pkgs.coreutils;
gcc = stdenv.cc;
nanos6 = nanos6-git;
# --------------------------------------------------------- # # --------------------------------------------------------- #
# BSC Packages # BSC Packages
@ -72,11 +75,12 @@ let
}; };
mcxx = callPackage ./bsc/mcxx/default.nix { mcxx = callPackage ./bsc/mcxx/default.nix {
stdenv = pkgs.gcc9Stdenv;
nanos6 = nanos6-git;
}; };
nanos6 = callPackage ./bsc/nanos6/default.nix { mcxx-rarias = callPackage ./bsc/mcxx/rarias.nix {
};
nanos6-latest = callPackage ./bsc/nanos6/default.nix {
extrae = extrae; extrae = extrae;
}; };
@ -84,6 +88,10 @@ let
extrae = extrae; extrae = extrae;
}; };
nanos6-rarias = callPackage ./bsc/nanos6/rarias.nix {
extrae = extrae;
};
vtk = callPackage ./bsc/vtk/default.nix { vtk = callPackage ./bsc/vtk/default.nix {
mpi = mpi; mpi = mpi;
inherit (pkgs.xorg) libX11 xorgproto libXt; inherit (pkgs.xorg) libX11 xorgproto libXt;
@ -98,7 +106,6 @@ let
}; };
clang-ompss2 = callPackage bsc/llvm-ompss2/default.nix { clang-ompss2 = callPackage bsc/llvm-ompss2/default.nix {
nanos6 = nanos6-git;
inherit clang-ompss2-unwrapped; inherit clang-ompss2-unwrapped;
}; };
@ -108,7 +115,6 @@ let
cpic = callPackage ./bsc/apps/cpic/default.nix { cpic = callPackage ./bsc/apps/cpic/default.nix {
stdenv = stdenv-nanos6; stdenv = stdenv-nanos6;
nanos6 = nanos6-git;
inherit mpi tampi; inherit mpi tampi;
}; };
@ -117,21 +123,18 @@ let
stdenv = pkgs.gcc9Stdenv; stdenv = pkgs.gcc9Stdenv;
mpi = intel-mpi; mpi = intel-mpi;
tampi = tampi; tampi = tampi;
nanos6 = nanos6-git;
}; };
gauss-seidel = callPackage ./bsc/apps/gauss-seidel/default.nix { gauss-seidel = callPackage ./bsc/apps/gauss-seidel/default.nix {
stdenv = pkgs.gcc7Stdenv; stdenv = pkgs.gcc7Stdenv;
mpi = intel-mpi; mpi = intel-mpi;
tampi = tampi; tampi = tampi;
nanos6 = nanos6-git;
}; };
saiph = callPackage ./bsc/apps/saiph/default.nix { saiph = callPackage ./bsc/apps/saiph/default.nix {
stdenv = stdenv-nanos6; stdenv = stdenv-nanos6;
mpi = intel-mpi; mpi = intel-mpi;
tampi = tampi; tampi = tampi;
nanos6 = nanos6-git;
inherit vtk; inherit vtk;
boost = pkgs.boost; boost = pkgs.boost;
}; };
@ -142,20 +145,13 @@ let
tampi = tampi.override { tampi = tampi.override {
mpi = intel-mpi; mpi = intel-mpi;
}; };
nanos6 = nanos6-git;
}; };
lulesh = callPackage ./bsc/apps/lulesh/default.nix { lulesh = callPackage ./bsc/apps/lulesh/default.nix {
mpi = intel-mpi; mpi = intel-mpi;
nanos6 = nanos6-git;
}; };
hpcg = callPackage ./bsc/apps/hpcg/default.nix { hpcg = callPackage ./bsc/apps/hpcg/default.nix {
mpi = intel-mpi;
nanos6 = nanos6-git;
tampi = tampi.override {
mpi = intel-mpi;
};
}; };
# Patched nix for deep cluster # Patched nix for deep cluster
@ -175,7 +171,6 @@ let
clang-ompss2 = callPackage ./test/compilers/clang-ompss2.nix { clang-ompss2 = callPackage ./test/compilers/clang-ompss2.nix {
stdenv = stdenv-nanos6; stdenv = stdenv-nanos6;
nanos6 = nanos6-git;
inherit clang-ompss2; inherit clang-ompss2;
}; };
}; };