Built-in templates now report on 'module list' too, if length(resources) > 0

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.12.2-9971
+Version: 0.12.2-9972
 Depends:
     R (>= 3.2.0),
     parallelly,

inst/templates/bash.tmpl

@@ -16,9 +16,9 @@
 %>
 
 echo "Load environment modules:"
-<%
-  writeLines(sprintf("module load %s", modules))
-%>
+<% if (length(modules) > 0) {
+  writeLines(c(sprintf("module load %s", modules), "module list"))
+} %>
 
 # Launch R and evaluate the batchtools R job
 <%= timeout %> Rscript -e 'batchtools::doJobCollection("<%= uri %>", output = "<%= log.file %>")'

inst/templates/lsf.tmpl

@@ -34,9 +34,9 @@ echo "- job log file: '<%= log.file %>'"
 echo
 
 echo "Load environment modules:"
-<%
-  writeLines(sprintf("module load %s", modules))
-%>
+<% if (length(modules) > 0) {
+  writeLines(c(sprintf("module load %s", modules), "module list"))
+} %>
 
 echo "Session information:"
 echo "- timestamp: $(date)"

inst/templates/openlava.tmpl

@@ -34,9 +34,9 @@ echo "- job log file: '<%= log.file %>'"
 echo
 
 echo "Load environment modules:"
-<%
-  writeLines(sprintf("module load %s", modules))
-%>
+<% if (length(modules) > 0) {
+  writeLines(c(sprintf("module load %s", modules), "module list"))
+} %>
 
 echo "Session information:"
 echo "- timestamp: $(date)"

inst/templates/sge.tmpl

@@ -43,9 +43,9 @@ echo "- job log file: '<%= log.file %>'"
 echo
 
 echo "Load environment modules:"
-<%
-  writeLines(sprintf("module load %s", modules))
-%>
+<% if (length(modules) > 0) {
+  writeLines(c(sprintf("module load %s", modules), "module list"))
+} %>
 
 echo "Session information:"
 echo "- timestamp: $(date)"

inst/templates/slurm.tmpl

@@ -33,9 +33,9 @@ echo "- job log file: '<%= log.file %>'"
 echo
 
 echo "Load environment modules:"
-<%
-  writeLines(sprintf("module load %s", modules))
-%>
+<% if (length(modules) > 0) {
+  writeLines(c(sprintf("module load %s", modules), "module list"))
+} %>
 
 echo "Session information:"
 echo "- timestamp: $(date)"

inst/templates/torque.tmpl

@@ -50,9 +50,9 @@ echo "- Rscript library paths: $(Rscript -e "cat(shQuote(.libPaths()), sep = ' '
 echo
 
 echo "Job submission declarations:"
-<%
-  writeLines(sprintf("echo '%s'", job_declarations))
-%>
+<% if (length(modules) > 0) {
+  writeLines(c(sprintf("module load %s", modules), "module list"))
+} %>
 
 echo "Job information:"
 qstat -f "${PBS_JOBID}"