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

Saiph: Removing devMode parameter

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NOISE
View File

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

16
garlic/apps/saiph/default.nix
View File

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

3
garlic/exp/saiph/numcomm.nix
View File

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