workflow_manager 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6828da4a43654aa14bb9a4592a42bdc3d0084daf98e7ab29cb11d94928b54de
-  data.tar.gz: 87122a9b3e395f12535e700d80568328876f8784917da762956d7abbdd4a77c0
+  metadata.gz: fe50e7ccd102e4cd531cf2afb47e1222ca0b06e434ab34fdfff6a0f3a0fd35c3
+  data.tar.gz: fd07c0b863627a1a8065e7f710931ba99c0609e5ef9e9e82f107c35eee678b68
 SHA512:
-  metadata.gz: a27da5bd02d7d6a8130f9bb8844c3b4a640153a37751e0e7bd34fd64d0c13caaf0e0aade85e34ec4699a3307fe8df6624562e9a0cd48858861ec543bd3c1c910
-  data.tar.gz: 6f043fe95d6911baffbd0f606f5790d60651a013cea213caf1728632267987f09a20e161ea186f372eaaf66f7823f07e323990268bdc28ec669f37623f02b409
+  metadata.gz: 6a9701699b79fd61f889b86dbc3060fe63f6d5e8b6e2532dabb0635b5c3f37f335563dfeda5ba677328ff88e1c2197df60c84e9c9526b4a316eac751b9e3b939
+  data.tar.gz: d42a9d888a80e7f8b549a64595d13e3c268499d4f78d00805c070c6d60feb9febd20f335e7e8af398f910f6e1eade7b60cf200e83d99451230a4e0f37e134e0f

data/bin/wfm_hello

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 # 20121112 masa workflow manager client
-Version = '20130517-111334'
+Version = '20200522-134606'
 
 require 'drb/drb' 
 
@@ -28,3 +28,4 @@ if wfmrc
 end
 workflow_manager = DRbObject.new_with_uri(uri)
 puts workflow_manager.hello
+puts workflow_manager.cluster_node_list

data/bin/wfm_monitoring

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 # 20121112 masa workflow manager client
-Version = '20160317-153614'
+Version = '20200722-161135'
 
 require 'drb/drb' 
 require 'workflow_manager/optparse_ex'
@@ -16,6 +16,7 @@ opt = OptionParser.new do |o|
   o.on(:nodes, '-n nodes', '--nodes', 'Comma separated list of nodes to submit to for g-sub')
   o.on(:ram, '-r RAM', '--RAM', 'Amount of RAM to request in Gigs for g-sub')
   o.on(:scratch, '-s scratch', '--scratch', 'Amount of scratch space to request in Gigs for g-sub')
+  o.on(:queue, '-q queue', '--queue', 'Queue name')
   o.parse!(ARGV)
 end
 unless script_file = ARGV[0] and script_file =~ /\.sh/

data/lib/workflow_manager/cluster.rb

@@ -308,6 +308,7 @@ module WorkflowManager
     end
   end
 
+
   class HydraCluster < Cluster
     def submit_job(script_file, script_content, option='')
       # TODO
@@ -358,10 +359,11 @@ module WorkflowManager
         new_job_script_base = File.basename(new_job_script)
         log_file = File.join(@log_dir, new_job_script_base + "_o.log")
         err_file = File.join(@log_dir, new_job_script_base + "_e.log")
-        #command = "g-sub -o #{log_file} -e #{err_file} #{option} #{new_job_script}"
-        command = "sbatch -o #{log_file} -e #{err_file} #{option} #{new_job_script}"
+        command = "g-sub -o #{log_file} -e #{err_file} -q course #{option} #{new_job_script}"
+        #command = "sbatch -o #{log_file} -e #{err_file} #{new_job_script}"
         job_id = `#{command}`
-        job_id = job_id.match(/Your job (\d+) \(/)[1]
+        #job_id = job_id.match(/Your job (\d+) \(/)[1]
+        job_id = job_id.chomp.split.last
         [job_id, log_file, command]
       else
         err_msg = "FGCZDevian10Cluster#submit_job, ERROR: script_name is not *.sh: #{File.basename(script_file)}"
@@ -432,4 +434,119 @@ module WorkflowManager
       }
     end
   end
