ood_core 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6dd320e10be434a6689cf286a0250e639ae82a
-  data.tar.gz: cfaa8e4bad41f728f6bf08e6db0bea634dca9e4b
+  metadata.gz: cdde96a0722a74c2029aa85fec797955c26af463
+  data.tar.gz: 565037a93bc40bb5c03040b72474d1bf120cb611
 SHA512:
-  metadata.gz: 60f7e34ded14e2ed6aba02a850d2157c90b73347e1846c69e18a663dde3992e80a71d90be7a1c1dac4b895c007b1d5cf062f54a08913e18bd67de864088278db
-  data.tar.gz: c2927b9f0342ec93462e74f04d806b9359780949bb99f6af8e304e3c1da5c72fe27d77ebfdb575686012f04067c8d927e6914bf452d3fc5c7fffb6736f774a19
+  metadata.gz: a4d0b4338925e8ed5dd26a55cc589cfc9ef9bd3dbe435457ea8c18a59ec8cc608affb102751acc6a719b365bdf2e4d3c92881733f34c10fd60f120f3f4e282a3
+  data.tar.gz: d0d6ac85526748c9bfb81582877b01749b27f8f754abc6fd4e89cf64ba7156f084a3533c95ca5b8b16613ad8a2f130b842dca563874e8a4d56c0d9d69a0b8bf0

