lib/rbbt/hpc/orchestrate/batches.rb in rbbt-util-5.32.28 vs lib/rbbt/hpc/orchestrate/batches.rb in rbbt-util-5.32.30

@@ -16,16 +16,28 @@
       end
     end
 
     def self.job_workload(job)
       workload = []
+      path_jobs = {}
+
+      path_jobs[job.path] = job
+
       heap = []
-      heap << job
-      while job = heap.pop
+      heap << job.path
+      while job_path = heap.pop
+        job = path_jobs[job_path]
         next if job.done?
         workload << job
-        heap.concat job_dependencies(job)
+
+        deps =  job_dependencies(job)
+
+        deps.each do  |d|
+          path_jobs[d.path] ||= d
+        end
+
+        heap.concat deps.collect(&:path)
         heap.uniq!
       end
       workload.uniq
     end
 
@@ -67,11 +79,11 @@
 
       batches.each do |batch|
         jobs = batch[:jobs]
         all_deps = jobs.collect{|d| job_dependencies(d) }.flatten.uniq
         deps = all_deps.collect do |d|
-          (batches - [batch]).select{|batch| batch[:jobs].include? d }
+          (batches - [batch]).select{|batch| batch[:jobs].collect(&:path).include? d.path }
         end.flatten.uniq
         batch[:deps] = deps
       end
 
       batches
@@ -128,10 +140,10 @@
     end
 
     def self.job_batches(rules, job)
       job_chains = self.job_chains(rules, job)
 
-      workload = job_workload(job)
+      workload = job_workload(job).uniq
 
       batches = chain_batches(rules, job_chains, workload)
       batches = add_batch_deps(batches)
       batches = add_rules_and_consolidate(rules, batches)
     end