server_scripts 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b272c99b33f7ecb954965b83b6a465c349721df
-  data.tar.gz: 8d9d49ee51086a521c8144f935348302bf13cfb7
+  metadata.gz: 7fc3282ab4ef93f7e6de815343bca4bf11b6fb60
+  data.tar.gz: e9b5a827cda61da04b79f1526df3ed223b593bca
 SHA512:
-  metadata.gz: 7fe5a9cc5b3ad76c397a9dbb0d7223f40b7e679fd0203749e4aeae7cc4e9194129ed8cdabf5117538ba75075a292dd9a8d3d090700e8eded4f196c10779bc7da
-  data.tar.gz: e8ee6d52ccaf1c75c4404d656437bf8e32d1053cdb93945bd067af2b5bbcf584ea5cc61e50caf6312c7d91a35209f20473ebaad5b928aa3d31fedf3e993a712f
+  metadata.gz: 7a9d9cd9fd246095acc03507e37e7419da713ff0bad625dbb46582a6cc09f7e5d58a775b07f09cf3d7b72301233ddb338449c366a44946b68e0cf86f301c3ff1
+  data.tar.gz: 1c29990c502b25014a60feb44bb1d9e23e12be06b74c7e6663634ddd9a93572bc30bc94a35fa12f83acd616ce5572f9d83c0b275df636819f82acb96ab6a31d5

data/lib/server_scripts.rb

@@ -45,10 +45,10 @@ module ServerScripts
     attr_reader :system
       
     def initialize job_fname
-      @job_fname = "sample_job_script.sh"
+      @job_fname = job_fname
       @job_name = "sample"
-      @out_file = "sample_out"
-      @err_file = "sample_err"
+      @out_file = "sample_out.log"
+      @err_file = "sample_err.log"
       @wall_time = "1:00:00"
       @node_type = NodeType::FULL
       @nodes = 1
@@ -58,7 +58,7 @@ module ServerScripts
       @executor = :vanilla
       @env = {}
       @executable = "./a.out"
-      @job_script = ""
+      @job_script = nil
       @enable_intel_itac = false
       @additional_commands = []
 
@@ -70,27 +70,32 @@ module ServerScripts
       @env[var] = value
     end
 
+    def write_job_script!
+      generate_job_script! unless @job_script
+      File.write(@job_fname, @job_script)      
+    end
+    
+    def submit!
+      write_job_script!
+      exec @system.job_submit_cmd(batch_script: @job_fname)
+    end
+
+    private
+
     def generate_job_script!
       @system = ServerScripts.system.new(@node_type, @nodes, @job_name,
         @wall_time, @out_file, @err_file, @env)
       configure_executor!
 
+      @job_script = ""
       @job_script += @system.header
       @job_script += @system.env_setter
       @additional_commands.each do |c|
         @job_script += c + "\n"
       end
-      @job_script += "#{@executor.run_cmd} #{@executable} #{@options}"
+      @job_script += "#{@executor.run_cmd} #{@executable} #{@options}\n"
     end
 
-    def submit!
-      generate_job_script! unless @job_script
-      File.write(@job_fname, @job_script)
-#      system(@system.job_submit_cmd(batch_script: @job_fname))
-    end
-
-    private
-
     def configure_executor!
       check_process_counts
       @nprocs = @npernode * @nodes

data/lib/server_scripts/computer/abci.rb

@@ -11,8 +11,8 @@ module ServerScripts
 #$ -l %{node_type}=%{nodes}
 #$ -l h_rt=%{walltime}
 #$ -N %{job_name}
-#$ -o %{out_file}.log
-#$ -e %{err_file}.log
+#$ -o %{out_file}
+#$ -e %{err_file}
         }
       end
     end    

data/lib/server_scripts/computer/base.rb

@@ -21,10 +21,6 @@ module ServerScripts
       def env_setter
         raise NotImplementedError
       end
-
-      def job_submit_cmd
-        raise NotImplementedError
-      end
     end    
   end
 end

data/lib/server_scripts/computer/tsubame.rb

@@ -7,8 +7,8 @@ module ServerScripts
 #$ -l %{node_type}=%{nodes}
 #$ -l h_rt=%{wall_time}
 #$ -N %{job_name}
-#$ -o %{out_file}.log
-#$ -e %{err_file}.log
+#$ -o %{out_file}
+#$ -e %{err_file}
       }
 
       FULL_NODE = "f_node"
@@ -27,9 +27,9 @@ module ServerScripts
         str
       end
 
-      def job_submit_cmd res_id: nil, batch_script:
+      def job_submit_cmd batch_script:, res_id: nil
         res = res_id ? " -ar #{res_id} " : ""
-        "qsub -g #{ServeScripts.group_name} #{res} #{batch_script}"
+        "qsub -g #{ServerScripts.group_name} #{res} #{batch_script}"
       end
     end    
   end

data/lib/server_scripts/version.rb

@@ -1,3 +1,3 @@
 module ServerScripts
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_scripts
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sameer Deshmukh