rbbt-util 5.26.36 → 5.26.37
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/hpc.rb +16 -5
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8e4344a2ec967804100fde955c1e8b4e71ba3985cdd24322fdac97641fbefd41
|
4
|
+
data.tar.gz: 6753f2431714d64a64a8764ebea61f8ae338a4b244bcd0c93764a681a03a8cd6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 13e3c5553cc5364cbbb0d54aecc333cba23c20240dc18839b8f98c726cf55c5c2e66c6a13ad7b3c921676e8cab823c4f534421ba0344046fa7431b28f910e628
|
7
|
+
data.tar.gz: 73873821fee4f6d60f6b2d9f91fd073cee06084b92fe76de00bcd75a023683e7e37bdb8c58667df60e252cdca151f6cb9449f259bc4d057647c38c124b056694
|
data/lib/rbbt/hpc.rb
CHANGED
@@ -124,6 +124,7 @@ let "MAX_MEMORY=$SLURM_MEM_PER_CPU * $SLURM_CPUS_ON_NODE"
|
|
124
124
|
module load intel/2018.1
|
125
125
|
module load singularity
|
126
126
|
SINGULARITY_IMG="$HOME/projects/rbbt.singularity.img"
|
127
|
+
SINGULARITY_OVERLAY_DIR="$HOME/projects/rbbt.singularity.overlays"
|
127
128
|
SINGULARITY_RUBY_INLINE="$HOME/.singularity_ruby_inline"
|
128
129
|
mkdir -p "$SINGULARITY_RUBY_INLINE"
|
129
130
|
EOF
|
@@ -197,9 +198,14 @@ EOF
|
|
197
198
|
# RUN
|
198
199
|
run = ""
|
199
200
|
|
201
|
+
|
202
|
+
exec_cmd = %(env _JAVA_OPTIONS="-Xms1g -Xmx${MAX_MEMORY}m)
|
203
|
+
|
200
204
|
if singularity
|
205
|
+
singularity_exec = %(singularity exec -e $(ls $SINGULARITY_OVERLAY_DIR/*.img |xargs -l echo -n " " --overlay) )
|
206
|
+
|
201
207
|
if contain
|
202
|
-
|
208
|
+
singularity_exec << %( -C -H "$CONTAINER_DIR" \
|
203
209
|
-B /apps/ \
|
204
210
|
-B /scratch/tmp \
|
205
211
|
-B "$SINGULARITY_RUBY_INLINE":"$CONTAINER_DIR/.ruby_inline":rw \
|
@@ -208,16 +214,21 @@ EOF
|
|
208
214
|
-B ~/.rbbt:"$CONTAINER_DIR/home/":ro \
|
209
215
|
-B #{scratch_group_dir} \
|
210
216
|
-B #{projects_group_dir} \
|
211
|
-
"$SINGULARITY_IMG"
|
217
|
+
"$SINGULARITY_IMG")
|
218
|
+
exec_cmd << ' TMPDIR="$CONTAINER_DIR/.rbbt/tmp" '
|
212
219
|
else
|
213
|
-
|
220
|
+
singularity_exec = %(-B /apps/ -B "$SINGULARITY_RUBY_INLINE":"$HOME/.ruby_inline":rw "$SINGULARITY_IMG")
|
214
221
|
end
|
215
222
|
|
216
223
|
if development
|
217
|
-
exec_cmd += ' --dev=git'
|
224
|
+
exec_cmd += 'rbbt --dev=git'
|
225
|
+
else
|
226
|
+
exec_cmd += 'rbbt'
|
218
227
|
end
|
228
|
+
|
229
|
+
exec_cmd = singularity_exec + " " + exec_cmd
|
219
230
|
else
|
220
|
-
exec_cmd
|
231
|
+
exec_cmd << %(~/git/rbbt-util/bin/rbbt --dev=~/git/)
|
221
232
|
end
|
222
233
|
|
223
234
|
|