ood_core 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13f67ce37546552c1f3b8849dca41458b066cb36
-  data.tar.gz: 56142c67e2210211d4525982abb5254999306b6a
+  metadata.gz: 8002c2e879b001e56001b19968b7832083ed9bef
+  data.tar.gz: 4138c0a93735760e1ebaba489231229879f7b72b
 SHA512:
-  metadata.gz: 56cfa06bd1d20bb00bc1362a1dbc484c03c600c7f30525fe51b483bfe6fe950b81c33fcd6ec214815cf538670525a46c423aea5a4e3a23aa44d2cc11ff31b115
-  data.tar.gz: 03d29f9582ae5609c159fad74825f16f96de0ff091aa150ad6f9cdf8a4b8899148ab8f0220fb8f6bbe18d438ec15784a9f95d6432883d658d13ee21781cd8cf7
+  metadata.gz: e308714bcb389500342e493a914542b9c59b63a0a8776ec4dc6883a3ab7dc1696ef44fdee40ea2c74ae9b94c89d8d9e58336cd6f5cf252b403ba055f755f7841
+  data.tar.gz: f4b67e63a34642884b5bd6de6ecab47484d377b639fc174eb45c5bc11f4cc993e89105bb3092dd7cf6695d27951618ee4fc8f7b41308e6b3a8be8386243e39d2

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## Unreleased
 
+## 0.0.4 (2017-05-17)
+
+Features:
+
+  - removed `OodCore::Job::Script#min_phys_memory` due to lack of commonality
+    across resource managers
+  - removed `OodCore::Job::Script#join_files` due to lack of support in
+    resource managers
+  - by default all PBS jobs output stdout & stderr to output path unless an
+    error path is specified (mimics behavior of Slurm and LSF)
+
 ## 0.0.3 (2017-04-28)
 
 Features:

data/lib/ood_core/job/adapters/slurm.rb

@@ -275,14 +275,11 @@ module OodCore
           args += ["-i", script.input_path] unless script.input_path.nil?
           args += ["-o", script.output_path] unless script.output_path.nil?
           args += ["-e", script.error_path] unless script.error_path.nil?
-          # ignore join_files, by default it joins stdout and stderr unless
-          # error_path is specified
           args += ["--reservation", script.reservation_id] unless script.reservation_id.nil?
           args += ["-p", script.queue_name] unless script.queue_name.nil?
           args += ["--priority", script.priority] unless script.priority.nil?
           args += ["--begin", script.start_time.localtime.strftime("%C%y-%m-%dT%H:%M:%S")] unless script.start_time.nil?
           args += ["-A", script.accounting_id] unless script.accounting_id.nil?
-          args += ["--mem", "#{script.min_phys_memory}K"] unless script.min_phys_memory.nil?
           args += ["-t", seconds_to_duration(script.wall_time)] unless script.wall_time.nil?
           # ignore nodes, don't know how to do this for slurm
 

data/lib/ood_core/job/adapters/torque.rb

@@ -85,7 +85,9 @@ module OodCore
           # ignore input_path (not defined in Torque)
           headers.merge!(Output_Path: script.output_path) unless script.output_path.nil?
           headers.merge!(Error_Path: script.error_path) unless script.error_path.nil?
-          headers.merge!(Join_Path: 'oe') if script.join_files
+          # If error_path is not specified we join stdout & stderr (as this
+          # mimics what the other resource managers do)
+          headers.merge!(Join_Path: 'oe') if script.error_path.nil?
           headers.merge!(reservation_id: script.reservation_id) unless script.reservation_id.nil?
           headers.merge!(Priority: script.priority) unless script.priority.nil?
           headers.merge!(Execution_Time: script.start_time.localtime.strftime("%C%y%m%d%H%M.%S")) unless script.start_time.nil?
@@ -101,7 +103,6 @@ module OodCore
 
           # Set resources
           resources = {}
-          resources.merge!(mem: "#{script.min_phys_memory}KB") unless script.min_phys_memory.nil?
           resources.merge!(walltime: seconds_to_duration(script.wall_time)) unless script.wall_time.nil?
 
           # Set environment variables

