ood_core 0.14.0 → 0.17.0

data/lib/ood_core/job/adapters/linux_host/launcher.rb

@@ -16,7 +16,7 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
   # from
   class Error < StandardError; end
 
-  UNIT_SEPARATOR = "\x1F"
+  UNIT_SEPARATOR = ","
 
   # @param debug Whether the adapter should be used in debug mode
   # @param site_timeout [#to_i] A period after which the job should be killed or nil
@@ -80,12 +80,7 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
 
     call(*cmd, stdin: kill_cmd)
   rescue Error => e
-    raise e unless (
-      # The tmux server not running is not an error
-      e.message.include?('failed to connect to server') ||
-      # The session not being found is not an error
-      e.message.include?("session not found: #{session_name_label}")
-    )
+    interpret_and_raise(e)
   end
 
   def list_remote_sessions(host: nil)
@@ -264,8 +259,7 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
       |session_hash| session_hash[:session_name].start_with?(session_name_label)
     }
   rescue Error => e
-    # The tmux server not running is not an error
-    raise e unless e.message.include?('failed to connect to server')
+    interpret_and_raise(e)
     []
   end
 
@@ -280,4 +274,17 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
 
     '/dev/null'
   end
+
+  # under some conditions tmux returns status code 1 but it's not an actual
+  # error. These are when the session is not found or there are no sessions
+  # at all.
+  def interpret_and_raise(error)
+    if error.message.include?('failed to connect to server') # no sessions in tmux 1.8
+      nil
+    elsif error.message.include?('no server running on') # no sessions in tmux 2.7+ message
+      nil
+    else
+      raise error
+    end
+  end
 end

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

@@ -423,6 +423,7 @@ module OodCore
           args.concat ["-t", seconds_to_duration(script.wall_time)] unless script.wall_time.nil?
           args.concat ['-a', script.job_array_request] unless script.job_array_request.nil?
           args.concat ['--qos', script.qos] unless script.qos.nil?
+          args.concat ['--gpus-per-node', script.gpus_per_node] unless script.gpus_per_node.nil?
           # ignore nodes, don't know how to do this for slurm
 
           # Set dependencies

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

@@ -159,6 +159,8 @@ module OodCore
             args.concat ["-l", "walltime=#{seconds_to_duration(script.wall_time)}"] unless script.wall_time.nil?
             args.concat ['-t', script.job_array_request] unless script.job_array_request.nil?
             args.concat ['-l', "qos=#{script.qos}"] unless script.qos.nil?
+            args.concat ['-l', "gpus=#{script.gpus_per_node}"] unless script.gpus_per_node.nil?
+
             # Set environment variables
             env = script.job_environment.to_h
             args.concat ["-v", env.keys.join(",")] unless env.empty?

data/lib/ood_core/job/script.rb

@@ -103,6 +103,10 @@ module OodCore
       # @return [String, nil] qos
       attr_reader :qos
 
+      # The GPUs per node for the job
+      # @return [Integer, nil] gpus per node
+      attr_reader :gpus_per_node
+
       # Object detailing any native specifications that are implementation specific
       # @note Should not be used at all costs.
       # @return [Object, nil] native specifications
@@ -136,6 +140,7 @@ module OodCore
       # @param accounting_id [#to_s, nil] accounting id
       # @param job_array_request [#to_s, nil] job array request
       # @param qos [#to_s, nil] qos
+      # @param gpus_per_node [#to_i, nil] gpus per node
       # @param native [Object, nil] native specifications
       # @param copy_environment [Boolean, nil] copy the environment
       def initialize(content:, args: nil, submit_as_hold: nil, rerunnable: nil,
@@ -145,7 +150,7 @@ module OodCore
                      output_path: nil, error_path: nil, reservation_id: nil,
                      queue_name: nil, priority: nil, start_time: nil,
                      wall_time: nil, accounting_id: nil, job_array_request: nil,
-                     qos: nil, native: nil, copy_environment: nil, **_)
+                     qos: nil, gpus_per_node: nil, native: nil, copy_environment: nil, **_)
         @content = content.to_s
 
         @submit_as_hold      = submit_as_hold
@@ -170,6 +175,7 @@ module OodCore
         @accounting_id      = accounting_id     && accounting_id.to_s
         @job_array_request  = job_array_request && job_array_request.to_s
         @qos                = qos               && qos.to_s
+        @gpus_per_node      = gpus_per_node     && gpus_per_node.to_i
         @native             = native
         @copy_environment   = (copy_environment.nil?) ? nil : !! copy_environment
       end
@@ -200,6 +206,7 @@ module OodCore
           accounting_id:       accounting_id,
           job_array_request:   job_array_request,
           qos:                 qos,
+          gpus_per_node:       gpus_per_node,
           native:              native,
           copy_environment:    copy_environment
         }

data/lib/ood_core/version.rb

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

data/ood_core.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "ood_support", "~> 0.0.2"
   spec.add_runtime_dependency "ffi", "~> 1.9", ">= 1.9.6"
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_runtime_dependency "activesupport", ">= 5.2", "< 6.0"
   spec.add_development_dependency "rake", "~> 13.0.1"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -52,14 +52,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,9 +160,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -169,6 +189,7 @@ files:
 - lib/ood_core/job/adapters/kubernetes.rb
 - lib/ood_core/job/adapters/kubernetes/batch.rb
 - lib/ood_core/job/adapters/kubernetes/helper.rb
+- lib/ood_core/job/adapters/kubernetes/k8s_job_info.rb
 - lib/ood_core/job/adapters/kubernetes/resources.rb
 - lib/ood_core/job/adapters/kubernetes/templates/pod.yml.erb
 - lib/ood_core/job/adapters/linux_host.rb
@@ -221,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Open OnDemand core library

data/.travis.yml

@@ -1,9 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.5
-before_install: gem install bundler -v '~> 1.17'
-notifications:
-  email:
-    on_success: never
-    on_failure: always