move gpus_from_gres to slurm before batch

lib/ood_core/job/adapters/slurm.rb

@@ -36,6 +36,13 @@ class Slurm < Adapter
         using Refinements::HashExtensions
         using Refinements::ArrayExtensions
 
+        # Get integer representing the number of gpus used by a node or job,
+        # calculated from gres string
+        # @return [Integer] the number of gpus in gres
+        def gpus_from_gres(gres)
+          gres.to_s.scan(/gpu:[^,]*(\d+)/).flatten.map(&:to_i).sum
+        end
+
         # Object used for simplified communication with a Slurm batch server
         # @api private
         class Batch
@@ -359,10 +366,6 @@ def squeue_attrs_for_info_attrs(attrs)
                 }.fetch(a, a)
               }.flatten
             end
-
-            def gpus_from_gres(gres)
-              gres.to_s.scan(/gpu:[^,]*(\d+)/).flatten.map(&:to_i).sum
-            end
         end
 
         # Mapping of state codes for Slurm
@@ -670,7 +673,7 @@ def parse_job_info(v)
               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,
-              gpus: @batch.gpus_from_gres(v[:gres])
+              gpus: gpus_from_gres(v[:gres])
             )
           end
 

spec/job/adapters/slurm_spec.rb

@@ -1219,7 +1219,7 @@ def job_info(opts = {})
       ]
       gres_cases.each do |gc| 
         it "does not return the correct number of gpus when gres=\"#{gc[0]}\"" do
-          gpus = adapter.send(:gpus_from_gres, gc[0])
+          gpus = adapter.gpus_from_gres(gc[0]);
           expect(gpus).to be(gc[1]);
         end
       end