coderunner 0.13.15 → 0.13.16

data/VERSION

@@ -1 +1 @@
-0.13.15
+0.13.16

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.13.15"
+  s.version = "0.13.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-08-28"
+  s.date = "2013-09-12"
   s.description = "CodeRunner is a framework for the automated running and analysis of simulations. It automatically generates any necessary input files, organises the output data and analyses it. Because it is a modular system, it can easily be customised to work with any system and any simulation code. One of its greatest strengths is that it is independent of any one simulation code; thus it can easily plot and compare the data from different codes."
   s.email = "edmundhighcock@sourceforge.net"
   s.executables = ["coderunner"]

data/lib/coderunner.rb

@@ -155,6 +155,7 @@ class CodeRunner
 	["--sort", "-O", GetoptLong::REQUIRED_ARGUMENT, %[Specify the sort order for the runs. Used for a variety of commands, for example status. It is a string of semicolon separated sort keys: for example -O height;width will sort the runs by height and then width.]],
 	["--project", "-P", GetoptLong::REQUIRED_ARGUMENT, %[Specify the project to be used for billing purposes. Only necessary on some systems.]],
 	["--parameters", "-p",  GetoptLong::REQUIRED_ARGUMENT, %[A hash of parameters for the simulation. For example -p '{height: 20, width: 2.3}'. These parameters will override the defaults in the local defaults file.]],
+	["--queue", "-Q", GetoptLong::REQUIRED_ARGUMENT, %[The name of the queue to submit to on HPC systems. Not yet implemented for all systems. Please submit a feature request if it is not working on your system.]],
 	["--no-auto-create-runner", "-q", GetoptLong::NO_ARGUMENT, %[Used for interactive mode when you don't want CodeRunner to analyse the current directory.]],
 	["--terminal-size", "-t", GetoptLong::REQUIRED_ARGUMENT, %[Specify the terminal size for situations where CodeRunner cannot work it out:  -t '[rows, cols]' (square brackets are part of the syntax)]],
 	["--test-submission", "-T", GetoptLong::NO_ARGUMENT, %[Don't actually submit the run, but exit after printing out the run parameters and generating any input files necessary.]],

data/lib/coderunner/instance_methods.rb

@@ -65,7 +65,7 @@ class CodeRunner
 	
 	# Parameters important to the submission of a run, which can be set by command line flags. The runner values provide the default values for the submit function, but can be overidden in that function. All the runner does with them is set them as properties of the run to be submitted. It is the run itself for which the options are relevant.
 	
-	SUBMIT_OPTIONS = [:nprocs, :wall_mins, :sys, :project, :comment, :executable]
+	SUBMIT_OPTIONS = [:nprocs, :wall_mins, :sys, :project, :queue, :comment, :executable]
 	
 	# A hash containing the defaults for most runner options. They are overridden by any options provided during initialisation. They are mostly set at the command line (in practice, the command line flags are read into the command options, which set these defaults in the function CodeRunner.process_command_options which calls CodeRunner.set_runner_defaults). However, if Code Runner is being scripted, these defaults must be set manually or else the options they specify must be provided when initialising a runner.
 	

data/lib/coderunner/system_modules/slurm.rb

@@ -71,6 +71,7 @@ module Slurm
 #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" : ""}
+#{@queue ? "#SBATCH -p #@queue # submission queue" : ""}
 #{@wall_mins ? "#SBATCH -t #{sprintf("%02d:%02d:%02d", hours, mins, secs)} # walltime" : ""}
 
 #{code_run_environment}

data/lib/coderunner/system_modules/stampede.rb

@@ -17,5 +17,9 @@ class CodeRunner
 				"ibrun #{executable_location}/#{executable_name} #{parameter_string}"
 			end
 		end
+		def batch_script
+			raise "Please specify the queue to submit to using the -Q (or Q:) flag" unless @queue
+			super
+		end	
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.13.15
+  version: 0.13.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit