From a954ebe1c74160917e0a3e78442f7b130b3ceeb3 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Thu, 13 Oct 2022 06:12:52 -0400 Subject: [PATCH] CI Remove Windows 32 bit support (#24627) --- .github/workflows/wheels.yml | 10 ---- azure-pipelines.yml | 6 --- .../azure/py38_pip_openblas_32bit_lock.txt | 49 ------------------- .../py38_pip_openblas_32bit_requirements.txt | 12 ----- build_tools/azure/test_script.sh | 2 - build_tools/github/test_windows_wheels.sh | 26 ++++------ .../update_environments_and_lock_files.py | 19 ------- 7 files changed, 9 insertions(+), 115 deletions(-) delete mode 100644 build_tools/azure/py38_pip_openblas_32bit_lock.txt delete mode 100644 build_tools/azure/py38_pip_openblas_32bit_requirements.txt diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e544ce0a83f1e..3281f50883b85 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -64,16 +64,6 @@ jobs: python: 311 platform_id: win_amd64 - # Window 32 bit - - os: windows-latest - python: 38 - bitness: 32 - platform_id: win32 - - os: windows-latest - python: 39 - bitness: 32 - platform_id: win32 - # Linux 64 bit manylinux2014 - os: ubuntu-latest python: 38 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1c9339308a45a..06008e3bd5dac 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -279,9 +279,3 @@ jobs: CHECK_WARNINGS: 'true' COVERAGE: 'true' SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '7' # non-default seed - py38_pip_openblas_32bit: - DISTRIB: 'pip-windows' - PYTHON_VERSION: '3.8' - PYTHON_ARCH: '32' - LOCK_FILE: ./build_tools/azure/py38_pip_openblas_32bit_lock.txt - SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '8' # non-default seed diff --git a/build_tools/azure/py38_pip_openblas_32bit_lock.txt b/build_tools/azure/py38_pip_openblas_32bit_lock.txt deleted file mode 100644 index 17742a9720212..0000000000000 --- a/build_tools/azure/py38_pip_openblas_32bit_lock.txt +++ /dev/null @@ -1,49 +0,0 @@ -# -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: -# -# pip-compile --output-file=build_tools/azure/py38_pip_openblas_32bit_lock.txt build_tools/azure/py38_pip_openblas_32bit_requirements.txt -# -attrs==21.4.0 - # via pytest -cython==0.29.30 - # via -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt -execnet==1.9.0 - # via pytest-xdist -iniconfig==1.1.1 - # via pytest -joblib==1.1.0 - # via -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt -numpy==1.23.1 - # via - # -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt - # scipy -packaging==21.3 - # via pytest -pillow==9.2.0 - # via -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt -pluggy==1.0.0 - # via pytest -py==1.11.0 - # via - # pytest - # pytest-forked -pyparsing==3.0.9 - # via packaging -pytest==7.1.2 - # via - # -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt - # pytest-forked - # pytest-xdist -pytest-forked==1.4.0 - # via pytest-xdist -pytest-xdist==2.5.0 - # via -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt -scipy==1.8.1 - # via -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt -threadpoolctl==3.1.0 - # via -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt -tomli==2.0.1 - # via pytest -wheel==0.37.1 - # via -r build_tools/azure/py38_pip_openblas_32bit_requirements.txt diff --git a/build_tools/azure/py38_pip_openblas_32bit_requirements.txt b/build_tools/azure/py38_pip_openblas_32bit_requirements.txt deleted file mode 100644 index fb1b4ef7b1c63..0000000000000 --- a/build_tools/azure/py38_pip_openblas_32bit_requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT EDIT: this file is generated from the specification found in the -# following script to centralize the configuration for CI builds: -# build_tools/update_environments_and_lock_files.py -numpy -scipy -cython -joblib -threadpoolctl -pytest -pytest-xdist -pillow -wheel diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh index 3749434b1eb4a..ae5a80cb5770d 100755 --- a/build_tools/azure/test_script.sh +++ b/build_tools/azure/test_script.sh @@ -9,8 +9,6 @@ if [[ "$DISTRIB" =~ ^conda.* ]]; then source activate $VIRTUALENV elif [[ "$DISTRIB" == "ubuntu" || "$DISTRIB" == "debian-32" || "$DISTRIB" == "pip-nogil" ]]; then source $VIRTUALENV/bin/activate -elif [[ "$DISTRIB" == "pip-windows" ]]; then - source $VIRTUALENV/Scripts/activate fi if [[ "$BUILD_WITH_ICC" == "true" ]]; then diff --git a/build_tools/github/test_windows_wheels.sh b/build_tools/github/test_windows_wheels.sh index 4a22c4b9a13e3..43a1a283e652c 100755 --- a/build_tools/github/test_windows_wheels.sh +++ b/build_tools/github/test_windows_wheels.sh @@ -5,21 +5,13 @@ set -x PYTHON_VERSION=$1 -if [[ "$BITNESS" == "32" ]]; then - # 32-bit architectures use the regular - # test command (outside of the minimal Docker container) - cp $CONFTEST_PATH $CONFTEST_NAME - python -c "import sklearn; sklearn.show_versions()" - pytest --pyargs sklearn -else - docker container run \ - --rm scikit-learn/minimal-windows \ - powershell -Command "python -c 'import sklearn; sklearn.show_versions()'" +docker container run \ + --rm scikit-learn/minimal-windows \ + powershell -Command "python -c 'import sklearn; sklearn.show_versions()'" - docker container run \ - -e SKLEARN_SKIP_NETWORK_TESTS=1 \ - -e OMP_NUM_THREADS=2 \ - -e OPENBLAS_NUM_THREADS=2 \ - --rm scikit-learn/minimal-windows \ - powershell -Command "pytest --pyargs sklearn" -fi +docker container run \ + -e SKLEARN_SKIP_NETWORK_TESTS=1 \ + -e OMP_NUM_THREADS=2 \ + -e OPENBLAS_NUM_THREADS=2 \ + --rm scikit-learn/minimal-windows \ + powershell -Command "pytest --pyargs sklearn" diff --git a/build_tools/update_environments_and_lock_files.py b/build_tools/update_environments_and_lock_files.py index be44ac6983309..6a508861c19b4 100644 --- a/build_tools/update_environments_and_lock_files.py +++ b/build_tools/update_environments_and_lock_files.py @@ -314,25 +314,6 @@ def remove_from(alist, to_remove): # pip-compile "python_version": "3.8.5", }, - { - "build_name": "py38_pip_openblas_32bit", - "folder": "build_tools/azure", - "pip_dependencies": [ - "numpy", - "scipy", - "cython", - "joblib", - "threadpoolctl", - "pytest", - "pytest-xdist", - "pillow", - "wheel", - ], - # The Windows 32bit build use 3.8.10. No cross-compilation support for - # pip-compile, we are going to assume the pip lock file on a Linux - # 64bit machine gives appropriate versions - "python_version": "3.8.10", - }, ]