workflow_manager 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '08c87b93bcb1fc9aadd48bea307f1543787acf79'
-  data.tar.gz: 89fd672a4e1ec7929c6e7dbf19597bed82afc110
+SHA256:
+  metadata.gz: c5711738c7423585b2db31fd502f0f1dd44ac23ead6f77ae2a8bfa328d4c2649
+  data.tar.gz: e2a981b0065fa8e6efacb8ad4433162809bd4533f32e72e554cf98459b7f85c1
 SHA512:
-  metadata.gz: 87f5d37dd1394ef6bbb894e163a629c12eb590a270edab39c16b892b1437cbace16245132713057dcc45a3879bfa3cc6512615e6177b9ebb55facc75d893d769
-  data.tar.gz: '095e8de179697c6c07278e99ace552ab8f21ee025408a0617fbe4148d71fcaf12cf09b884ec648d9054c30eef8e191c7a2b6395a73a0c7c965d8603ac20eb458'
+  metadata.gz: 6fece378a564236133c30296a6b1a240dc830fb21441960c58ad1ccf9874da9eac96e78f17181cb95f1f51f1645bf124c4253b8f6abd3f871318470f2de22b6e
+  data.tar.gz: 15333f88e1e38458d1c963731519e35d8971f4047ea07fd7c1821fea1f291b2c4a862a693fbca0e1b4a8ab56d7435dc82eff56f4d0c89f00b09dd2749d539e4a

data/lib/workflow_manager/cluster.rb

@@ -38,6 +38,8 @@ module WorkflowManager
     end
     def default_node
     end
+    def node_list
+    end
   end
 
   class LocalComputer < Cluster
@@ -238,6 +240,63 @@ module WorkflowManager
         'fgcz-h-010: cpu 8,mem  30 GB,scr 400G' => 'fgcz-h-010',
       }
     end
+    def node_list
+      node2scr = {}
+      command = "qhost -F scratch"
+      keep = nil
+      IO.popen(command) do |out|
+        while line=out.gets
+          hostname, arch, ncpu, loading, memtot, memuse, *others = line.split
+          if hostname =~ /fgcz/
+            keep = hostname
+          elsif scratch_ = line.chomp.split.last and
+                scratch = scratch_.split('=').last
+            node2scr[keep] = scratch.to_i
+            keep = nil
+          end
+        end
+      end
+
+      list = {}
+      keep = nil
+      command = 'qhost -q'
+      IO.popen(command) do |out|
+        while line=out.gets
+          # HOSTNAME                ARCH         NCPU  LOAD  MEMTOT  MEMUSE  SWAPTO  SWAPUS
+          hostname, arch, ncpu, loading, memtot, memuse, *others = line.split
+          if hostname =~ /fgcz/
+            #puts [hostname, ncpu, loading, memtot, memuse].join("\t")
+            mem = memtot.gsub(/G/, '').to_i
+            keep = [hostname, ncpu, "#{mem}G"]
+          elsif hostname == "GT" and keep and cores = line.chomp.split.last and cores !~ /[du]/
+            hostname = keep.shift
+            keep[0] = cores
+            if scr = node2scr[hostname] and scr >= 1000
+              scr = "%.1f" % (scr.to_f / 1000)
+              scr << "T"
+            else
+              scr = scr.to_s + "G"
+            end
+            keep << scr
+            list[hostname] = keep 
+            keep = nil
+          end
+        end
+      end
+
+      # reformat
+      nodes = {}
+      list.each do |hostname, specs|
+        # 20190823 masa tentatively off use f47
+        unless hostname =~ /fgcz-c-047/
+          cores, ram, scr = specs
+          key = "#{hostname}: cores #{cores}, ram #{ram}, scr #{scr}"
+          value = hostname
+          nodes[key] = value
+        end
+      end
+      nodes
+    end
   end
 
   class FGCZCourseCluster < FGCZCluster

data/lib/workflow_manager/server.rb

@@ -510,5 +510,8 @@ module WorkflowManager
     end
     alias_method :check_status, :success_or_fail
   end
+  def cluster_node_list
+    @cluster.node_list
+  end
 end
 

data/lib/workflow_manager/version.rb

@@ -1,3 +1,3 @@
 module WorkflowManager
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workflow_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Workflow Manager manages job submissions using dRuby.