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

Merge branch 'master' of bscpm02.bsc.es:rarias/bsc-nixpkgs into master

Browse Source
This commit is contained in:
Rodrigo Arias 2020-08-25 13:00:10 +02:00
commit 67ac951289
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bsc/garlic/exp/nbody/bs.nix
View File

@ -37,7 +37,6 @@ let
nixPrefix = "/gpfs/projects/bsc15/nix"; nixPrefix = "/gpfs/projects/bsc15/nix";
exclusive = false; exclusive = false;
ntasks = "${toString conf.ntasks}"; ntasks = "${toString conf.ntasks}";
chdirPrefix = "/home/bsc15/bsc15557/bsc-nixpkgs/out";
}; };
srun = app: srunWrapper { srun = app: srunWrapper {

4
bsc/garlic/sbatch.nix
View File

@ -5,7 +5,7 @@
{ {
app app
, chdirPrefix , chdirPrefix ? "."
, nixPrefix ? "" , nixPrefix ? ""
, argv ? "" , argv ? ""
, binary ? "/bin/run" , binary ? "/bin/run"
@ -14,6 +14,7 @@
, nodes ? null , nodes ? null
, exclusive ? true # By default we run in exclusive mode , exclusive ? true # By default we run in exclusive mode
, qos ? null , qos ? null
, reservation ? null
, time ? null , time ? null
, output ? "job_%j.out" , output ? "job_%j.out"
, error ? "job_%j.err" , error ? "job_%j.err"
@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
+ sbatchEnable "exclusive" exclusive + sbatchEnable "exclusive" exclusive
+ sbatchOpt "time" time + sbatchOpt "time" time
+ sbatchOpt "qos" qos + sbatchOpt "qos" qos
+ sbatchOpt "reservation" reservation
+ optionalString (extra!=null) extra + optionalString (extra!=null) extra
+ +
'' ''