Added uses_gpu flag to Job Info class

lib/ood_core/job/adapters/slurm.rb

@@ -643,7 +643,8 @@ def parse_job_info(v)
               cpu_time: nil,
               submission_time: v[:submit_time] ? Time.parse(v[:submit_time]) : nil,
               dispatch_time: (v[:start_time].nil? || v[:start_time] == "N/A") ? nil : Time.parse(v[:start_time]),
-              native: v
+              native: v,
+              gpus: v[:gres]&.include?("gpu") ? 1 : 0
             )
           end
 

lib/ood_core/job/info.rb

@@ -65,9 +65,9 @@ class Info
       # @return [Object] native info
       attr_reader :native
 
-      # If the job is using/requesting a gpu
-      # @return [Boolean] job uses gpu
-      attr_reader :uses_gpu
+      # Number of gpus allocated for job
+      # @return [Integer, nil] allocated total number of gpus
+      attr_reader :gpus
 
       # List of job array child task statuses
       # @note only relevant for job arrays
@@ -90,11 +90,12 @@ class Info
       # @param dispatch_time [#to_i, nil] dispatch time
       # @param tasks [Array<Hash>] tasks e.g. { id: '12345.owens-batch', status: :running }
       # @param native [Object] native info
+      # @param gpus [#to_i, nil] allocated total number of gpus
       def initialize(id:, status:, allocated_nodes: [], submit_host: nil,
                      job_name: nil, job_owner: nil, accounting_id: nil,
                      procs: nil, queue_name: nil, wallclock_time: nil,
                      wallclock_limit: nil, cpu_time: nil, submission_time: nil,
-                     dispatch_time: nil, native: nil, uses_gpu: nil, tasks: [],
+                     dispatch_time: nil, native: nil, gpus: nil, tasks: [],
                      **_)
         @id              = id.to_s
         @status          = Status.new(state: status.to_sym)
@@ -115,7 +116,7 @@ def initialize(id:, status:, allocated_nodes: [], submit_host: nil,
         @status = job_array_aggregate_status unless @tasks.empty?
 
         @native          = native
-        @uses_gpu        = uses_gpu || native&.dig(:gres)&.include?("gpu") || false
+        @gpus            = gpus            && gpus.to_i
       end
 
       # Create a new Info for a child task
@@ -152,11 +153,16 @@ def to_h
           submission_time: submission_time,
           dispatch_time:   dispatch_time,
           native:          native,
-          uses_gpu:        uses_gpu,
+          gpus:            gpus,
           tasks: tasks
         }
       end
 
+      def gpu?
+        gpus.positive?
+        #native&.dig(:gres)&.include?("gpu") || false
+      end
+
       # The comparison operator
       # @param other [#to_h] object to compare against
       # @return [Boolean] whether objects are equivalent