coderunner 0.11.1 → 0.11.2

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

data/coderunner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.11.1"
+  s.version = "0.11.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
@@ -43,6 +43,16 @@ Gem::Specification.new do |s|
     "lib/coderunner/long_regexen.rb",
     "lib/coderunner/merged_code_runner.rb",
     "lib/coderunner/run.rb",
+    "lib/coderunner/system_modules/franklin.rb",
+    "lib/coderunner/system_modules/generic_linux.rb",
+    "lib/coderunner/system_modules/genericlinux_testsystem.rb",
+    "lib/coderunner/system_modules/hector.rb",
+    "lib/coderunner/system_modules/helios.rb",
+    "lib/coderunner/system_modules/juropa.rb",
+    "lib/coderunner/system_modules/macosx.rb",
+    "lib/coderunner/system_modules/moab.rb",
+    "lib/coderunner/system_modules/new_hydra.rb",
+    "lib/coderunner/system_modules/slurm.rb",
     "test/helper.rb",
     "test/test_coderunner.rb"
   ]

data/lib/coderunner.rb

@@ -10,7 +10,7 @@ end
 class CodeRunner
 	
 	COMMAND_FOLDER = Dir.pwd
-  SCRIPT_FOLDER = File.dirname(File.expand_path(__FILE__)) #i.e. where this script is
+  SCRIPT_FOLDER = File.dirname(File.expand_path(__FILE__)) + '/coderunner' #i.e. where this script is
 	if ENV['CODE_RUNNER_OPTIONS']
 		GLOBAL_OPTIONS = eval(ENV['CODE_RUNNER_OPTIONS']) # global options are set by the environment but some can be changed.
 	else

data/lib/coderunner/system_modules/franklin.rb

@@ -0,0 +1,42 @@
+class CodeRunner
+	require SCRIPT_FOLDER + '/system_modules/moab.rb'
+	module Franklin 
+		include Moab
+	
+	def batch_script
+		nodes, ppn = @nprocs.split(/x/)
+		eputs "Warning: Underuse of nodes (#{ppn} cores per node instead of 4)" if ppn.to_i < 4
+		raise "Please specify project" unless @project
+		raise "Error: cores per node cannot excede 4" if ppn.to_i > 4
+#		raise "Error: project (i.e. budget) not specified" unless @project
+		ppn ||= 4
+		if @wall_mins
+			ep @wall_mins
+			hours = (@wall_mins / 60).floor
+			mins = @wall_mins.to_i % 60
+			secs = ((@wall_mins - @wall_mins.to_i) * 60).to_i
+		end
+		eputs "Allotted wall time is " + sprintf("%02d:%02d:%02d", hours, mins, secs)
+		nprocstot = nodes.to_i * ppn.to_i
+<<EOF
+	#!/bin/bash --login 
+	#PBS -N #{executable_name}.#{job_identifier}
+	#PBS -l mppwidth=#{nprocstot}
+	#PBS -l mppnppn=#{ppn}
+	#{@wall_mins ? "#PBS -l walltime=#{sprintf("%02d:%02d:%02d", hours, mins, secs)}" : ""}
+	#{@project ? "#PBS -A #@project" : ""}
+        #PBS -q #{@runner.debug ? "debug" : "regular"} 
+
+	### start of jobscript 
+	cd $PBS_O_WORKDIR 
+	echo "workdir: $PBS_O_WORKDIR" 
+
+	echo "Submitting #{nodes}x#{ppn} job on Hector for project #@project..."
+	
+	
+EOF
+
+	end
+
+	end
+end

data/lib/coderunner/system_modules/generic_linux.rb

