workflow_manager 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 624dc0f37286ee8b893ceb0d73cce4ce83ab6078be6b1f06a96c316e145311f4
-  data.tar.gz: 805777d8e45242281c3e929b03a92d3fd9205c6c091f716ebb16b93bf15904e9
+  metadata.gz: ede215b5a867ebbafc9af7ead5a9afa04ed1530eac7d0d1bffb2ee42b09cbded
+  data.tar.gz: 7f68d53462f3c22ec889edaec171a6d5685063090b28264dfd93a224ca2d6f95
 SHA512:
-  metadata.gz: 8c89da95c15863910c397bc149b799b094ee631feb092a7e0ffea7648c2148e09677b1288bf41daa5aa798b8a315ad3e7d2a4686d2b7bb5ced4f57fe8eff2161
-  data.tar.gz: bea9060c0b8322b3b096ffdae4ac82d9f523bc9322b8bfa412f986aab5c56881523985698c974eb581560929eea60d34189724efae29c28e31127512f0b56478
+  metadata.gz: dcc2bac302faf22e7170143d7377bb87144b3e6ccf049ba8d768318fd2f3a7ccdb213643c55fadbddfcdedd92b103e572dd75310d94c27fa917f55fd1c9d2c87
+  data.tar.gz: 18789821274de2c8961f15e6a49194c1d4e2c2f09eab095e9f7e14f575388507ff83a0dff5da480bcb79ec276956eea85739ee4d3f8cfd12c6c44139cdc3b465

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

@@ -525,4 +525,109 @@ 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
+      queue = if i = options.index("-q")
+                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 #{queue}" if queue
+      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} #{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
 end

data/lib/workflow_manager/version.rb

@@ -1,3 +1,3 @@
 module WorkflowManager
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workflow_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler