server_scripts 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fc3282ab4ef93f7e6de815343bca4bf11b6fb60
-  data.tar.gz: e9b5a827cda61da04b79f1526df3ed223b593bca
+  metadata.gz: 44c45be7c8faebd8504682600c9b4da7694ddd18
+  data.tar.gz: ea70dfe5c454365731449ac559f2ff8f1a7e87ed
 SHA512:
-  metadata.gz: 7a9d9cd9fd246095acc03507e37e7419da713ff0bad625dbb46582a6cc09f7e5d58a775b07f09cf3d7b72301233ddb338449c366a44946b68e0cf86f301c3ff1
-  data.tar.gz: 1c29990c502b25014a60feb44bb1d9e23e12be06b74c7e6663634ddd9a93572bc30bc94a35fa12f83acd616ce5572f9d83c0b275df636819f82acb96ab6a31d5
+  metadata.gz: 2a095ccfe52889d91fcf96376e63710b7df2c1a37e930d6786e15883969d92eef2a9385d04d7049e67d00b17f8e3c652e053f267e0ccd67f4b7a82ba71c8197b
+  data.tar.gz: b5363004c437866dc232450109274ce457c0d47b85ec67e48b29c360424806cfd59baac3c78ade0123fd24960e1b2063275f62bb3573bc8322f76c8c913f8413

data/lib/server_scripts/computer/base.rb

@@ -2,7 +2,7 @@ module ServerScripts
   module Computer
     class Base
       def initialize(node_type, nodes, job_name, wall_time, out_file,
-        err_file, env)
+        err_file, env, modules)
         @node_type = node_type
         @nodes = nodes
         @job_name = job_name
@@ -10,6 +10,7 @@ module ServerScripts
         @out_file = out_file
         @err_file = err_file
         @env = env
+        @modules = modules
       end
 
       def node_type

data/lib/server_scripts/computer/tsubame.rb

@@ -9,9 +9,18 @@ module ServerScripts
 #$ -N %{job_name}
 #$ -o %{out_file}
 #$ -e %{err_file}
+
+. /etc/profile.d/modules.sh
       }
 
       FULL_NODE = "f_node"
+
+      MODULES = {
+        "gcc" => "gcc/8.3.0",
+        "intel-mpi" => "intel-mpi",
+        "openmpi" => "cuda/8.0.61 openmpi",
+        "itac" => "intel-itac intel-vtune"
+      }
       
       def header
         HEADER % {node_type: node_type, nodes: @nodes, wall_time: @wall_time,
@@ -31,6 +40,10 @@ module ServerScripts
         res = res_id ? " -ar #{res_id} " : ""
         "qsub -g #{ServerScripts.group_name} #{res} #{batch_script}"
       end
+
+      def module_load_cmd
+        "module load #{@modules.map { |m| MODULES[m] }.join(' ')}"
+      end
     end    
   end
 end

data/lib/server_scripts/executor/mpi_program.rb

@@ -15,7 +15,7 @@ module ServerScripts
     
     class OpenMPI < MPIProgram
       def run_cmd
-        "mpirun --mca mpi_cuda_support 0 #{env_variables} -N #{@npernode} -np #{@nprocs}"
+        "mpirun --mca mpi_cuda_support 0 -x LD_LIBRARY_PATH #{env_variables} -N #{@npernode} -np #{@nprocs}"
       end
 
       private

data/lib/server_scripts/version.rb

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

data/lib/server_scripts.rb

@@ -39,6 +39,8 @@ module ServerScripts
     attr_accessor :additional_commands
     attr_accessor :enable_intel_itac
     attr_accessor :intel_vtune_fname
+    attr_accessor :source_bashrc
+    attr_accessor :modules
 
     attr_reader :env
     attr_reader :job_fname
@@ -61,6 +63,8 @@ module ServerScripts
       @job_script = nil
       @enable_intel_itac = false
       @additional_commands = []
+      @modules = []
+      @source_bashrc = true
 
       yield self
     end
@@ -84,11 +88,14 @@ module ServerScripts
 
     def generate_job_script!
       @system = ServerScripts.system.new(@node_type, @nodes, @job_name,
-        @wall_time, @out_file, @err_file, @env)
+        @wall_time, @out_file, @err_file, @env, @modules)
       configure_executor!
 
       @job_script = ""
       @job_script += @system.header
+      @job_script += "\nsource ~/.bashrc\n" if @source_bashrc
+      @job_script += @system.module_load_cmd
+
       @job_script += @system.env_setter
       @additional_commands.each do |c|
         @job_script += c + "\n"

metadata

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