workflow_manager 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6828da4a43654aa14bb9a4592a42bdc3d0084daf98e7ab29cb11d94928b54de
-  data.tar.gz: 87122a9b3e395f12535e700d80568328876f8784917da762956d7abbdd4a77c0
+  metadata.gz: 624dc0f37286ee8b893ceb0d73cce4ce83ab6078be6b1f06a96c316e145311f4
+  data.tar.gz: 805777d8e45242281c3e929b03a92d3fd9205c6c091f716ebb16b93bf15904e9
 SHA512:
-  metadata.gz: a27da5bd02d7d6a8130f9bb8844c3b4a640153a37751e0e7bd34fd64d0c13caaf0e0aade85e34ec4699a3307fe8df6624562e9a0cd48858861ec543bd3c1c910
-  data.tar.gz: 6f043fe95d6911baffbd0f606f5790d60651a013cea213caf1728632267987f09a20e161ea186f372eaaf66f7823f07e323990268bdc28ec669f37623f02b409
+  metadata.gz: 8c89da95c15863910c397bc149b799b094ee631feb092a7e0ffea7648c2148e09677b1288bf41daa5aa798b8a315ad3e7d2a4686d2b7bb5ced4f57fe8eff2161
+  data.tar.gz: bea9060c0b8322b3b096ffdae4ac82d9f523bc9322b8bfa412f986aab5c56881523985698c974eb581560929eea60d34189724efae29c28e31127512f0b56478

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/lib/workflow_manager/cluster.rb

@@ -358,10 +358,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 +433,96 @@ module WorkflowManager
       }
     end
   end
+
+  class FGCZDebian10CourseCluster < Cluster
+    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 course #{option} #{new_job_script}"
+        job_id = `#{command}`
+        job_id = job_id.chomp.split.last
+        [job_id, log_file, command]
+      else
+        err_msg = "FGCZDebian10CourseCluster#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 = ["cp -r #{org_dir} #{dest_parent_dir}"]
+    end
+    def kill_command(job_id)
+      command = "scancel #{job_id}"
+    end
+    def delete_command(target)
+      command = "rm -rf #{target}"
+    end
+    def cluster_nodes
+      nodes = {
+        'fgcz-h-900: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-900',
+        'fgcz-h-901: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-901',
+        'fgcz-h-902: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-902',
+        'fgcz-h-903: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-903',
+        'fgcz-h-904: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-904',
+        'fgcz-h-905: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-905',
+        'fgcz-h-906: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-906',
+        'fgcz-h-907: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-907',
+        'fgcz-h-908: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-908',
+        'fgcz-h-909: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-909',
+        'fgcz-h-910: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-910',
+        'fgcz-h-911: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-911',
+        'fgcz-h-912: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-912',
+        'fgcz-h-913: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-913',
+        'fgcz-h-914: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-914',
+        'fgcz-h-915: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-915',
+        'fgcz-h-916: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-916',
+        'fgcz-h-917: cpu 8,mem  30 GB,scr 500G' => 'fgcz-h-917',
+      }
+    end
+  end
+
 end

data/lib/workflow_manager/version.rb

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

metadata

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