From c64a548ef1b0e60dfe5048153a70afb4e5705a3b Mon Sep 17 00:00:00 2001 From: Irv Lustig Date: Tue, 31 Dec 2019 12:04:44 -0500 Subject: [PATCH 1/5] BUG: Disable parallel cythonize on Windows (GH 30214) --- doc/source/whatsnew/v1.0.0.rst | 4 +++- setup.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index e8663853b7684..870e96c1bb352 100755 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -980,7 +980,9 @@ Other - Fixed :class:`IntegerArray` returning ``inf`` rather than ``NaN`` for operations dividing by 0 (:issue:`27398`) - Fixed ``pow`` operations for :class:`IntegerArray` when the other value is ``0`` or ``1`` (:issue:`29997`) - Bug in :meth:`Series.count` raises if use_inf_as_na is enabled (:issue:`29478`) -- Bug in :class:`Index` where a non-hashable name could be set without raising ``TypeError`` (:issue:29069`) +- Bug in :class:`Index` where a non-hashable name could be set without raising +``TypeError`` (:issue:`29069`) +- Disabled parallel cython builds on Windows (:issue:`30214`) .. _whatsnew_1000.contributors: diff --git a/setup.py b/setup.py index af70ee3b30095..02b76b31ba444 100755 --- a/setup.py +++ b/setup.py @@ -526,6 +526,10 @@ def maybe_cythonize(extensions, *args, **kwargs): elif parsed.j: nthreads = parsed.j + if is_platform_windows() and nthreads > 0: + print("Parallel build for cythonize ignored on Windows") + nthreads = 0 + kwargs["nthreads"] = nthreads build_ext.render_templates(_pxifiles) return cythonize(extensions, *args, **kwargs) From 34a5808260ac167bf5da3842728fcaf1a7538709 Mon Sep 17 00:00:00 2001 From: Irv Lustig Date: Tue, 31 Dec 2019 12:51:55 -0500 Subject: [PATCH 2/5] add blank line to whatsnew --- doc/source/whatsnew/v1.0.0.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 870e96c1bb352..22a771e013e72 100755 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -984,6 +984,7 @@ Other ``TypeError`` (:issue:`29069`) - Disabled parallel cython builds on Windows (:issue:`30214`) + .. _whatsnew_1000.contributors: Contributors From 428bf0e431e243d7a7eab20fe3c2725a5e631518 Mon Sep 17 00:00:00 2001 From: Irv Lustig Date: Tue, 31 Dec 2019 13:24:28 -0500 Subject: [PATCH 3/5] fix formatting in whatsnew --- doc/source/whatsnew/v1.0.0.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 22a771e013e72..5d62c436bf8bd 100755 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -980,8 +980,7 @@ Other - Fixed :class:`IntegerArray` returning ``inf`` rather than ``NaN`` for operations dividing by 0 (:issue:`27398`) - Fixed ``pow`` operations for :class:`IntegerArray` when the other value is ``0`` or ``1`` (:issue:`29997`) - Bug in :meth:`Series.count` raises if use_inf_as_na is enabled (:issue:`29478`) -- Bug in :class:`Index` where a non-hashable name could be set without raising -``TypeError`` (:issue:`29069`) +- Bug in :class:`Index` where a non-hashable name could be set without raising ``TypeError`` (:issue:`29069`) - Disabled parallel cython builds on Windows (:issue:`30214`) From 9f779f05a3194f3b3ec932890de9321d9b1b4d1a Mon Sep 17 00:00:00 2001 From: Irv Lustig Date: Tue, 31 Dec 2019 15:14:36 -0500 Subject: [PATCH 4/5] Add GH comment to code in setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 02b76b31ba444..489a9602511e8 100755 --- a/setup.py +++ b/setup.py @@ -526,6 +526,7 @@ def maybe_cythonize(extensions, *args, **kwargs): elif parsed.j: nthreads = parsed.j + # GH#30356 Cythonize doesn't support parallel on Windows if is_platform_windows() and nthreads > 0: print("Parallel build for cythonize ignored on Windows") nthreads = 0 From aaeb597c77410b72306a86a302b24580f08226bb Mon Sep 17 00:00:00 2001 From: Irv Lustig Date: Tue, 31 Dec 2019 16:21:30 -0500 Subject: [PATCH 5/5] put in -j 4 in Windows CI. Don't document change in whatsnew --- ci/azure/windows.yml | 2 +- doc/source/whatsnew/v1.0.0.rst | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 03529bd6569c6..187a5db99802f 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -34,7 +34,7 @@ jobs: - bash: | source activate pandas-dev conda list - python setup.py build_ext -q -i + python setup.py build_ext -q -i -j 4 python -m pip install --no-build-isolation -e . displayName: 'Build' diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 5d62c436bf8bd..acf798ccfce99 100755 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -981,7 +981,6 @@ Other - Fixed ``pow`` operations for :class:`IntegerArray` when the other value is ``0`` or ``1`` (:issue:`29997`) - Bug in :meth:`Series.count` raises if use_inf_as_na is enabled (:issue:`29478`) - Bug in :class:`Index` where a non-hashable name could be set without raising ``TypeError`` (:issue:`29069`) -- Disabled parallel cython builds on Windows (:issue:`30214`) .. _whatsnew_1000.contributors: