coderunner 0.11.10 → 0.11.11

data/VERSION

@@ -1 +1 @@
-0.11.10
+0.11.11

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.11.10"
+  s.version = "0.11.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2012-11-13"
+  s.date = "2012-11-22"
   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"]
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
     "lib/coderunner/system_modules/genericlinux_testsystem.rb",
     "lib/coderunner/system_modules/hector.rb",
     "lib/coderunner/system_modules/helios.rb",
+    "lib/coderunner/system_modules/iridis.rb",
     "lib/coderunner/system_modules/juropa.rb",
     "lib/coderunner/system_modules/macosx.rb",
     "lib/coderunner/system_modules/moab.rb",

data/lib/coderunner/system_modules/iridis.rb

@@ -0,0 +1,30 @@
+class CodeRunner
+	require SCRIPT_FOLDER + '/system_modules/moab.rb'
+	module Iridis
+		include Moab
+		def batch_script
+			raise "Please specify project" unless @project
+			super
+		end
+		def max_ppn
+			12
+		end
+		def mpi_prog
+			"mpirun"
+		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 -q #@project #{batch_script_file}].to_i
+			end
+	end
+	end
+end

data/lib/coderunner/system_modules/moab.rb

@@ -17,10 +17,14 @@ EOF
 			%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]
+			%x[qstat -q consort | grep $USER]
 		end
 	end
 
+	def mpi_prog
+		"aprun"
+	end
+
 	def run_command
 # 		"qsub #{batch_script_file}"
 		if (ENV['CODE_RUNNER_LAUNCHER'].size > 0 rescue false)
@@ -28,7 +32,7 @@ EOF
 		else
 			nodes, ppn = @nprocs.split(/x/)
 			nprocstot = nodes.to_i * ppn.to_i
-			"aprun -n #{nprocstot} -N #{ppn} #{executable_location}/#{executable_name} #{parameter_string}"
+			"#{mpi_prog} -n #{nprocstot} -N #{ppn} #{executable_location}/#{executable_name} #{parameter_string}"
 		end
 	end
 
@@ -84,7 +88,7 @@ EOF
 	cd $PBS_O_WORKDIR 
 	echo "workdir: $PBS_O_WORKDIR" 
 
-	echo "Submitting #{nodes}x#{ppn} job on Hector for project #@project..."
+	echo "Submitting #{nodes}x#{ppn} job on #{CodeRunner::SYS} for project #@project..."
 	
 	
 EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
@@ -219,6 +219,7 @@ files:
 - lib/coderunner/system_modules/genericlinux_testsystem.rb
 - lib/coderunner/system_modules/hector.rb
 - lib/coderunner/system_modules/helios.rb
+- lib/coderunner/system_modules/iridis.rb
 - lib/coderunner/system_modules/juropa.rb
 - lib/coderunner/system_modules/macosx.rb
 - lib/coderunner/system_modules/moab.rb