TEMPLATES: Simplify

Author: HenrikBengtsson

DESCRIPTION

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

R/BatchtoolsTemplateFutureBackend-class.R

@@ -92,7 +92,7 @@ BatchtoolsTemplateFutureBackend <- function(type, scheduler.latency = 1.0, fs.la
               !is.na(template), nzchar(template))
 
   template <- find_template_file(template)
-
+  
   keep <- which(names(dotdotdot) %in% names(make_cfs_formals))
   args <- c(list(template = template), dotdotdot[keep], scheduler.latency = scheduler.latency, fs.latency = fs.latency)
   cluster.functions <- do.call(make_cfs, args = args)

inst/templates/lsf.tmpl

@@ -12,7 +12,7 @@
 #BSUB -o <%= log.file %>
 
 ## Resources needed
-<% if (length(resources) > 0) {
+<%
   ## As-is resource specifications
   if ("asis" %in% names(resources)) {
     lines <- resources[["asis"]]
@@ -26,7 +26,7 @@
   opts <- sprintf("-%s=%s", names(opts), opts)
   lines <- sprintf("#BSUB %s", c(lines, opts))
   writeLines(lines)
-} %>
+%>
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"

inst/templates/openlava.tmpl

@@ -12,7 +12,7 @@
 #BSUB -o <%= log.file %>
 
 ## Resources needed
-<% if (length(resources) > 0) {
+<%
   ## As-is resource specifications
   if ("asis" %in% names(resources)) {
     lines <- resources[["asis"]]
@@ -26,7 +26,7 @@
   opts <- sprintf("-%s=%s", names(opts), opts)
   lines <- sprintf("#BSUB %s", c(lines, opts))
   writeLines(lines)
-} %>
+%>
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"

inst/templates/sge.tmpl

@@ -21,7 +21,7 @@
 #$ -cwd
 
 ## Resources needed:
-<% if (length(resources) > 0) {
+<%
   ## As-is resource specifications
   if ("asis" %in% names(resources)) {
     lines <- resources[["asis"]]
@@ -35,7 +35,7 @@
   opts <- sprintf("-l %s=%s", names(opts), opts)
   lines <- sprintf("#$ %s", c(lines, opts))
   writeLines(lines)
-} %>
+%>
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"

inst/templates/slurm.tmpl

@@ -11,7 +11,7 @@
 #SBATCH --output=<%= log.file %>
 
 ## Resources needed:
-<% if (length(resources) > 0) {
+<%
   ## As-is resource specifications
   if ("asis" %in% names(resources)) {
     lines <- resources[["asis"]]
@@ -25,7 +25,7 @@
   opts <- sprintf("--%s=%s", names(opts), opts)
   lines <- sprintf("#SBATCH %s", c(lines, opts))
   writeLines(lines)
-} %>
+%>
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"

inst/templates/torque.tmpl

@@ -15,7 +15,7 @@
 #PBS -j oe
 
 ## Resources needed:
-<% if (length(resources) > 0) {
+<%
   ## As-is resource specifications
   if ("asis" %in% names(resources)) {
     lines <- resources[["asis"]]
@@ -29,7 +29,7 @@
   opts <- sprintf("-l %s=%s", names(opts), opts)
   lines <- sprintf("#PBS %s", c(lines, opts))
   writeLines(lines)
-} %>
+%>
 
 echo "Batchtools information:"
 echo "- job name: '<%= job.name %>'"