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

WIP

Browse Source
This commit is contained in:
Raúl Peñacoba 2020-10-08 17:42:17 +02:00
parent ae6a3f9206
commit a44042615a
2 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
garlic/apps/hpcg/default.nix
View File

@ -2,40 +2,37 @@
stdenv
, nanos6
, mpi
, mcxx
, tampi
, icc
, cc
, gitBranch ? "garlic/seq"
, makefileName ? "Linux_Serial"
}:
stdenv.mkDerivation rec {
name = "hpcg";
src = builtins.fetchGit {
url = "ssh://git@bscpm02.bsc.es/rpenacob/hpcg.git";
ref = "symgs_coloring_more_than_one_block_per_task_halos_blocking_discreete";
url = "ssh://git@bscpm02.bsc.es/rpenacob/garlic-hpcg.git";
ref = "${gitBranch}";
};
prePatch = ''
#export NIX_DEBUG=6
'';
patches = [ ./tampi.patch ];
buildInputs = [
nanos6
mpi
icc
tampi
mcxx
cc
];
enableParallelBuilding = true;
configurePhase = ''
export TAMPI_HOME=${tampi}
mkdir build
cd build
../configure MPI_ICPC_OSS
../configure ${makefileName}
'';
installPhase = ''

48
overlay.nix
View File

@ -172,19 +172,6 @@ let
# Apps for Garlic
apps = {
creams = callPackage ./garlic/apps/creams/default.nix {
gnuDef = self.gfortran10 ; # Default GNU compiler version
intelDef = self.bsc.icc ; # Default Intel compiler version
gitBranch = "garlic/mpi+send+seq";
cc = self.bsc.icc; # self.bsc.icc OR self.gfortran10;
mpi = self.bsc.mpi; # self.bsc.mpi OR self.bsc.openmpi-mn4;
};
creamsInput = callPackage ./garlic/apps/creams/input.nix {
gitBranch = "garlic/mpi+send+seq";
};
nbody = callPackage ./garlic/apps/nbody/default.nix {
cc = self.bsc.icc;
@ -198,6 +185,23 @@ let
cc = self.bsc.clangOmpss2;
};
creams = callPackage ./garlic/apps/creams/default.nix {
gnuDef = self.gfortran10 ; # Default GNU compiler version
intelDef = self.bsc.icc ; # Default Intel compiler version
gitBranch = "garlic/mpi+send+seq";
cc = self.bsc.icc; # self.bsc.icc OR self.gfortran10;
mpi = self.bsc.mpi; # self.bsc.mpi OR self.bsc.openmpi-mn4;
};
creamsInput = callPackage ./garlic/apps/creams/input.nix {
gitBranch = "garlic/mpi+send+seq";
};
hpcg = callPackage ./garlic/hpcg {
cc = self.bsc.icc;
gitBranch = "garlic/seq";
};
# heat = callPackage ./garlic/apps/heat {
# stdenv = pkgs.gcc7Stdenv;
# mpi = intel-mpi;
@ -208,8 +212,6 @@ let
# mpi = intel-mpi;
# };
#
# hpcg = callPackage ./garlic/apps/hpcg { };
#
# hpccg = callPackage ./garlic/apps/hpccg { };
#
# fwi = callPackage ./garlic/apps/fwi { };
@ -257,11 +259,19 @@ let
};
};
};
};
test = {
exec = callPackage ./test/garlic/exec.nix {
exec = self.bsc.garlic.stages.exec;
test = {
exec = callPackage ./test/garlic/exec.nix {
exec = self.bsc.garlic.stages.exec;
};
osu = rec {
latency-internode = callPackage ./garlic/exp/osu/latency.nix { };
latency-intranode = callPackage ./garlic/exp/osu/latency.nix {
interNode = false;
};
latency = latency-internode;
};
};
};
};