coderunner 0.17.6 → 0.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 943104c85d335c22084f38ec638699ce3bb32100
-  data.tar.gz: a839a1f4ecdc6c99aa99a3d1c177195708bd4470
+  metadata.gz: 10c322689bf3a57734ed9d6a079f23debfdab926
+  data.tar.gz: 97334cbd6e0cce779956db7051528a7ff2ff1cc7
 SHA512:
-  metadata.gz: 0f807bb516152258b05156737b2f8422623cf64851490fb482cccb3e61e5c67805d6723db9cfea99013861c7e2a90845edc4c336c241495a61455218da07a91e
-  data.tar.gz: 79c3e57c77f52c44d984d0c184e687b2cf3a241f1be417c818cd156aba5de3ce8d22a2231cf01e2e6921aa1ed5b503b8c1082dd9a81b044f3ad244bacf121537
+  metadata.gz: d6a4b22a00d0fae3aff40fb1dc928cd41e67956c9b710000e723ffb4fdf9f9dd2f22f1500a2085accbb5f3fe862164a567d2c14ba7529c65f50221d75eb61721
+  data.tar.gz: 36d00b69efa798f31ff76531c9b1d21702b8bf200e24638dbe5a90525c692b511c4768fe80cc9bfda0bb8ddfcf08b926d98c9a7027307b6d18eb699ac039732a

data/VERSION

@@ -1 +1 @@
-0.17.6
+0.17.7

data/coderunner.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: coderunner 0.17.6 ruby lib
+# stub: coderunner 0.17.7 ruby lib
 # stub: ext/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.17.6"
+  s.version = "0.17.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Edmund Highcock"]
-  s.date = "2015-11-05"
+  s.date = "2015-12-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", "coderunnerrepo"]
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
     "lib/coderunner/run.rb",
     "lib/coderunner/system_modules/archer.rb",
     "lib/coderunner/system_modules/blue_joule.rb",
+    "lib/coderunner/system_modules/cori.rb",
     "lib/coderunner/system_modules/dirac.rb",
     "lib/coderunner/system_modules/edison.rb",
     "lib/coderunner/system_modules/franklin.rb",
@@ -99,7 +100,7 @@ Gem::Specification.new do |s|
   s.licenses = ["GPLv3"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
   s.rubyforge_project = "coderunner"
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.8"
   s.summary = "A framework for the automated running and analysis of simulations."
 
   if s.respond_to? :specification_version then

data/lib/coderunner/class_methods.rb

@@ -575,8 +575,8 @@ EOF
     eputs 'Starting Graph'
     kit = runner.graphkit_from_lists(copts[:G], copts[:g])
     kit.gnuplot(eval: string_to_eval)
-    gets
-    kit.close
+    #gets
+    #kit.close
   end
 
   def self.readout(copts={})

data/lib/coderunner/system_modules/cori.rb

@@ -0,0 +1,25 @@
+class CodeRunner
+	require SCRIPT_FOLDER + '/system_modules/slurm.rb'
+	module Stampede
+		include Slurm
+		#def batch_script
+			#raise "Please specify project" unless @project
+			#super
+		#end
+		def max_ppn
+			32
+		end
+		def run_command
+	# 		"qsub #{batch_script_file}"
+			if use_launcher
+				return %[#{code_run_environment}\n srun -n #{@nprocs} #{executable_location}/#{executable_name} #{parameter_string} > #{output_file} 2> #{error_file}]
+			else
+				"srun -n #{nodex*ppn} #{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

data/lib/coderunner/system_modules/slurm.rb

@@ -46,6 +46,14 @@ module Slurm
 		raise "Please define max_ppn for your system"
 	end
 	
+
+  def nodes
+    @nprocs.split(/x/)[0].to_i
+  end
+  def ppn
+    @nprocs.split(/x/)[1].to_i
+  end
+
 	def batch_script
 
 		nodes, ppn = @nprocs.split(/x/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: 0.17.7
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
@@ -228,6 +228,7 @@ files:
 - lib/coderunner/run.rb
 - lib/coderunner/system_modules/archer.rb
 - lib/coderunner/system_modules/blue_joule.rb
+- lib/coderunner/system_modules/cori.rb
 - lib/coderunner/system_modules/dirac.rb
 - lib/coderunner/system_modules/edison.rb
 - lib/coderunner/system_modules/franklin.rb
@@ -286,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: coderunner
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A framework for the automated running and analysis of simulations.