rbbt-util 5.26.39 → 5.26.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/rbbt/hpc.rb +7 -3
- 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: c402dd55adf3e0a67b17b70c55550033e5c49d8662d9a299fb11247c602b4d9a
|
|
4
|
+
data.tar.gz: 48bea651b2efa8ef85e0dd34cfccd3ceb446dd4353c41a482fe8ba08b382f88b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 96cfd11c662b6fb442687fd1b545344ef9c1834f8800bd9cd29985507824df45fe3ab2d6b68c2d9ee03bb696aae287dc6e877b154c65e5f3fb5c27a1adba35a4
|
|
7
|
+
data.tar.gz: a6b4eee7818f876694d30050044cd2ae885eb2c52f32ba3dd41444904d9e4ef4bbfeaa09a49a3f7b38f94e15c2e81f5d4295c0c25c0c6d0ac1590a6da8bc6aeb
|
data/lib/rbbt/hpc.rb
CHANGED
|
@@ -123,8 +123,9 @@ let "MAX_MEMORY=$SLURM_MEM_PER_CPU * $SLURM_CPUS_ON_NODE"
|
|
|
123
123
|
env +=<<-EOF
|
|
124
124
|
module load intel/2018.1
|
|
125
125
|
module load singularity
|
|
126
|
-
|
|
127
|
-
|
|
126
|
+
PROJECTS_ROOT="/gpfs/projects/bsc26/"
|
|
127
|
+
SINGULARITY_IMG="$PROJECTS_ROOT/rbbt.singularity.img"
|
|
128
|
+
SINGULARITY_OVERLAY_DIR="$PROJECTS_ROOT/rbbt.singularity.overlays"
|
|
128
129
|
SINGULARITY_RUBY_INLINE="$HOME/.singularity_ruby_inline"
|
|
129
130
|
mkdir -p "$SINGULARITY_RUBY_INLINE"
|
|
130
131
|
EOF
|
|
@@ -181,6 +182,9 @@ echo "/scratch/tmp/rbbt/projects/rbbt/workflows/" > $CONTAINER_DIR/.rbbt/etc/wor
|
|
|
181
182
|
# Copy image
|
|
182
183
|
rsync -avz "$SINGULARITY_IMG" "$CONTAINER_DIR/rbbt.singularity.img" 1>&2
|
|
183
184
|
SINGULARITY_IMG="$CONTAINER_DIR/rbbt.singularity.img"
|
|
185
|
+
|
|
186
|
+
rsync -avz "$SINGULARITY_OVERLAY_DIR"/ "$CONTAINER_DIR/rbbt.singularity.overlays/" 1>&2
|
|
187
|
+
SINGULARITY_OVERLAY_DIR="$CONTAINER_DIR/rbbt.singularity.overlays"
|
|
184
188
|
EOF
|
|
185
189
|
end
|
|
186
190
|
|
|
@@ -202,7 +206,7 @@ EOF
|
|
|
202
206
|
exec_cmd = %(env _JAVA_OPTIONS="-Xms1g -Xmx${MAX_MEMORY}m")
|
|
203
207
|
|
|
204
208
|
if singularity
|
|
205
|
-
singularity_exec = %(singularity exec -e $(ls $SINGULARITY_OVERLAY_DIR/*.img
|
|
209
|
+
singularity_exec = %(singularity exec -e $(for f in `ls $SINGULARITY_OVERLAY_DIR/*.img`; do echo -n --overlay "'$f' "; done) )
|
|
206
210
|
|
|
207
211
|
if contain
|
|
208
212
|
singularity_exec << %( -C -H "$CONTAINER_DIR" \
|