data/lib/ood_core/job/script.rb

@@ -66,10 +66,6 @@ module OodCore
       # @return [Pathname, nil] file path specifying error stream
       attr_reader :error_path
 
-      # Whether the error stream should be intermixed with the output stream
-      # @return [Boolean, nil] whether error stream intermixed with output stream
-      attr_reader :join_files
-
       # Identifier of existing reservation to be associated with the job
       # @return [String, nil] reservation id
       attr_reader :reservation_id
@@ -82,12 +78,6 @@ module OodCore
       # @return [Fixnum, nil] scheduling priority
       attr_reader :priority
 
-      # The minimum amount of physical memory in kilobyte for all nodes or per
-      # node (dependent upon the resource manager) that should be available for
-      # the job
-      # @return [Fixnum, nil] minimum physical memory
-      attr_reader :min_phys_memory
-
       # The earliest time when the job may be eligible to run
       # @return [Time, nil] eligible start time
       attr_reader :start_time
@@ -119,30 +109,26 @@ module OodCore
       # @param input_path [#to_s, nil] file path specifying input stream
       # @param output_path [#to_s, nil] file path specifying output stream
       # @param error_path [#to_s, nil] file path specifying error stream
-      # @param join_files [Boolean, nil] whether error stream intermixed with output stream
       # @param reservation_id [#to_s, nil] reservation id
       # @param queue_name [#to_s, nil] queue name
       # @param priority [#to_i, nil] scheduling priority
-      # @param min_phys_memory [#to_i, nil] minimum physical memory
       # @param start_time [#to_i, nil] eligible start time
       # @param wall_time [#to_i, nil] max real time
       # @param accounting_id [#to_s, nil] accounting id
       # @param native [Object, nil] native specifications
       def initialize(content:, args: nil, submit_as_hold: nil, rerunnable: nil,
                      job_environment: nil, workdir: nil, email: nil,
-                     email_on_started: nil, email_on_terminated: nil, job_name: nil,
-                     input_path: nil, output_path: nil, error_path: nil,
-                     join_files: nil, reservation_id: nil, queue_name: nil,
-                     priority: nil, min_phys_memory: nil, start_time: nil,
-                     wall_time: nil, accounting_id: nil, native: nil,
-                     **_)
+                     email_on_started: nil, email_on_terminated: nil,
+                     job_name: nil, input_path: nil, output_path: nil,
+                     error_path: nil, reservation_id: nil, queue_name: nil,
+                     priority: nil, start_time: nil, wall_time: nil,
+                     accounting_id: nil, native: nil, **_)
         @content = content.to_s
 
         @submit_as_hold      = submit_as_hold
         @rerunnable          = rerunnable
         @email_on_started    = email_on_started
         @email_on_terminated = email_on_terminated
-        @join_files          = join_files
 
         @args             = args            && args.map(&:to_s)
         @job_environment  = job_environment && job_environment.each_with_object({}) { |(k, v), h| h[k.to_s] = v.to_s }
@@ -155,7 +141,6 @@ module OodCore
         @reservation_id   = reservation_id  && reservation_id.to_s
         @queue_name       = queue_name      && queue_name.to_s
         @priority         = priority        && priority.to_i
-        @min_phys_memory  = min_phys_memory && min_phys_memory.to_i
         @start_time       = start_time      && Time.at(start_time.to_i)
         @wall_time        = wall_time       && wall_time.to_i
         @accounting_id    = accounting_id   && accounting_id.to_s
@@ -179,11 +164,9 @@ module OodCore
           input_path:          input_path,
           output_path:         output_path,
           error_path:          error_path,
-          join_files:          join_files,
           reservation_id:      reservation_id,
           queue_name:          queue_name,
           priority:            priority,
-          min_phys_memory:     min_phys_memory,
           start_time:          start_time,
           wall_time:           wall_time,
           accounting_id:       accounting_id,

data/lib/ood_core/version.rb

@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support