Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI Remove Windows 32 bit support #24627

Merged
merged 6 commits into from Oct 13, 2022
Merged

CI Remove Windows 32 bit support #24627

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b6a0d8
FIX Prefer binary when building scikit-learn wheels
thomasjpfan Oct 10, 2022
aaa1599
DOC Adds comment about PIP_PREFER_BINARY [cd build gh]
thomasjpfan Oct 10, 2022
8426edd
Merge remote-tracking branch 'upstream/main' into prefer_binary
thomasjpfan Oct 11, 2022
7de0c76
BLD Remove 32bit window wheels
thomasjpfan Oct 11, 2022
9bd5fc7
CI Remove windows 32bit testing
thomasjpfan Oct 12, 2022
6cd8b03
CLN Removes configuration that generate windows 32 lock files
thomasjpfan Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/workflows/wheels.yml
View file
Open in desktop
Expand Up @@ -68,16 +68,6 @@ jobs:
bitness: 64
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
Expand Down
6 changes: 0 additions & 6 deletions azure-pipelines.yml
View file
Open in desktop
Expand Up @@ -280,9 +280,3 @@ jobs:
COVERAGE: 'true'
SKLEARN_ENABLE_DEBUG_CYTHON_DIRECTIVES: '1'
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
ogrisel marked this conversation as resolved.
Show resolved Hide resolved
SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '8' # non-default seed
2 changes: 0 additions & 2 deletions build_tools/azure/test_script.sh
View file
Open in desktop
Expand Up @@ -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
Expand Down
26 changes: 9 additions & 17 deletions build_tools/github/test_windows_wheels.sh
View file
Open in desktop
Expand Up @@ -6,21 +6,13 @@ set -x
PYTHON_VERSION=$1
BITNESS=$2

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"