coderunner 0.12.14 → 0.12.15

data/VERSION

@@ -1 +1 @@
-0.12.14
+0.12.15

data/coderunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coderunner"
-  s.version = "0.12.14"
+  s.version = "0.12.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Edmund Highcock"]
-  s.date = "2013-07-26"
+  s.date = "2013-07-29"
   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"]
@@ -71,7 +71,6 @@ Gem::Specification.new do |s|
     "lib/cubecalccrmod/defaults_files/sleep_defaults.rb",
     "lib/cubecalccrmod/empty.rb",
     "lib/cubecalccrmod/sleep.rb",
-    "test/cubecalc.cc",
     "test/fortran_namelist.in",
     "test/helper.rb",
     "test/old_test.rb",

data/lib/coderunner.rb

@@ -206,7 +206,8 @@ EOF
 		["execute", "ex",  1, 'Run (at the top level) the fragment of Ruby code given.', ['Ruby fragment'], []],	
 		['film', "fm", 0, 'Create a film of the specified graphkits.', [], [:F, :G, :g, :U, :N, :j, :f]],
 		["generate_modlet_from_input_file", "gm", 1, 'Deprecated', [], []],
-		["generate_documentation", "rdoc", 1, 'Create automatic documentation using the rdoc tool', [], []],
+		["generate_cubecalc", "gencc", 0, 'Generate the file cubecalc.cc, the source code for the coderunner test program.', [], []],
+		["generate_documentation", "rdoc", 1, 'Create automatic documentation using the rdoc tool (deprecated, use the command line tool ri for getting help, or see rubygems.org/gems/coderunner).', [], []],
 		["interactive_mode", "im", 0, 'Launch an interactive terminal. Any command line flags specified set the defaults for the session.', [], [:U, :N, :j, :q]],	
 		["load_file", "ld",  1, 'Load a Ruby script file using the CodeRunner framework.', ['script file'], []],	
 		['manual', 'man', 0, 'Print out command line manual', [], []],

data/lib/coderunner/class_methods.rb

@@ -249,11 +249,75 @@ EOF
 	
 	end
   
+
+	def self.generate_cubecalc(copts={})
+		#return
+		File.open('cubecalc.cc', 'w') do |file|
+		file.puts <<EOF
+#include <stdio.h>
+#include <iostream>
+#include <cstdlib>
+#include <fstream>
+#include <cstring>
+#include <ctime>
+using namespace std;
+
+int main(int argc, char* argv[]){
+	string line;
+	cout << "Starting..." << endl;
+	
+	int calculate_sides = atoi(argv[1]); //Should the program calculate the area of the sides of the cube? 
+	cout << calculate_sides << endl;
+	
+	char* input_file_name = argv[2]; //Get the input file name from the command line
+	cout << input_file_name << endl;
+	
+	if (argc > 3){ //It has been told to sleep for a time
+		bool cont = true;
+		time_t start_t;
+		time(&start_t);
+		while (cont){
+			time_t new_t;
+			time(&new_t);
+			cont = (new_t < (start_t + atoi(argv[3]) * 1.0));
+		}
+	}
+	
+	ifstream edges_file(input_file_name); //Read the edges from the input file
+	float* edges = new float[3];
+	int j = 0;
+	while (edges_file >> edges[j++]){
+		cout << edges[j-1] << endl;
+	}
+	
+	
+	FILE* output = fopen("results.txt", "w"); //Write the volume to the output file
+	fprintf(output, "Volume was %f", edges[0] * edges[1] * edges[2]);
+	fclose(output);
+	
+	if (calculate_sides == 1){ //If it has been told to calculate the sides
+		cout << "calculating sides" << endl;
+		FILE* sides = fopen("sides.txt", "w");
+		for(int i=0; i<3; i++){
+			cout << "Side " << i << ": " << edges[(i%3)] * edges[((i+1)%3)] << endl;
+			fprintf(sides, "The area of side %d is %f\\n", i, edges[i%3] * edges[(i+1)%3]);
+		}
+		fclose(sides);
+	}
+}
+	
+
+
+EOF
+
+		end
+	end
 	def self.launcher_directory
 		ENV['HOME'] + "/.coderunner/to_launch/#{ENV['CODE_RUNNER_LAUNCHER']}"
 	end
   def self.start_launcher(refresh, max_queue, copts={})
-		raise "Raise refresh is #{refresh}: it must be >= 1" if refresh.to_i < 1
+		#eputs "Starting launcher!"
+		raise "Raise refresh is #{refresh}: it must be >= 0.1" if refresh < 0.1
 		raise "Raise max_queue is #{max_queue}: it must be >= 5" if max_queue.to_i < 5
     #raise "Launcher already running" if %x[ps -e -o cmd].split("\n").grep(/coderunner\s+launch/).size > 0
     require 'thread'
@@ -280,7 +344,7 @@ EOF
 			end
 		end
 
-    Dir.chdir(tl) do
+    #Dir.chdir(tl) do
       ppid = $$
       loop do
 				sleep refresh.to_i while processes.size >= max_queue.to_i
@@ -288,9 +352,10 @@ EOF
         Dir.entries(tl).grep(/(^.*)\.start/).each do |file|
           file =~ (/(^.*)\.start/)
           id = $1
-          command = File.read file
+          command = File.read tl + '/' + file
           pid = fork do
             processes.each do |wpid|
+							# Make sure all previously submitted jobs have finished.
               sleep refresh.to_i while %x[ps -e -o pid,ppid].split("\n").grep(Regexp.new("^\\s*#{wpid}\\s+#{ppid}")).size > 0
             end              
             exec(command)
@@ -298,15 +363,15 @@ EOF
 					`cp #{tl}/queue_status.txt #{tl}/queue_status2.txt; ps > #{tl}/queue_status.txt`
           mutex.synchronize{processes.push pid}
 
-          File.open(id + '.pid', 'w'){|file| file.puts pid}
-          FileUtils.rm(file)
+          File.open(tl + '/' + id + '.pid', 'w'){|file| file.puts pid}
+          FileUtils.rm(tl + '/' + file)
           
           Thread.new{Process.wait pid; mutex.synchronize{processes.delete pid}}
         end
 #         processes.each{|pid| Process.wait pid}
         sleep refresh.to_i
       end
-    end
+    #end
   end
       
 	
@@ -473,6 +538,8 @@ EOF
 # 			exit
 		end
 		runner.submit(runs, nprocs: copts[:n], version: copts[:v], skip: copts[:k], job_chain: copts[:J], no_update_before_submit: copts[:no_update_before_submit])
+		#puts "Got here"
+		#exit(0)
 	end
 	def self.resubmit(copts = {})
 # 		process_copts(copts)

data/lib/coderunner/instance_methods.rb

@@ -1088,8 +1088,8 @@ Conditions contain a single = sign: #{conditions}
 				sleep rand
 			end
 # 			old_trap = trap(0)
-			old_trap0 = trap(0){eputs "Aborted Submit!"; File.delete("#@root_folder/submitting"); exit!}
-			old_trap2 = trap(2){eputs "Aborted Submit!"; File.delete("#@root_folder/submitting") if FileTest.exist? "#@root_folder/submitting"; trap(2, "DEFAULT"); trap(0, "DEFAULT"); Process.kill(2, 0)}
+			#old_trap0 = trap(0){eputs "Aborted Submit (0)!"; File.delete("#@root_folder/submitting"); exit!}
+			old_trap2 = trap(2){eputs "Aborted Submit (2)!"; File.delete("#@root_folder/submitting") if FileTest.exist? "#@root_folder/submitting"; trap(2, "DEFAULT"); trap(0, "DEFAULT"); Process.kill(2, 0)}
 	# 		File.open("submitting", "w"){|file| file.puts ""}
 			FileUtils.touch("submitting")
 			unless options[:no_update_before_submit]
@@ -1191,7 +1191,7 @@ Conditions contain a single = sign: #{conditions}
 			@write_status_dots = wsd	
 			save_large_cache
 			File.delete("submitting")
-			trap(0, old_trap0)
+			#trap(0, old_trap0)
 			trap(2, old_trap2)
 	
 			

data/test/test_coderunner.rb

@@ -23,6 +23,7 @@ $ruby_command = "#{RbConfig::CONFIG['bindir']}/#{RbConfig::CONFIG['ruby_install_
 class TestSubmission  < Test::Unit::TestCase
 	def setup
 		string = $cpp_command + ' ../cubecalc.cc -o cubecalc'
+		Dir.chdir('test'){CodeRunner.generate_cubecalc}
 		FileUtils.makedirs('test/submission_results')
 		Dir.chdir('test/submission_results'){assert_system string}
 		CodeRunner.setup_run_class('cubecalc', modlet: 'sleep')
@@ -41,11 +42,12 @@ class TestSubmission  < Test::Unit::TestCase
 	end
 	def test_status_loop
 		unless ENV['SHORT_TEST']