+
+  class FGCZDebian10Cluster < Cluster
+    def parse(options)
+      options = options.split
+      ram = if i = options.index("-r")
+              options[i+1]
+            end
+      cores = if i = options.index("-c")
+                options[i+1]
+              end
+      scratch = if i = options.index("-s")
+                  options[i+1]
+                end
+      partition = if i = options.index("-p")
+                    options[i+1]
+                  end
+      new_options = []
+      new_options << "--mem=#{ram}G" if ram
+      new_options << "-n #{cores}" if cores
+      new_options << "--tmp=#{scratch}G" if scratch
+      new_options << "-p #{partition}" if partition
+      new_options.join(" ")
+    end
+    def submit_job(script_file, script_content, option='')
+      if script_name = File.basename(script_file) and script_name =~ /\.sh/
+        script_name = script_name.split(/\.sh/).first + ".sh"
+        new_job_script = generate_new_job_script(script_name, script_content)
+        new_job_script_base = File.basename(new_job_script)
+        log_file = File.join(@log_dir, new_job_script_base + "_o.log")
+        err_file = File.join(@log_dir, new_job_script_base + "_e.log")
+        #command = "g-sub -o #{log_file} -e #{err_file} -q user #{option} #{new_job_script}"
+        sbatch_options = parse(option)
+        command = "sbatch -o #{log_file} -e #{err_file} -N 1 #{sbatch_options} #{new_job_script}"
+        puts command
+        job_id = `#{command}`
+        job_id = job_id.chomp.split.last
+        [job_id, log_file, command]
+      else
+        err_msg = "FGCZDebian10Cluster#submit_job, ERROR: script_name is not *.sh: #{File.basename(script_file)}"
+        warn err_msg
+        raise err_msg
+      end
+    end
+    def job_running?(job_id)
+     qstat_flag = false
+      IO.popen('squeue') do |io|
+        while line=io.gets
+          # ["JOBID", "PARTITION", "NAME", "USER", "ST", "TIME", "NODES", "NODELIST(REASON)"]
+          # ["206", "employee", "test.sh", "masaomi", "R", "0:03", "1", "fgcz-h-030"]
+          jobid, partition, name, user, state, *others = line.chomp.split
+          if jobid.strip == job_id and state == 'R'
+            qstat_flag = true
+            break
+          end
+        end
+      end
+      qstat_flag
+    end
+    def job_ends?(log_file)
+      log_flag = false
+      IO.popen("tail -n 10 #{log_file} 2> /dev/null") do |io|
+        while line=io.gets
+          if line =~ /__SCRIPT END__/
+            log_flag = true
+            break
+          end
+        end
+      end
+      log_flag
+    end
+    def job_pending?(job_id)
+     qstat_flag = false
+      IO.popen('squeue') do |io|
+        while line=io.gets
+          jobid, partition, name, user, state, *others = line.chomp.split
+          if jobid.strip == job_id and state =~ /PD/
+            qstat_flag = true
+            break
+          end
+        end
+      end
+      qstat_flag
+    end
+    def copy_commands(org_dir, dest_parent_dir, now=nil)
+      commands = if now == "force"
+                   target_file = File.join(dest_parent_dir, File.basename(org_dir))
+                   ["g-req copynow -f #{org_dir} #{dest_parent_dir}"]
+                 elsif now
+                   ["g-req copynow #{org_dir} #{dest_parent_dir}"]
+                 else
+                   ["g-req -w copy #{org_dir} #{dest_parent_dir}"]
+                 end
+    end
+    def kill_command(job_id)
+      command = "scancel #{job_id}"
+    end
+    def delete_command(target)
+      command = "g-req remove #{target}"
+    end
+    def cluster_nodes
+      nodes = {
+        'fgcz-h-110: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-110',
+        'fgcz-h-111: cpu 8,mem  30 GB,scr 400G' => 'fgcz-h-111',
+      }
+    end
+  end
+
+  class FGCZDebian10DemoCluster < FGCZDebian10Cluster
+    def copy_commands(org_dir, dest_parent_dir, now=nil)
+      commands = ["cp -r #{org_dir} #{dest_parent_dir}"]
+    end
+    def delete_command(target)
+      command = "rm -rf #{target}"
+    end
+  end
 end

data/lib/workflow_manager/version.rb

@@ -1,3 +1,3 @@
 module WorkflowManager
-  VERSION = "0.5.5"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workflow_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler