ood_core 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 782152957ec640f1ad747a00996a8f1dd723831e
-  data.tar.gz: 46bc4f5f5697cf66af2de7628be05d83c75eb9f7
+  metadata.gz: 0cf4709dc9c8753f8229ae67403a0498e9cb8602
+  data.tar.gz: 2f555177a357923753dc246aa4c56811349d4b74
 SHA512:
-  metadata.gz: 37ae31a647021f728f49fc57c4c6c88c194ce14e458dd2c127f2fc6a1de9f3cdd115f9bd0acbf23e4c7f0783ade982a172b1a14e439b06495c719bee4366ece6
-  data.tar.gz: 7207ff48dcb977700d2974426eb9e993830c661e17d4db2ab9c020e3b984d07c4afe990763606bca9f169555e0fb397baf580f8d1c4799d5a8eb1488bf7d1738
+  metadata.gz: 702a25970cf24f9cda29e2adbd57c64003fc3cc60cc07b1da89f2d1c4bb5fb3153e688081c58139fd8ba7cb5623f6a08e16cbbf13737ee61194d1aafcb3d5a8a
+  data.tar.gz: ff5b02ee6b00d43b14568ad91768fcd8b1c8bde7166c112b2df215702bb1f7632e0e154e1954bb974ed1a3e1c71736e3f2aa88385d1d8563e20ab2759ea45ab7

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## 0.0.2 (2017-04-27)
+
+Features:
+
+  - removed the `OodCore::Job::NodeRequest` object
+
 ## 0.0.1 (2017-04-17)
 
 Initial release!

data/lib/ood_core.rb

@@ -8,7 +8,6 @@ module OodCore
   # A namespace for job access
   module Job
     require "ood_core/job/node_info"
-    require "ood_core/job/node_request"
     require "ood_core/job/script"
     require "ood_core/job/info"
     require "ood_core/job/status"

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

@@ -103,12 +103,6 @@ module OodCore
           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?
-          if script.nodes && !script.nodes.empty?
-            # Reduce an array to unique objects with count
-            #   ["a", "a", "b"] #=> {"a" => 2, "b" => 1}
-            nodes = script.nodes.group_by {|v| v}.each_with_object({}) {|(k, v), h| h[k] = v.size}
-            resources.merge!(nodes: nodes.map {|k, v| k.is_a?(NodeRequest) ? node_request_to_str(k, v) : k }.join('+'))
-          end
 
           # Set environment variables
           envvars = script.job_environment || {}
@@ -239,14 +233,6 @@ module OodCore
             end
           end
 
-          # Convert a NodeRequest object to a valid Torque string
-          def node_request_to_str(node, cnt)
-            str = cnt.to_s
-            str += ":ppn=#{node.procs}" if node.procs
-            str += ":#{node.properties.join(':')}" if node.properties
-            str
-          end
-
           # Parse hash describing PBS job status
           def parse_job_info(k, v)
             /^(?<job_owner>[\w-]+)@/ =~ v[:Job_Owner]

data/lib/ood_core/job/script.rb

@@ -100,24 +100,6 @@ module OodCore
       # @return [String, nil] accounting id
       attr_reader :accounting_id
 
-      # Node or list of nodes detailing the specifications the job should run on
-      # @example Job to run on a list of defined nodes
-      #   my_script.nodes
-      #   #=> ["n0001", "n0002", "n0003"]
-      # @example Job to run on 2 nodes with 12 procs per node
-      #   my_script.nodes
-      #   #=> [
-      #   #     #<OodCore::Job::NodeRequest procs=12, properties={}>,
-      #   #     #<OodCore::Job::NodeRequest procs=12, properties={}>
-      #   #   ]
-      # @example Create job script that will run on 100 nodes with 20 procs per node
-      #   OodCore::Job::Script.new(
-      #     script: Pathname.new('/path/to/script'),
-      #     nodes: [OodCore::Job::NodeRequest.new(procs: 20)] * 100
-      #   )
-      # @return [Array<String, NodeRequest>, nil] list of nodes
-      attr_reader :nodes
-
       # Object detailing any native specifications that are implementation specific
       # @note Should not be used at all costs.
       # @return [Object, nil] native specifications
@@ -144,7 +126,6 @@ module OodCore
       # @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 nodes [#to_h, #to_s, Array<#to_h, #to_s>, nil] list of nodes
       # @param native [Object, nil] native specifications
       def initialize(content:, args: nil, submit_as_hold: nil, rerunnable: nil,
                      job_environment: nil, workdir: nil, email: nil,
@@ -152,7 +133,7 @@ module OodCore
                      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, nodes: nil, native: nil,
+                     wall_time: nil, accounting_id: nil, native: nil,
                      **_)
         @content = content.to_s
 
@@ -177,7 +158,6 @@ module OodCore
         @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
-        @nodes            = nodes           && Array.wrap(nodes).map { |n| n.respond_to?(:to_h) ? NodeRequest.new(n.to_h) : n.to_s }
         @native           = native
       end
 
@@ -206,7 +186,6 @@ module OodCore
           start_time:          start_time,
           wall_time:           wall_time,
           accounting_id:       accounting_id,
-          nodes:               nodes,
           native:              native
         }
       end

data/lib/ood_core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -148,7 +148,6 @@ files:
 - lib/ood_core/job/factory.rb
 - lib/ood_core/job/info.rb
 - lib/ood_core/job/node_info.rb
-- lib/ood_core/job/node_request.rb
 - lib/ood_core/job/script.rb
 - lib/ood_core/job/status.rb
 - lib/ood_core/refinements/array_extensions.rb

data/lib/ood_core/job/node_request.rb

@@ -1,51 +0,0 @@
-require 'ood_core/refinements/array_extensions'
-
-module OodCore
-  module Job
-    # An object that describes a request for a node when submitting a job
-    class NodeRequest
-      using Refinements::ArrayExtensions
-
-      # Number of processors usable by job
-      # @return [Fixnum, nil] number of procs
-      attr_reader :procs
-
-      # List of properties required by job
-      # @return [Array<String>, nil] list of properties
-      attr_reader :properties
-
-      # @param procs [#to_i, nil] number of procs
-      # @param properties [#to_s, Array<#to_s>, nil] list of properties
-      def initialize(procs: nil, properties: nil, **_)
-        @procs      = procs      && procs.to_i
-        @properties = properties && Array.wrap(properties).map(&:to_s)
-      end
-
-      # Convert object to hash
-      # @return [Hash] object as hash
-      def to_h
-        { procs: procs, properties: properties }
-      end
-
-      # The comparison operator
-      # @param other [#to_h] object to compare against
-      # @return [Boolean] whether objects are equivalent
-      def ==(other)
-        to_h == other.to_h
-      end
-
-      # Whether objects are identical to each other
-      # @param other [#to_h] object to compare against
-      # @return [Boolean] whether objects are identical
-      def eql?(other)
-        self.class == other.class && self == other
-      end
-
-      # Generate a hash value for this object
-      # @return [Fixnum] hash value of object
-      def hash
-        [self.class, to_h].hash
-      end
-    end
-  end
-end