Saiph: Removing devMode parameter

This commit is contained in:
Sandra 2020-11-12 19:10:43 +01:00
parent 5333058741
commit 86d1d426ec
3 changed files with 7 additions and 15 deletions

3
NOISE
View File

@ -121,6 +121,3 @@ ABSTRACT
within Nix, they will be copied with the current data and consequently
not updated during the Nix compilation process.
See saiph devMode option and its implications at
bscpkgs/garlic/saiph/default.nix

View File

@ -6,7 +6,6 @@
, cc
, vtk
, boost
, devMode ? false
, gitBranch ? "master"
, numComm ? null
, vectFlags ? null
@ -16,12 +15,10 @@
stdenv.mkDerivation rec {
name = "saiph";
src = (if (devMode == true) then ~/repos/saiph
else
builtins.fetchGit {
url = "ssh://git@bscpm02.bsc.es/DSLs/saiph.git";
ref = "${gitBranch}";
});
src = builtins.fetchGit {
url = "ssh://git@bscpm02.bsc.es/DSLs/saiph.git";
ref = "${gitBranch}";
};
programPath = "/bin/ExHeat3D";
@ -46,9 +43,8 @@ stdenv.mkDerivation rec {
cd saiphv2/cpp/src
export VTK_VERSION=8.2
export VTK_HOME=${vtk}
''
+ (if (devMode == true) then "make clean" else "")
;
make clean
'';
makeFlags = [
"-f" "Makefile.${cc.cc.CC}"

View File

@ -20,7 +20,6 @@ let
unitName = "${expName}.nc-${toString numComm}";
# saiph options
devMode = false;
inherit (c) numComm;
mpi = impi;
gitBranch = "garlic/tampi+isend+oss+task+simd";
@ -57,7 +56,7 @@ let
customPkgs = stdexp.replaceMpi conf.mpi;
in
customPkgs.apps.saiph.override {
inherit devMode numComm mpi gitBranch;
inherit numComm mpi gitBranch;
};
pipeline = stdexp.stdPipeline ++ [ exec program ];