miga-base 1.1.0.0 → 1.1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4076b3b3a4a4143ac9100ce4d58fada7615f68ad3e6174445510655f62904867
-  data.tar.gz: '0975a5feb4c9eb71a474be87dd14b58297ef1aa7bd8612c20f1ce65febbdf980'
+  metadata.gz: a666ed2219c2e1573dff12caca0b841d4c649bad62f4f5c0d274fc2c5407b178
+  data.tar.gz: 9e6a46b35a83b8f2349bb2a676f6c2fba7e375b52156734b636084d68c4626af
 SHA512:
-  metadata.gz: ebcb7fe28d415ca9709433975585518eb1ecd8e8270c584b6579da222e4d3733cc20d810787c3f764f6a6136e1a6f09b7cb6b1c00114c3ea9c0885370654f3a7
-  data.tar.gz: '082bd856ed21487e5de709e2067f1d3453f824e0ece7a77716c6fbe70d88a16c4d295196d5c6133e5667142e25f55f7e48e4a785afd160a14e8195a9b7efa6c2'
+  metadata.gz: 61abc23642093894f068e1edc6252fb7a4e95035284f5469a0c955aebdadbdd2d62a76f395c933c7e819498e9a3b7685dd7257afe6263bc0b51111b141d00a13
+  data.tar.gz: 72f7024d6d5594a794dd5d7ca68d7b5896d28109a2800189981c9ba1fed85a3ad2e51303a547991fc998360426a5e85fe03dc9e7a61d38520744b6ed2dece8b9

data/lib/miga/daemon/base.rb

@@ -12,7 +12,7 @@ module MiGA::Daemon::Base
     k = k.to_sym
     unless v.nil?
       case k
-      when :latency, :maxjobs, :ppn, :format_version, :verbosity
+      when :latency, :maxjobs, :ppn, :ppn_project, :format_version, :verbosity
         v = v.to_i
         if !force && v == 0 && k != :verbosity
           raise "Daemon's #{k} cannot be set to zero"
@@ -51,9 +51,17 @@ module MiGA::Daemon::Base
   end
 
   ##
-  # Returns Integer indicating the number of CPUs per job
-  def ppn
-    runopts(:ppn)
+  # Returns the running option +opt+ in jobs for +what+. +what+ can be
+  # +:dataset+ or +:projects+
+  def runopts_for(opt, what)
+    runopts(:"#{opt}_#{what}") || runopts(opt)
+  end
+
+  ##
+  # Returns Integer indicating the number of CPUs per job, in jobs for +what+.
+  # See also #runopts_for
+  def ppn(what = :dataset)
+    runopts_for(:ppn, what)
   end
 
   ##

data/lib/miga/daemon.rb

@@ -231,10 +231,11 @@ class MiGA::Daemon < MiGA::MiGA
   # Construct the command for the given job definition with current
   # daemon settings
   def job_cmd(to_run)
+    what = to_run[:ds].nil? ? :project : :dataset
     vars = {
       'PROJECT' => project.path,
-      'RUNTYPE' => runopts(:type),
-      'CORES' => ppn,
+      'RUNTYPE' => runopts_for(:type, what),
+      'CORES' => ppn(what),
       'MIGA' => MiGA::MiGA.root_path
     }
     vars['DATASET'] = to_run[:ds].name unless to_run[:ds].nil?
@@ -246,13 +247,13 @@ class MiGA::Daemon < MiGA::MiGA
               ),
       vars: vars.map do |k, v|
               runopts(:var).miga_variables(key: k, value: v)
-            end.join(runopts(:varsep)),
-      cpus: ppn,
+            end.join(runopts_for(:varsep, what)),
+      cpus: ppn(what),
       log: File.join(log_dir, "#{to_run[:ds_name]}.log"),
       task_name: to_run[:task_name],
       miga: File.join(MiGA::MiGA.root_path, 'bin/miga').shellescape
     }
-    runopts(:cmd).miga_variables(var_hsh)
+    runopts_for(:cmd, what).miga_variables(var_hsh)
   end
 
   ##

data/lib/miga/version.rb

@@ -12,7 +12,7 @@ module MiGA
   # - String indicating release status:
   #   - rc* release candidate, not released as gem
   #   - [0-9]+ stable release, released as gem
-  VERSION = [1.1, 0, 0].freeze
+  VERSION = [1.1, 1, 0].freeze
 
   ##
   # Nickname for the current major.minor version.
@@ -20,7 +20,7 @@ module MiGA
 
   ##
   # Date of the current gem relese.
-  VERSION_DATE = Date.new(2021, 10, 28)
+  VERSION_DATE = Date.new(2021, 10, 29)
 
   ##
   # References of MiGA

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miga-base
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0
+  version: 1.1.1.0
 platform: ruby
 authors:
 - Luis M. Rodriguez-R
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons