From d40c67110f2f1fca4804eb5e25ca4a07cfdbb136 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 25 Jan 2022 14:14:32 -0500 Subject: [PATCH 01/10] MAINT Fix check_scalar error in trees --- sklearn/tree/_classes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/tree/_classes.py b/sklearn/tree/_classes.py index b8eae3975e09d..533bf750da54d 100644 --- a/sklearn/tree/_classes.py +++ b/sklearn/tree/_classes.py @@ -253,7 +253,7 @@ def fit(self, X, y, sample_weight=None, check_input=True): name="min_samples_leaf", target_type=numbers.Real, min_val=0.0, - include_boundaries="right", + include_boundaries="neither", ) min_samples_leaf = int(ceil(self.min_samples_leaf * n_samples)) From 259325a8da6eb48ec856b3164efbacf5e86e3a13 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 25 Jan 2022 15:49:14 -0500 Subject: [PATCH 02/10] CI trigger From 35016328cb372dff43325c1b3848bd3bd5ed8651 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 25 Jan 2022 20:15:22 -0500 Subject: [PATCH 03/10] CI Disable parallel --- build_tools/azure/posix-docker.yml | 2 +- build_tools/azure/posix.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/azure/posix-docker.yml b/build_tools/azure/posix-docker.yml index f31fa9d38c777..d514690baf15e 100644 --- a/build_tools/azure/posix-docker.yml +++ b/build_tools/azure/posix-docker.yml @@ -27,7 +27,7 @@ jobs: PILLOW_VERSION: 'latest' MATPLOTLIB_VERSION: 'latest' PYTEST_VERSION: 'latest' - PYTEST_XDIST_VERSION: 'latest' + PYTEST_XDIST_VERSION: 'none' THREADPOOLCTL_VERSION: 'latest' COVERAGE: 'false' TEST_DOCSTRINGS: 'false' diff --git a/build_tools/azure/posix.yml b/build_tools/azure/posix.yml index c77c6e5b9f5dc..a21085062453e 100644 --- a/build_tools/azure/posix.yml +++ b/build_tools/azure/posix.yml @@ -31,7 +31,7 @@ jobs: PILLOW_VERSION: 'latest' MATPLOTLIB_VERSION: 'latest' PYTEST_VERSION: 'latest' - PYTEST_XDIST_VERSION: 'latest' + PYTEST_XDIST_VERSION: 'none' THREADPOOLCTL_VERSION: 'latest' COVERAGE: 'true' TEST_DOCSTRINGS: 'false' From d43138843fa874decf3c4c0bc2072cdd43aad8fc Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 25 Jan 2022 20:49:37 -0500 Subject: [PATCH 04/10] CI Disable parallel only for instances that stalled --- azure-pipelines.yml | 4 ++++ build_tools/azure/posix-docker.yml | 2 +- build_tools/azure/posix.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e42dd52b3c579..b0ad89d339f0f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -102,6 +102,7 @@ jobs: DISTRIB: 'conda' CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '*' + PYTEST_XDIST_VERSION: 'none' BLAS: 'mkl' COVERAGE: 'false' BUILD_WITH_ICC: 'true' @@ -199,6 +200,7 @@ jobs: NUMPY_VERSION: 'min' SCIPY_VERSION: 'min' MATPLOTLIB_VERSION: 'min' + PYTEST_XDIST_VERSION: 'none' THREADPOOLCTL_VERSION: '2.2.0' SKLEARN_ENABLE_DEBUG_CYTHON_DIRECTIVES: '1' # Linux environment to test the latest available dependencies. @@ -206,6 +208,7 @@ jobs: pylatest_pip_openblas_pandas: DISTRIB: 'conda-pip-latest' PYTHON_VERSION: '3.9' + PYTEST_XDIST_VERSION: 'none' CHECK_PYTEST_SOFT_DEPENDENCY: 'true' TEST_DOCSTRINGS: 'true' CHECK_WARNINGS: 'true' @@ -248,6 +251,7 @@ jobs: BLAS: 'mkl' CONDA_CHANNEL: 'conda-forge' CPU_COUNT: '3' + PYTEST_XDIST_VERSION: 'none' pylatest_conda_mkl_no_openmp: DISTRIB: 'conda' BLAS: 'mkl' diff --git a/build_tools/azure/posix-docker.yml b/build_tools/azure/posix-docker.yml index d514690baf15e..f31fa9d38c777 100644 --- a/build_tools/azure/posix-docker.yml +++ b/build_tools/azure/posix-docker.yml @@ -27,7 +27,7 @@ jobs: PILLOW_VERSION: 'latest' MATPLOTLIB_VERSION: 'latest' PYTEST_VERSION: 'latest' - PYTEST_XDIST_VERSION: 'none' + PYTEST_XDIST_VERSION: 'latest' THREADPOOLCTL_VERSION: 'latest' COVERAGE: 'false' TEST_DOCSTRINGS: 'false' diff --git a/build_tools/azure/posix.yml b/build_tools/azure/posix.yml index a21085062453e..c77c6e5b9f5dc 100644 --- a/build_tools/azure/posix.yml +++ b/build_tools/azure/posix.yml @@ -31,7 +31,7 @@ jobs: PILLOW_VERSION: 'latest' MATPLOTLIB_VERSION: 'latest' PYTEST_VERSION: 'latest' - PYTEST_XDIST_VERSION: 'none' + PYTEST_XDIST_VERSION: 'latest' THREADPOOLCTL_VERSION: 'latest' COVERAGE: 'true' TEST_DOCSTRINGS: 'false' From 4f988d8911465a68a835178e257d98f5957009a2 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Tue, 25 Jan 2022 21:45:18 -0500 Subject: [PATCH 05/10] CI Disable parallel only for instances that stalled --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b0ad89d339f0f..ec9bf981dce4c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -148,6 +148,7 @@ jobs: BLAS: 'mkl' COVERAGE: 'true' SHOW_SHORT_SUMMARY: 'true' + PYTEST_XDIST_VERSION: 'none' # Check compilation with Ubuntu bionic 18.04 LTS and scipy from conda-forge - template: build_tools/azure/posix.yml @@ -258,6 +259,7 @@ jobs: SKLEARN_TEST_NO_OPENMP: 'true' SKLEARN_SKIP_OPENMP_TEST: 'true' CPU_COUNT: '3' + PYTEST_XDIST_VERSION: 'none' - template: build_tools/azure/windows.yml parameters: From 0ba03c9bb2a9c2963c10fa8847dfce7fd61b98b1 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Wed, 26 Jan 2022 15:02:27 +0100 Subject: [PATCH 06/10] revert not using pytest-xdist --- azure-pipelines.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ec9bf981dce4c..e42dd52b3c579 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -102,7 +102,6 @@ jobs: DISTRIB: 'conda' CONDA_CHANNEL: 'conda-forge' PYTHON_VERSION: '*' - PYTEST_XDIST_VERSION: 'none' BLAS: 'mkl' COVERAGE: 'false' BUILD_WITH_ICC: 'true' @@ -148,7 +147,6 @@ jobs: BLAS: 'mkl' COVERAGE: 'true' SHOW_SHORT_SUMMARY: 'true' - PYTEST_XDIST_VERSION: 'none' # Check compilation with Ubuntu bionic 18.04 LTS and scipy from conda-forge - template: build_tools/azure/posix.yml @@ -201,7 +199,6 @@ jobs: NUMPY_VERSION: 'min' SCIPY_VERSION: 'min' MATPLOTLIB_VERSION: 'min' - PYTEST_XDIST_VERSION: 'none' THREADPOOLCTL_VERSION: '2.2.0' SKLEARN_ENABLE_DEBUG_CYTHON_DIRECTIVES: '1' # Linux environment to test the latest available dependencies. @@ -209,7 +206,6 @@ jobs: pylatest_pip_openblas_pandas: DISTRIB: 'conda-pip-latest' PYTHON_VERSION: '3.9' - PYTEST_XDIST_VERSION: 'none' CHECK_PYTEST_SOFT_DEPENDENCY: 'true' TEST_DOCSTRINGS: 'true' CHECK_WARNINGS: 'true' @@ -252,14 +248,12 @@ jobs: BLAS: 'mkl' CONDA_CHANNEL: 'conda-forge' CPU_COUNT: '3' - PYTEST_XDIST_VERSION: 'none' pylatest_conda_mkl_no_openmp: DISTRIB: 'conda' BLAS: 'mkl' SKLEARN_TEST_NO_OPENMP: 'true' SKLEARN_SKIP_OPENMP_TEST: 'true' CPU_COUNT: '3' - PYTEST_XDIST_VERSION: 'none' - template: build_tools/azure/windows.yml parameters: From cd50dfcdd9da8c28b486675a0b111aa6baa82678 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Wed, 26 Jan 2022 10:45:33 -0500 Subject: [PATCH 07/10] CI Disable pytest-xdist everywhere --- azure-pipelines.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e42dd52b3c579..eb2f0faf9af47 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,6 +7,10 @@ schedules: - main always: true +# Disable pytest-xdist as it can stall builds +variables: + PYTEST_XDIST_VERSION: "none" + jobs: - job: git_commit displayName: Get Git Commit From 682812f5edd6ca2b7a78d95e40122191a42104a8 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 26 Jan 2022 18:07:24 +0100 Subject: [PATCH 08/10] Enable verbose pytest --- build_tools/azure/test_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh index bfcba5d8e461a..0fa0ebcc7e8cd 100755 --- a/build_tools/azure/test_script.sh +++ b/build_tools/azure/test_script.sh @@ -52,5 +52,5 @@ if [[ "$SHOW_SHORT_SUMMARY" == "true" ]]; then fi set -x -eval "$TEST_CMD --pyargs sklearn" +eval "$TEST_CMD -v --pyargs sklearn" set +x From a202bab867fcbd1f31d08eb10f3fd4e450bc2144 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 26 Jan 2022 18:25:12 +0100 Subject: [PATCH 09/10] PYTEST_XDIST_VERSION is overriden in yaml templates --- azure-pipelines.yml | 4 ---- build_tools/azure/posix.yml | 3 ++- build_tools/azure/windows.yml | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb2f0faf9af47..e42dd52b3c579 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,10 +7,6 @@ schedules: - main always: true -# Disable pytest-xdist as it can stall builds -variables: - PYTEST_XDIST_VERSION: "none" - jobs: - job: git_commit displayName: Get Git Commit diff --git a/build_tools/azure/posix.yml b/build_tools/azure/posix.yml index c77c6e5b9f5dc..21d1371da1bd2 100644 --- a/build_tools/azure/posix.yml +++ b/build_tools/azure/posix.yml @@ -31,7 +31,8 @@ jobs: PILLOW_VERSION: 'latest' MATPLOTLIB_VERSION: 'latest' PYTEST_VERSION: 'latest' - PYTEST_XDIST_VERSION: 'latest' + # Disable pytest-xdist as it can stall builds + PYTEST_XDIST_VERSION: 'none' THREADPOOLCTL_VERSION: 'latest' COVERAGE: 'true' TEST_DOCSTRINGS: 'false' diff --git a/build_tools/azure/windows.yml b/build_tools/azure/windows.yml index 795ac391343df..f5cedae7fa060 100644 --- a/build_tools/azure/windows.yml +++ b/build_tools/azure/windows.yml @@ -17,8 +17,8 @@ jobs: JUNITXML: 'test-data.xml' SKLEARN_SKIP_NETWORK_TESTS: '1' PYTEST_VERSION: '5.2.1' - PYTEST_XDIST: 'true' - PYTEST_XDIST_VERSION: 'latest' + # Disable pytest-xdist as it can stall builds + PYTEST_XDIST_VERSION: 'none' TEST_DIR: '$(Agent.WorkFolder)/tmp_folder' SHOW_SHORT_SUMMARY: 'false' CPU_COUNT: '2' From d55e2489f8ef45c53a7c6f828c3079344d7efcd9 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Wed, 26 Jan 2022 19:15:12 +0100 Subject: [PATCH 10/10] Apply suggestions from code review --- build_tools/azure/test_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh index 0fa0ebcc7e8cd..bfcba5d8e461a 100755 --- a/build_tools/azure/test_script.sh +++ b/build_tools/azure/test_script.sh @@ -52,5 +52,5 @@ if [[ "$SHOW_SHORT_SUMMARY" == "true" ]]; then fi set -x -eval "$TEST_CMD -v --pyargs sklearn" +eval "$TEST_CMD --pyargs sklearn" set +x