From 952770554e570f119b7338e03e89307295161a64 Mon Sep 17 00:00:00 2001 From: "Sean Yen [MSFT]" Date: Thu, 2 Aug 2018 17:47:45 -0700 Subject: [PATCH 1/3] Update packages.py --- src/catkin_pkg/packages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/catkin_pkg/packages.py b/src/catkin_pkg/packages.py index 9779f6fd..0d4329d0 100644 --- a/src/catkin_pkg/packages.py +++ b/src/catkin_pkg/packages.py @@ -133,7 +133,7 @@ def find_packages_allowing_duplicates(basepath, exclude_paths=None, exclude_subs if not data: return {} - parallel = len(data) > 100 + parallel = len(data) > 9999 if parallel: try: pool = multiprocessing.Pool() From 2ece2e770702f1f8ac2bfbf8f4d4d3e6d310a577 Mon Sep 17 00:00:00 2001 From: Stuart Schaefer Date: Tue, 21 Aug 2018 11:14:41 -0700 Subject: [PATCH 2/3] Prevent catkin find_packages from parallelizing on Windows. --- src/catkin_pkg/packages.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/catkin_pkg/packages.py b/src/catkin_pkg/packages.py index 0d4329d0..dee78d56 100644 --- a/src/catkin_pkg/packages.py +++ b/src/catkin_pkg/packages.py @@ -34,6 +34,7 @@ import multiprocessing import os +import sys from .package import _get_package_xml from .package import PACKAGE_MANIFEST_FILENAME @@ -133,7 +134,7 @@ def find_packages_allowing_duplicates(basepath, exclude_paths=None, exclude_subs if not data: return {} - parallel = len(data) > 9999 + parallel = False if sys.platform == 'win32' else len(data) > 100 if parallel: try: pool = multiprocessing.Pool() From f911f74d3b5b5d66a1be7173a1a9d4adc31cd6de Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Tue, 5 Feb 2019 10:12:14 -0800 Subject: [PATCH 3/3] invert the logic for readability --- src/catkin_pkg/packages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/catkin_pkg/packages.py b/src/catkin_pkg/packages.py index dee78d56..059bf024 100644 --- a/src/catkin_pkg/packages.py +++ b/src/catkin_pkg/packages.py @@ -134,7 +134,7 @@ def find_packages_allowing_duplicates(basepath, exclude_paths=None, exclude_subs if not data: return {} - parallel = False if sys.platform == 'win32' else len(data) > 100 + parallel = len(data) > 100 if sys.platform != 'win32' else False if parallel: try: pool = multiprocessing.Pool()