-			ENV['CODE_RUNNER_LAUNCHER'] = '4'
-			@thread = Thread.new{CodeRunner.start_launcher(0.2,10)}
+			ENV['CODE_RUNNER_LAUNCHER'] = '42323490qw4q4432407Q2342U3'
+			@thread = Thread.new{CodeRunner.start_launcher(0.5,10)}
+			sleep 0.1 while not FileTest.exist?(CodeRunner.launcher_directory)
 			CodeRunner.submit(Y: 'test/submission_results', C: 'cubecalc', m: 'sleep', X: Dir.pwd + '/test/submission_results/cubecalc', p: '{sleep_time: 2}')
 			CodeRunner.status_loop(Y: 'test/submission_results')
-			@thread.kill
+			#@thread.kill # This is commented out because it causes a Heisenbug... the kill signal can get trapped and cause the deletion of the 'submitting' lock file. This line is unnecessary because the thread will die when the program exits
 			ENV.delete('CODE_RUNNER_LAUNCHER')
 		end
 	end
@@ -57,11 +59,12 @@ class TestSubmission  < Test::Unit::TestCase
 		runner.print_out(0)
 		assert_equal(6.0, runner.run_list[1].volume)
 	end
-	#def test_command_line_submission
-	   #assert_system("#{$ruby_command}  -I lib/ lib/coderunner.rb submit -C cubecalc -m sleep -D sleep -X #{Dir.pwd}/test/cubecalc -Y test/submission_results")
-	#end
+	def test_command_line_submission
+	   assert_system("#{$ruby_command}  -I lib/ lib/coderunner.rb submit -C cubecalc -m sleep -D sleep -X #{Dir.pwd}/test/submission_results/cubecalc -Y test/submission_results")
+	end
 	def teardown
 		FileUtils.rm_r('test/submission_results')
+		FileUtils.rm_r('test/cubecalc.cc')
 	end
 end
 
@@ -77,6 +80,7 @@ class TestCodeRunner < Test::Unit::TestCase
 	def setup
 		FileUtils.makedirs('test/results')
 		string = $cpp_command + ' ../cubecalc.cc -o cubecalc'
+		Dir.chdir('test'){CodeRunner.generate_cubecalc}
 		Dir.chdir('test/results'){assert_system string}
 		CodeRunner.submit(Y: tfolder, C: 'cubecalc', m: 'empty', X: Dir.pwd + '/test/results/cubecalc', T: true)
 	# 	exit
@@ -88,6 +92,7 @@ class TestCodeRunner < Test::Unit::TestCase
 	
 	def teardown
 		FileUtils.rm_r('test/results')
+		FileUtils.rm('test/cubecalc.cc')
 	end
 
 	def tfolder

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderunner
 version: !ruby/object:Gem::Version
-  version: 0.12.14
+  version: 0.12.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphkit
@@ -238,7 +238,6 @@ files:
 - lib/cubecalccrmod/defaults_files/sleep_defaults.rb
 - lib/cubecalccrmod/empty.rb
 - lib/cubecalccrmod/sleep.rb
-- test/cubecalc.cc
 - test/fortran_namelist.in
 - test/helper.rb
 - test/old_test.rb

data/test/cubecalc.cc

@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include <iostream>
-#include <cstdlib>
-#include <fstream>
-#include <cstring>
-#include <ctime>
-using namespace std;
-
-int main(int argc, char* argv[]){
-	string line;
-	cout << "Starting..." << endl;
-	
-	int calculate_sides = atoi(argv[1]); //Should the program calculate the area of the sides of the cube? 
-	cout << calculate_sides << endl;
-	
-	char* input_file_name = argv[2]; //Get the input file name from the command line
-	cout << input_file_name << endl;
-	
-	if (argc > 3){ //It has been told to sleep for a time
-		bool cont = true;
-		time_t start_t;
-		time(&start_t);
-		while (cont){
-			time_t new_t;
-			time(&new_t);
-			cont = (new_t < (start_t + atoi(argv[3]) * 1.0));
-		}
-	}
-	
-	ifstream edges_file(input_file_name); //Read the edges from the input file
-	float* edges = new float[3];
-	int j = 0;
-	while (edges_file >> edges[j++]){
-		cout << edges[j-1] << endl;
-	}
-	
-	
-	FILE* output = fopen("results.txt", "w"); //Write the volume to the output file
-	fprintf(output, "Volume was %f", edges[0] * edges[1] * edges[2]);
-	fclose(output);
-	
-	if (calculate_sides == 1){ //If it has been told to calculate the sides
-		cout << "calculating sides" << endl;
-		FILE* sides = fopen("sides.txt", "w");
-		for(int i=0; i<3; i++){
-			cout << "Side " << i << ": " << edges[(i%3)] * edges[((i+1)%3)] << endl;
-			fprintf(sides, "The area of side %d is %f\n", i, edges[i%3] * edges[(i+1)%3]);
-		}
-		fclose(sides);
-	}
-}
-