@@ -0,0 +1,81 @@
+class CodeRunner
+module GenericLinux
+
+
+# @@ruby_command = "ruby1.9"
+
+def queue_status
+	if rcp.uses_mpi
+		return %x[ps -e -U #{Process.uid} | grep mpi] + %x[ps -e -U #{Process.uid} | grep -G '\\bsh\\b'] + %x[ps -e -U #{Process.uid} -o pid,user,cmd | grep coderunner].grep(/launch/)
+	else
+# 		ep executable_name
+		return %x[ps -e -U #{Process.uid} | grep '#{executable_name}'] + %x[ps -e -U #{Process.uid} | grep -G '\\bsh\\b']
+	end
+end
+
+def run_command
+	if rcp.uses_mpi
+		return %[time mpirun -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+	else
+		return %[#{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+	end
+end		
+
+def execute
+	log 'execute_submission'
+# 	ppipe = PPipe.new(2, false)
+#   trap(0){}
+# 	ppipe.fork do
+#     trap(0, 'IGNORE')
+# 		trap(2, 'IGNORE')
+# 		pid =  system(run_command + " & ") #  fork{exec run_command}
+# 		ppipe.w_send(:pid, pid, tp: 0)
+# 		Thread.new{Process.wait(pid)} # Need to pick up the dead process when it finishes
+# 	end
+# 	pid = ppipe.w_recv(:pid)
+# 	ppipe.die
+#   eputs "HERE"
+  
+#   trap(0){}
+#   trap(2, 'IGNORE')
+# 	pid = spawn("trap '' 2 && trap '' 0 && " + run_command + " & ")
+  if prefix = ENV['CODE_RUNNER_LAUNCHER']
+    launch_id = "#{Time.now.to_i}#{$$}"
+    fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{launch_id}"
+    File.open(fname + '.start', 'w'){|file| file.puts "cd #{Dir.pwd};#{run_command}"}
+    sleep 1 until FileTest.exist? fname + '.pid'
+    pid = File.read(fname + '.pid').to_i
+    FileUtils.rm fname + '.pid'
+  else
+    pid = Kernel.spawn(run_command + " & ")
+  end
+  
+#   require 'rbconfig'
+#   pid = spawn %[#{Config::CONFIG['bindir']}/#{Config::CONFIG['ruby_install_name']} -e 'puts fork{exec("#{run_command}")}' &]
+  
+#   eputs "THERE"
+# 	Thread.new{Process.wait(pid)}
+#  	sleep 0.2
+	return pid
+end
+
+def cancel_job
+	children = `ps --ppid #@job_no`.scan(/^\s*(\d+)/).map{|match| match[0].to_i}
+	system "kill #{@job_no}"
+	children.each do |pid|
+		 system "kill #{pid}"
+	end
+# 	`kill #{@job_no}`
+end
+
+def error_file
+		return "#{executable_name}.#{job_identifier}.e"
+end
+
+def output_file
+		return "#{executable_name}.#{job_identifier}.o"
+end
+
+
+end
+end

data/lib/coderunner/system_modules/genericlinux_testsystem.rb

@@ -0,0 +1,42 @@
+class CodeRunner
+	module GenericlinuxTestsystem
+
+@@ruby_command = "ruby1.9"
+
+def queue_status
+# 	if @@no_run
+# 		return ""
+# 	else
+		return %x[ps] #%x[top -b -n 1 -u #{Process.uid} | grep #{@@executable_name}]
+# 	end
+	# top runs very slowly. If you have a system (for example your laptop) where you will never run simulations, only analyse them, replace this command with %x[ps] and code runner will run much faster.
+end
+
+def run_command
+	if @@uses_mpi
+		return %[mpirun -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string}]
+	else
+		return %[#{executable_location}/#{executable_name} #{parameter_string}]
+	end
+end		
+
+def execute
+	log 'execute_submission'
+	fork{exec run_command}
+	sleep 0.2
+end
+
+def cancel_job
+	`kill #{@job_no}`
+end
+
+def error_file
+	return nil
+end
+
+def output_file
+	return nil
+end
+
+	end
+end

data/lib/coderunner/system_modules/hector.rb

@@ -0,0 +1,13 @@
+class CodeRunner
+	require SCRIPT_FOLDER + '/system_modules/moab.rb'
+	module Hector
+		include Moab
+		def batch_script
+			raise "Please specify project" unless @project
+			super
+		end
+		def max_ppn
+			32
+		end
+	end
+end

data/lib/coderunner/system_modules/helios.rb

@@ -0,0 +1,13 @@
+class CodeRunner
+	require SCRIPT_FOLDER + '/system_modules/slurm.rb'
+	module Helios
+		include Slurm
+		#def batch_script
+			#raise "Please specify project" unless @project
+			#super
+		#end
+		def max_ppn
+			16
+		end
+	end
+end

data/lib/coderunner/system_modules/juropa.rb

@@ -0,0 +1,123 @@
+class CodeRunner
+
+      # System module for Juropa and HPC-FF
+
+	module Juropa
+
+def queue_status
+	if prefix = ENV['CODE_RUNNER_LAUNCHER']
+		%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status.txt]  +
+		%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status2.txt] 
+	else
+		%x[qstat | grep $USER]
+	end
+end
+
+def run_command
+# 	"msub #{batch_script_file}"
+	if ENV['CODE_RUNNER_LAUNCHER']
+		return %[mpiexec -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+	else
+		"mpiexec -np $NSLOTS #{executable_location}/#{executable_name} #{parameter_string}"
+	end
+end
+
+def execute
+	
+	if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+    launch_id = "#{Time.now.to_i}#{$$}"
+    fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{launch_id}"
+    File.open(fname + '.start', 'w'){|file| file.puts "cd #{Dir.pwd};#{run_command}"}
+    sleep 1 until FileTest.exist? fname + '.pid'
+    pid = File.read(fname + '.pid').to_i
+    FileUtils.rm fname + '.pid'
+		return pid
+  else
+		File.open(batch_script_file, 'w'){|file| file.puts batch_script + run_command + "\n"}
+		jn = %x[msub #{batch_script_file}].scan(/(\d+)\s*\Z/).flatten
+		if jn[0]
+			 return jn[0].to_i
+		 else
+			 return nil
+		 end
+	end
+end
+
+def batch_script_file
+	"#{executable_name}_#{job_identifier}.sh"
+end
+
+def batch_script
+	nodes, ppn = @nprocs.split(/x/)
+	ppn ||= 8
+	if @wall_mins
+		ep @wall_mins
+		hours = (@wall_mins / 60).floor
+		mins = @wall_mins.to_i % 60
+		secs = ((@wall_mins - @wall_mins.to_i) * 60).to_i
+	end
+	eputs "Allotted wall time is " + sprintf("%02d:%02d:%02d", hours, mins, secs)
+<<EOF
+#!/bin/bash -x 
+#MSUB -l nodes=#{nodes}:ppn=#{ppn} 
+#MSUB -N #{executable_name}.#{job_identifier}
+#{@wall_mins ? "#MSUB -l walltime=#{sprintf("%02d:%02d:%02d", hours, mins, secs)}" : ""}
+
+### start of jobscript 
+cd $PBS_O_WORKDIR 
+echo "workdir: $PBS_O_WORKDIR" 
+NSLOTS=#{nodes.to_i * ppn.to_i} 
+echo "running on $NSLOTS cpus ..." 
+
+EOF
+
+#MSUB -e #{Dir.pwd}/#{error_file} 
+#      if keyword omitted : default is submitting directory  
+#MSUB -o #{Dir.pwd}/#{output_file}
+#       if keyword omitted : default is submitting directory 
+end
+
+def cancel_job
+	if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+   	 fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{$$}.stop"
+		 File.open(fname, 'w'){|file| file.puts "\n"}
+	else
+		`canceljob #{@job_no}`
+	end
+end
+
+def error_file
+	#For backwards compatibility
+	return "#{executable_name}.sh.e" if kind_of? CodeRunner::Run and [:Completed, :Failed].include? @status
+	return "#{executable_name}.#{job_identifier}.e#@job_no"
+end
+
+def output_file
+	return "#{executable_name}.sh.o" if kind_of? CodeRunner::Run and [:Completed, :Failed].include? @status
+	return "#{executable_name}.#{job_identifier}.o#@job_no"
+end
+
+def get_run_status(job_no, current_status)
+	if ENV['CODE_RUNNER_LAUNCHER']
+		return :Unknown
+	end
+	line = current_status.split(/\n/).grep(Regexp.new(job_no.to_s))[0]
+	unless line
+		return :Unknown
+	else 
+		if line =~ /\sQ\s/
+			return :Queueing
+		elsif line =~ /\sR\s/
+			return :Running
+		elsif line =~ /\sC\s/
+			return :Unknown
+		else
+			ep 'line', line
+			raise 'Could not get run status'
+		end
+	end
+end
+	
+
+	end
+end

data/lib/coderunner/system_modules/macosx.rb

@@ -0,0 +1,50 @@
+class CodeRunner
+	module Macosx
+# @@ruby_command = "ruby1.9"
+
+def queue_status
+	%x[ps].grep(Regexp.new(Regexp.escape(executable_name))) #Can't put grep in the shell command because it will grep itself - OS X displays the entire command in ps!
+end
+
+def run_command
+	if rcp.uses_mpi
+		return %[mpirun -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+	else
+		return %[#{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+	end
+end		
+
+def execute
+	log 'execute_submission'
+  if ENV['CODE_RUNNER_LAUNCHER']
+    launch_id = "#{Time.now.to_i}#{$$}"
+    fname = ENV['HOME'] + "/.coderunner_to_launch/#{launch_id}"
+    File.open(fname + '.start', 'w'){|file| file.puts "cd #{Dir.pwd};#{run_command}"}
+    sleep 1 until FileTest.exist? fname + '.pid'
+    pid = File.read(fname + '.pid').to_i
+    FileUtils.rm fname + '.pid'
+  else
+    pid = Kernel.spawn(run_command + " & ")
+  end
+  
+	return nil # pid
+end
+
+
+def cancel_job
+	`kill #{@job_no}`
+end
+
+def error_file
+	return executable_name + ".sh.e"
+end
+
+def output_file
+	return executable_name + ".sh.o"
+end
+
+	end
+end
+
+
+

data/lib/coderunner/system_modules/moab.rb

@@ -0,0 +1,133 @@
+class CodeRunner
+module Moab
+
+	def self.configure_environment
+		eputs "Configuring Hector"
+		conf = <<EOF
+eval `modulecmd bash swap PrgEnv-pgi PrgEnv-gnu`
+eval `modulecmd bash load fftw/3.2.2`
+export XTPE_LINK_TYPE=dynamic
+export LD_LIBRARY_PATH=/opt/xt-libsci/10.4.1/gnu/lib/44:$LD_LIBRARY_PATH
+EOF
+	Kernel.change_environment_with_shell_script(conf)
+	end
+				
+	def queue_status
+		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status.txt]  +
+			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status2.txt] 
+		else
+			%x[qstat | grep $USER]
+		end
+	end
+
+	def run_command
+# 		"qsub #{batch_script_file}"
+		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
+			return %[mpiexec -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+		else
+			nodes, ppn = @nprocs.split(/x/)
+			nprocstot = nodes.to_i * ppn.to_i
+			"aprun -n #{nprocstot} -N #{ppn} #{executable_location}/#{executable_name} #{parameter_string}"
+		end
+	end
+
+	def execute
+		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+			launch_id = "#{Time.now.to_i}#{$$}"
+			fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{launch_id}"
+			File.open(fname + '.start', 'w'){|file| file.puts "cd #{Dir.pwd};#{run_command}"}
+			sleep 1 until FileTest.exist? fname + '.pid'
+			pid = File.read(fname + '.pid').to_i
+			FileUtils.rm fname + '.pid'
+			return pid
+		else
+			File.open(batch_script_file, 'w'){|file| file.puts batch_script + run_command + "\n"}
+			pid = %x[qsub #{batch_script_file}].to_i
+		end
+	end
+
+	def batch_script_file
+		"#{executable_name}_#{job_identifier}.sh"
+	end
+
+	def max_ppn
+		raise "Please define max_ppn for your system"
+	end
+	
+	def batch_script
+
+		nodes, ppn = @nprocs.split(/x/)
+		(eputs "Warning: number of nodes is not recommended (8, 16, 32, 64, 128, 256, 512, 1024, 2048 or 4096 recommended)"; sleep 0.2) unless [8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096].include? nodes.to_i
+		(eputs "Warning: number of wall mins is not recommended (20, 60, 180, 360, 720 recomended)"; sleep 0.2) unless [20, 60, 180, 360, 720].include? @wall_mins.to_i
+		eputs "Warning: Underuse of nodes (#{ppn} cores per node instead of #{max_ppn})" if ppn.to_i < max_ppn 
+		raise "Error: cores per node cannot excede #{max_ppn}" if ppn.to_i > max_ppn
+#		raise "Error: project (i.e. budget) not specified" unless @project
+		ppn ||= max_ppn
+		if @wall_mins
+			ep @wall_mins
+			hours = (@wall_mins / 60).floor
+			mins = @wall_mins.to_i % 60
+			secs = ((@wall_mins - @wall_mins.to_i) * 60).to_i
+		end
+		eputs "Allotted wall time is " + sprintf("%02d:%02d:%02d", hours, mins, secs)
+		nprocstot = nodes.to_i * ppn.to_i
+<<EOF
+	#!/bin/bash --login 
+	#PBS -N #{executable_name}.#{job_identifier}
+	#PBS -l mppwidth=#{nprocstot}
+	#PBS -l mppnppn=#{ppn}
+	#{@wall_mins ? "#PBS -l walltime=#{sprintf("%02d:%02d:%02d", hours, mins, secs)}" : ""}
+	#{@project ? "#PBS -A #@project" : ""}
+
+	### start of jobscript 
+	cd $PBS_O_WORKDIR 
+	echo "workdir: $PBS_O_WORKDIR" 
+
+	echo "Submitting #{nodes}x#{ppn} job on Hector for project #@project..."
+	
+	
+EOF
+
+	end
+
+	def cancel_job
+		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+			 fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{$$}.stop"
+			 File.open(fname, 'w'){|file| file.puts "\n"}
+		else
+			`qdel #{@job_no}`
+		end
+	end
+
+	def error_file
+		return "#{executable_name}.#{job_identifier}.e#@job_no"
+	end
+
+	def output_file
+		return "#{executable_name}.#{job_identifier}.o#@job_no"
+	end
+
+def get_run_status(job_no, current_status)
+	if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+		return :Unknown
+	end
+	line = current_status.split(/\n/).grep(Regexp.new(job_no.to_s))[0]
+	unless line
+		return :Unknown
+	else 
+		if line =~ /\sQ\s/
+			return :Queueing
+		elsif line =~ /\sR\s/
+			return :Running
+		elsif line =~ /\sC\s/
+			return :Unknown
+		else
+			ep 'line', line
+			raise 'Could not get run status'
+		end
+	end
+end
+
+	end
+end

data/lib/coderunner/system_modules/new_hydra.rb

@@ -0,0 +1,33 @@
+class CodeRunner
+	module NewHydra
+
+def queue_status
+	%x[qstat | grep $LOGNAME]
+end
+
+def run_command
+	if @runner.debug
+		return %[mpisubshort "40mins" #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string}  ]
+	else 
+		return %[mpisubnoquotes "0.5-10 hrs" #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string}]
+	end
+end
+
+def execute
+	system run_command
+end
+
+def cancel_job
+	`qdel #{@job_no}`
+end
+
+def error_file
+	return "#{executable_name}.sh.e#{@job_no}"
+end
+
+def output_file
+	return "#{executable_name}.sh.o#{@job_no}"
+end
+
+	end
+end

data/lib/coderunner/system_modules/slurm.rb

@@ -0,0 +1,124 @@
+class CodeRunner
+	# A module to let CodeRunner run using the SLURM queue system,
+	# used on certain HPC systems.
+module Slurm
+				
+	def queue_status
+		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status.txt]  +
+			%x[cat #{ENV['HOME']}/.coderunner_to_launch_#{prefix}/queue_status2.txt] 
+		else
+			%x[squeue | grep #{ENV['USER'][0..7]}]
+		end
+	end
+
+	def run_command
+# 		"qsub #{batch_script_file}"
+		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
+			return %[mpiexec -np #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+		else
+			nodes, ppn = @nprocs.split(/x/)
+			nprocstot = nodes.to_i * ppn.to_i
+			"mpirun -np #{nprocstot}  #{executable_location}/#{executable_name} #{parameter_string}"
+		end
+	end
+
+	def execute
+		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+			launch_id = "#{Time.now.to_i}#{$$}"
+			fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{launch_id}"
+			File.open(fname + '.start', 'w'){|file| file.puts "cd #{Dir.pwd};#{run_command}"}
+			sleep 1 until FileTest.exist? fname + '.pid'
+			pid = File.read(fname + '.pid').to_i
+			FileUtils.rm fname + '.pid'
+			return pid
+		else
+			File.open(batch_script_file, 'w'){|file| file.puts batch_script + run_command + "\n"}
+			pid = %x[sbatch #{batch_script_file}].to_i
+			return nil
+		end
+	end
+
+	def batch_script_file
+		"#{executable_name}.#{job_identifier}.sh"
+	end
+
+	def max_ppn
+		raise "Please define max_ppn for your system"
+	end
+	
+	def batch_script
+
+		nodes, ppn = @nprocs.split(/x/)
+		eputs "Warning: Underuse of nodes (#{ppn} cores per node instead of #{max_ppn})" if ppn.to_i < max_ppn 
+		raise "Error: cores per node cannot excede #{max_ppn}" if ppn.to_i > max_ppn
+#		raise "Error: project (i.e. budget) not specified" unless @project
+		ppn ||= max_ppn
+		raise "Please specify wall minutes" unless @wall_mins
+		if @wall_mins
+			ep @wall_mins
+			hours = (@wall_mins / 60).floor
+			mins = @wall_mins.to_i % 60
+			secs = ((@wall_mins - @wall_mins.to_i) * 60).to_i
+		end
+		eputs "Allotted wall time is " + sprintf("%02d:%02d:%02d", hours, mins, secs)
+		nprocstot = nodes.to_i * ppn.to_i
+<<EOF
+#!/bin/bash
+#SBATCH -J #{executable_name}.#{job_identifier} # jobname
+#SBATCH -N #{nodes.to_i}        # number of nodes
+#SBATCH -n #{nprocstot}         # number of tasks
+#SBATCH -o #{executable_name}.#{job_identifier}.o%j              # strout filename (%j is jobid)
+#SBATCH -e #{executable_name}.#{job_identifier}.e%j               # stderr filename (%j is jobid)
+#{@project ? "#SBATCH -A #@project # project to charge" : ""}
+#{@wall_mins ? "#SBATCH -t #{sprintf("%02d:%02d:%02d", hours, mins, secs)} # walltime" : ""}
+
+#{code_run_environment}
+echo "Submitting #{nodes}x#{ppn} job on #{CodeRunner::SYS} for project #@project..."
+
+	
+	
+EOF
+
+	end
+
+	def cancel_job
+		if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+			 fname = ENV['HOME'] + "/.coderunner_to_launch_#{prefix}/#{$$}.stop"
+			 File.open(fname, 'w'){|file| file.puts "\n"}
+		else
+			`scancel #{@job_no}`
+		end
+	end
+
+	def error_file
+		return "#{executable_name}.#{job_identifier}.e#@job_no"
+	end
+
+	def output_file
+		return "#{executable_name}.#{job_identifier}.o#@job_no"
+	end
+
+def get_run_status(job_no, current_status)
+	if ((prefix = ENV['CODE_RUNNER_LAUNCHER']).size > 0 rescue false)
+		return :Unknown
+	end
+	line = current_status.split(/\n/).grep(Regexp.new(job_no.to_s))[0]
+	unless line
+		return :Unknown
+	else 
+		if line =~ /\sPD\s/
+			return :Queueing
+		elsif line =~ /\sR\s/
+			return :Running
+		elsif line =~ /\sC\s/
+			return :Unknown
+		else
+			ep 'line', line
+			raise 'Could not get run status'
+		end
+	end
+end
+
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -178,6 +178,16 @@ files:
 - lib/coderunner/long_regexen.rb
 - lib/coderunner/merged_code_runner.rb
 - lib/coderunner/run.rb
+- lib/coderunner/system_modules/franklin.rb
+- lib/coderunner/system_modules/generic_linux.rb
+- lib/coderunner/system_modules/genericlinux_testsystem.rb
+- lib/coderunner/system_modules/hector.rb
+- lib/coderunner/system_modules/helios.rb
+- lib/coderunner/system_modules/juropa.rb
+- lib/coderunner/system_modules/macosx.rb
+- lib/coderunner/system_modules/moab.rb
+- lib/coderunner/system_modules/new_hydra.rb
+- lib/coderunner/system_modules/slurm.rb
 - test/helper.rb
 - test/test_coderunner.rb
 homepage: http://coderunner.sourceforge.net
@@ -195,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4053468436435077135
+      hash: -3340194866062964858
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: