use mem in Mb, same default amount for all schedulers

Author: mschubert

inst/GCS.tmpl

@@ -36,10 +36,10 @@
 # Change to *env* if scheduler should make binding decision but not do the binding itself.
 #$ -binstance set
 
-# Allows to set resource requests like memory (1 GB [in bytes])
+# Allows to set resource requests like memory (4 GB [in bytes])
 # to set runtime limits (1 hour [in seconds])
 # or to influence scheduler resource selection (job will be executed in all.q queue)
-#$ -l mem_free={{ memory | 1073741824 }},h_rt={{ walltime | 3600 }},q=all.q
+#$ -l mem_free=$(( 1024 * 1024 * {{ memory | 4096 }} )),h_rt={{ walltime | 3600 }},q=all.q
 
 # Tag the job so that it can be identified later on (e.g. in a JSV script before
 # submission so the job can get adapted or for filtering later on)

inst/OCS.tmpl

@@ -28,10 +28,10 @@
 #$ -bunit C
 #$ -bamount {{ threads | 1 }}
 
-# Allows to set resource requests like memory (default 1 GB in bytes)
+# Allows to set resource requests like memory (default 4 GB in bytes)
 # to set runtime limits (default 1 hour in seconds)
 # or to influence scheduler resource selection (job will be executed in all.q)
-#$ -l mem_free={{ memory | 1073741824 }},h_rt={{ runtime | 3600 }},q=all.q
+#$ -l mem_free=$(( 1024 * 1024 * {{ memory | 4096 }} )),h_rt={{ walltime | 3600 }},q=all.q
 
 ulimit -v $(( 1024 * {{ memory | 4096 }} - 25 ))
 CMQ_AUTH={{ auth }} R --no-save --no-restore -e 'clustermq:::worker("{{ master }}")'

vignettes/userguide.Rmd

@@ -515,7 +515,8 @@ to a file and have `clustermq.template` point to it.
 #$ -bstrategy packed             # *Pack* cores on a host to share NUMA nodes and caches
 #$ -btype host                   # Bind per host
 #$ -binstance set                # Use HWLOC to bind cores
-#$ -l mem_free={{ memory | 1073741824 }},h_rt={{ walltime | 3600 }},q=all.q # Resource requests and limits
+## Resource requests and limits (convert memory from Mb to bytes)
+#$ -l mem_free=$(( 1024 * 1024 * {{ memory | 4096 }} )),h_rt={{ walltime | 3600 }},q=all.q
 #$ -ac application=clustermq,hostname={{ master }} # Tag the job
 
 ulimit -v $(( 1024 * {{ memory | 4096 }} ))
@@ -569,7 +570,8 @@ to a file and have `clustermq.template` point to it.
 #$ -pe mytestpe {{ cores | 1 }}  # Allocate one slot per task
 #$ -bunit C                      # Allocate *power core(s)* per slot
 #$ -bamount {{ threads | 1 }}    # Allocate *one* power core per slot
-#$ -l mem_free={{ memory | 1073741824 }},h_rt={{ walltime | 3600 }},q=all.q # Resource requests and limits
+## Resource requests and limits (convert memory from Mb to bytes)
+#$ -l mem_free=$(( 1024 * 1024 * {{ memory | 4096 }} )),h_rt={{ walltime | 3600 }},q=all.q
 #$ -ac application=clustermq,hostname={{ master }} # Tag the job
 
 ulimit -v $(( 1024 * {{ memory | 4096 }} ))