From e5b977734ced4460fb2198f52f53ad5ee3ebd7a6 Mon Sep 17 00:00:00 2001 From: jajupmochi Date: Tue, 5 Jan 2021 21:11:03 +0100 Subject: [PATCH] [Fix bugs] length in get_iters in compute_geds(). --- gklearn/ged/util/util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gklearn/ged/util/util.py b/gklearn/ged/util/util.py index 52aa126..a5a5ac5 100644 --- a/gklearn/ged/util/util.py +++ b/gklearn/ged/util/util.py @@ -136,7 +136,7 @@ def compute_geds_cml(graphs, options={}, sort=True, parallel=False, verbose=True G_listID = listID_toshare do_partial = partial(_wrapper_compute_ged_parallel, neo_options, sort) pool = Pool(processes=n_jobs, initializer=init_worker, initargs=(graphs, ged_env, listID)) - iterator = get_iters(pool.imap_unordered(do_partial, itr, chunksize), desc='computing GEDs', file=sys.stdout, length=len(graphs), verbose=verbose) + iterator = get_iters(pool.imap_unordered(do_partial, itr, chunksize), desc='computing GEDs', file=sys.stdout, length=len_itr, verbose=verbose) # iterator = pool.imap_unordered(do_partial, itr, chunksize) for i, j, dis, n_eo_tmp in iterator: idx_itr = int(len(graphs) * i + j - (i + 1) * (i + 2) / 2) @@ -207,7 +207,7 @@ def compute_geds(graphs, options={}, sort=True, repeats=1, parallel=False, n_job G_listID = listID_toshare do_partial = partial(_wrapper_compute_ged_parallel, neo_options, sort, repeats) pool = Pool(processes=n_jobs, initializer=init_worker, initargs=(graphs, ged_env, listID)) - iterator = get_iters(pool.imap_unordered(do_partial, itr, chunksize), desc='computing GEDs', file=sys.stdout, length=len(graphs), verbose=verbose) + iterator = get_iters(pool.imap_unordered(do_partial, itr, chunksize), desc='computing GEDs', file=sys.stdout, length=len_itr, verbose=verbose) # iterator = pool.imap_unordered(do_partial, itr, chunksize) for i, j, dis, n_eo_tmp in iterator: idx_itr = int(len(graphs) * i + j - (i + 1) * (i + 2) / 2)