From 05b644c3b566b4b718d26ca872ba1580526b6ac4 Mon Sep 17 00:00:00 2001 From: Camille Scott Date: Fri, 24 Oct 2014 10:20:23 -0400 Subject: [PATCH 1/4] Fix type of threading arg in do-paritioning --- scripts/do-partition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/do-partition.py b/scripts/do-partition.py index 3379cb559a..e0a0376926 100755 --- a/scripts/do-partition.py +++ b/scripts/do-partition.py @@ -89,7 +89,7 @@ def get_parser(): parser.add_argument('--no-big-traverse', dest='no_big_traverse', action='store_true', default=False, help='Truncate graph joins at big traversals') - parser.add_argument('--threads', '-T', dest='n_threads', + parser.add_argument('--threads', '-T', dest='n_threads', type=int, default=DEFAULT_N_THREADS, help='Number of simultaneous threads to execute') parser.add_argument('--keep-subsets', dest='remove_subsets', From c7db3dd291d7d0433b46c6ca2b6209c55825c385 Mon Sep 17 00:00:00 2001 From: Camille Scott Date: Fri, 24 Oct 2014 10:42:48 -0400 Subject: [PATCH 2/4] Add assert for active_threads() to do-partition --- scripts/do-partition.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/do-partition.py b/scripts/do-partition.py index e0a0376926..a1d3e19d41 100755 --- a/scripts/do-partition.py +++ b/scripts/do-partition.py @@ -186,6 +186,8 @@ def main(): # pylint: disable=too-many-locals,too-many-statements threads.append(cur_thread) cur_thread.start() + assert threading.active_count() == args.n_threads+1 + print 'done starting threads' # wait for threads From 85ae2bed632e8d33648c95cb08a80ee3629cc416 Mon Sep 17 00:00:00 2001 From: Camille Scott Date: Fri, 24 Oct 2014 10:50:58 -0400 Subject: [PATCH 3/4] Update ChangeLog --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index ffb19a05d9..b0643d7553 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-10-24 Camille Scott + + * do-partition.py: Add type=int to n_threads arg and assert to check + number of active threads + 2014-10-06 Michael R. Crusoe * Doxyfile.in: add links to the stdc++ docs From 3997ebf78b18ba8ad7f5551ea3ecf3d035db8cde Mon Sep 17 00:00:00 2001 From: Camille Scott Date: Fri, 24 Oct 2014 13:47:56 -0400 Subject: [PATCH 4/4] Update ChangeLog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b0643d7553..9b68820100 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2014-10-24 Camille Scott +2014-10-24 Camille Scott * do-partition.py: Add type=int to n_threads arg and assert to check number of active threads