data/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.4.0] - 2018-04-20
+### Changed
+- Updated Torque adapter to take into account the new `Script#native` format
+  allowing for arrays. [#65](https://github.com/OSC/ood_core/issues/65)
+
 ## [0.3.0] - 2018-04-05
 ### Added
 - Basic multi-cluster support for LSF by specifying name of cluster for -m
@@ -112,7 +117,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.3.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.4.0...HEAD
+[0.4.0]: https://github.com/OSC/ood_core/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/OSC/ood_core/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/OSC/ood_core/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/OSC/ood_core/compare/v0.1.1...v0.2.0

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

@@ -71,54 +71,94 @@ module OodCore
           afternotok = Array(afternotok).map(&:to_s)
           afterany   = Array(afterany).map(&:to_s)
 
-          # Set headers
-          headers = {}
-          headers.merge!(job_arguments: script.args.join(' ')) unless script.args.nil?
-          headers.merge!(Hold_Types: :u) if script.submit_as_hold
-          headers.merge!(Rerunable: script.rerunnable ? 'y' : 'n') unless script.rerunnable.nil?
-          headers.merge!(init_work_dir: script.workdir) unless script.workdir.nil?
-          headers.merge!(Mail_Users: script.email.join(',')) unless script.email.nil?
-          mail_points  = ''
-          mail_points += 'b' if script.email_on_started
-          mail_points += 'e' if script.email_on_terminated
-          headers.merge!(Mail_Points: mail_points) unless mail_points.empty?
-          headers.merge!(Job_Name: script.job_name) unless script.job_name.nil?
-          headers.merge!(Shell_Path_List: script.shell_path) unless script.shell_path.nil?
-          # 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?
-          # 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?
-          headers.merge!(Account_Name: script.accounting_id) unless script.accounting_id.nil?
-
           # Set dependencies
           depend = []
           depend << "after:#{after.join(':')}"           unless after.empty?
           depend << "afterok:#{afterok.join(':')}"       unless afterok.empty?
           depend << "afternotok:#{afternotok.join(':')}" unless afternotok.empty?
           depend << "afterany:#{afterany.join(':')}"     unless afterany.empty?
-          headers.merge!(depend: depend.join(','))       unless depend.empty?
 
-          # Set resources
-          resources = {}
-          resources.merge!(walltime: seconds_to_duration(script.wall_time)) unless script.wall_time.nil?
+          # Set mailing options
+          mail_points  = ""
+          mail_points += "b" if script.email_on_started
+          mail_points += "e" if script.email_on_terminated
 
-          # Set environment variables
-          envvars = script.job_environment || {}
+          # FIXME: Remove the Hash option once all Interactive Apps are
+          # converted to Array format
+          if script.native.is_a?(Hash)
+            # Set headers
+            headers = {}
+            headers.merge!(job_arguments: script.args.join(' ')) unless script.args.nil?
+            headers.merge!(Hold_Types: :u) if script.submit_as_hold
+            headers.merge!(Rerunable: script.rerunnable ? 'y' : 'n') unless script.rerunnable.nil?
+            headers.merge!(init_work_dir: script.workdir) unless script.workdir.nil?
+            headers.merge!(Mail_Users: script.email.join(',')) unless script.email.nil?
+            headers.merge!(Mail_Points: mail_points) unless mail_points.empty?
+            headers.merge!(Job_Name: script.job_name) unless script.job_name.nil?
+            headers.merge!(Shell_Path_List: script.shell_path) unless script.shell_path.nil?
+            # 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?
+            # 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?
+            headers.merge!(Account_Name: script.accounting_id) unless script.accounting_id.nil?
+            headers.merge!(depend: depend.join(','))       unless depend.empty?
 
-          # Set native options
-          if script.native
-            headers.merge!   script.native.fetch(:headers, {})
-            resources.merge! script.native.fetch(:resources, {})
-            envvars.merge!   script.native.fetch(:envvars, {})
-          end
+            # Set resources
+            resources = {}
+            resources.merge!(walltime: seconds_to_duration(script.wall_time)) unless script.wall_time.nil?
+
+            # Set environment variables
+            envvars = script.job_environment || {}
+
+            # Set native options
+            if script.native
+              headers.merge!   script.native.fetch(:headers, {})
+              resources.merge! script.native.fetch(:resources, {})
+              envvars.merge!   script.native.fetch(:envvars, {})
+            end
 
-          # Submit job
-          @pbs.submit_string(script.content, queue: script.queue_name, headers: headers, resources: resources, envvars: envvars)
+            # Submit job
+            @pbs.submit_string(script.content, queue: script.queue_name, headers: headers, resources: resources, envvars: envvars)
+          else
+            # Set qsub arguments
+            args = []
+            args += ["-F", script.args.join(" ")] unless script.args.nil?
+            args += ["-h"] if script.submit_as_hold
+            args += ["-r", script.rerunnable ? "y" : "n"] unless script.rerunnable.nil?
+            args += ["-M", script.email.join(",")] unless script.email.nil?
+            args += ["-m", mail_points] unless mail_points.empty?
+            args += ["-N", script.job_name] unless script.job_name.nil?
+            args += ["-S", script.shell_path] unless script.shell_path.nil?
+            # ignore input_path (not defined in Torque)
+            args += ["-o", script.output_path] unless script.output_path.nil?
+            args += ["-e", script.error_path] unless script.error_path.nil?
+            args += ["-W", "x=advres:#{script.reservation_id}"] unless script.reservation_id.nil?
+            args += ["-q", script.queue_name] unless script.queue_name.nil?
+            args += ["-p", script.priority] unless script.priority.nil?
+            args += ["-a", script.start_time.localtime.strftime("%C%y%m%d%H%M.%S")] unless script.start_time.nil?
+            args += ["-A", script.accounting_id] unless script.accounting_id.nil?
+            args += ["-W", "depend=#{depend.join(",")}"] unless depend.empty?
+            args += ["-l", "walltime=#{seconds_to_duration(script.wall_time)}"] unless script.wall_time.nil?
+
+            # Set environment variables
+            env = script.job_environment.to_h
+            args += ["-v", env.keys.join(",")] unless env.empty?
+
+            # If error_path is not specified we join stdout & stderr (as this
+            # mimics what the other resource managers do)
+            args += ["-j", "oe"] if script.error_path.nil?
+
+            # Set native options
+            args += script.native if script.native
+
+            # Submit job
+            @pbs.submit(script.content, args: args, env: env, chdir: script.workdir)
+          end
         rescue PBS::Error => e
           raise JobAdapterError, e.message
         end

data/lib/ood_core/version.rb

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

data/ood_core.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.2.0"
 
   spec.add_runtime_dependency "ood_support", "~> 0.0.2"
-  spec.add_development_dependency "pbs", "~> 2.1", ">= 2.1.0"
+  spec.add_development_dependency "pbs", "~> 2.1", ">= 2.2.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -33,7 +33,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement