diff --git a/bin/shepherd.py b/bin/shepherd.py index a552bc8..0dab1e4 100644 --- a/bin/shepherd.py +++ b/bin/shepherd.py @@ -40,10 +40,10 @@ if __name__ == '__main__': dest_verts = pickle.load(open(dest_verts, 'r')) orders = [2,3,4,5] - extras = [4,6,8,12,16,20,32,48,64,96,128,192,256] + extras = [4,6,8,12, 16,20,32,48, 64,96,128,192, 256] - count = len(orders) * len(extras) * sum((len(i) for i in dest_verts)) + count = len(orders) * len(extras) * len(dest_verts) results = [None] * count # results = [id, order, extra, X, qlin, err, final, exact, time] @@ -80,13 +80,12 @@ if __name__ == '__main__': i = 0 for order in orders: for extra in extras: - for d in dest_verts: - for X in d: - cur_job = (i, order, extra, X) - results[i] = [ order, extra, X] - tasksq.put(cur_job) - i+=1 - pbar.update(i) + for X in dest_verts: + cur_job = (i, order, extra, X) + results[i] = [ order, extra, X] + tasksq.put(cur_job) + i+=1 + pbar.update(i) submit_end = time.time() pbar.finish()