From 67fb38ae61f2f9e2432f181f574b8f1f8fb6cad7 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Wed, 11 Jan 2023 10:34:05 -0500 Subject: [PATCH 1/3] CI Adds arm wheel build in cirrus CI --- build_tools/cirrus/arm_wheel.yml | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/build_tools/cirrus/arm_wheel.yml b/build_tools/cirrus/arm_wheel.yml index cc560aba719f2..06838b806089d 100644 --- a/build_tools/cirrus/arm_wheel.yml +++ b/build_tools/cirrus/arm_wheel.yml @@ -36,3 +36,39 @@ macos_arm64_wheel_task: wheels_artifacts: path: "wheelhouse/*" + +linux_arm64_wheel_task: + compute_engine_instance: + image_project: cirrus-images + image: family/docker-builder-arm64 + architecture: arm64 + platform: linux + cpu: 4 + memory: 4G + env: + CONFTEST_PATH: ${CIRRUS_WORKING_DIR}/conftest.py + CONFTEST_NAME: conftest.py + CIBW_ENVIRONMENT: OMP_NUM_THREADS=2 + OPENBLAS_NUM_THREADS=2 + SKLEARN_SKIP_NETWORK_TESTS=1 + SKLEARN_BUILD_PARALLEL=5 + CPU_COUNT=4 + CIBW_TEST_COMMAND: bash {project}/build_tools/github/test_wheels.sh + CIBW_TEST_REQUIRES: pytest pandas threadpoolctl pytest-xdist + CIBW_BUILD_VERBOSITY: 1 + matrix: + - env: + CIBW_BUILD: cp38-manylinux_aarch64 + - env: + CIBW_BUILD: cp39-manylinux_aarch64 + - env: + CIBW_BUILD: cp310-manylinux_aarch64 + - env: + CIBW_BUILD: cp311-manylinux_aarch64 + + cibuildwheel_script: + - apt install -y python3 python-is-python3 + - bash build_tools/github/build_wheels.sh + + wheels_artifacts: + path: "wheelhouse/*" From 1ca2550526530ae9639463a867095bd34c22e41f Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Wed, 11 Jan 2023 10:34:19 -0500 Subject: [PATCH 2/3] CI [cd build cirrus] From 127d3ef1eebb9184b2247e6d9772f4d13741cbe3 Mon Sep 17 00:00:00 2001 From: "Thomas J. Fan" Date: Wed, 11 Jan 2023 13:37:05 -0500 Subject: [PATCH 3/3] BLD Move files to common wheels folder [cd build gh] [cd build cirrus] --- .github/workflows/wheels.yml | 4 ++-- build_tools/cirrus/arm_wheel.yml | 8 ++++---- build_tools/{github => wheels}/build_wheels.sh | 0 build_tools/{github => wheels}/test_wheels.sh | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename build_tools/{github => wheels}/build_wheels.sh (100%) rename build_tools/{github => wheels}/test_wheels.sh (100%) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 59bd514b75fd4..b623e28d25979 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -142,12 +142,12 @@ jobs: CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: bash build_tools/github/repair_windows_wheels.sh {wheel} {dest_dir} CIBW_BEFORE_TEST_WINDOWS: bash build_tools/github/build_minimal_windows_image.sh ${{ matrix.python }} CIBW_TEST_REQUIRES: pytest pandas threadpoolctl - CIBW_TEST_COMMAND: bash {project}/build_tools/github/test_wheels.sh + CIBW_TEST_COMMAND: bash {project}/build_tools/wheels/test_wheels.sh CIBW_TEST_COMMAND_WINDOWS: bash {project}/build_tools/github/test_windows_wheels.sh ${{ matrix.python }} CIBW_BUILD_VERBOSITY: 1 CONDA_HOME: /usr/local/miniconda - run: bash build_tools/github/build_wheels.sh + run: bash build_tools/wheels/build_wheels.sh - name: Store artifacts uses: actions/upload-artifact@v3 diff --git a/build_tools/cirrus/arm_wheel.yml b/build_tools/cirrus/arm_wheel.yml index 06838b806089d..7e4f33f78116f 100644 --- a/build_tools/cirrus/arm_wheel.yml +++ b/build_tools/cirrus/arm_wheel.yml @@ -9,7 +9,7 @@ macos_arm64_wheel_task: SKLEARN_SKIP_NETWORK_TESTS=1 SKLEARN_BUILD_PARALLEL=5 CPU_COUNT=2 - CIBW_TEST_COMMAND: bash {project}/build_tools/github/test_wheels.sh + CIBW_TEST_COMMAND: bash {project}/build_tools/wheels/test_wheels.sh CIBW_TEST_REQUIRES: pytest pandas threadpoolctl pytest-xdist CIBW_BUILD_VERBOSITY: 1 PATH: $HOME/mambaforge/bin/:$PATH @@ -32,7 +32,7 @@ macos_arm64_wheel_task: - bash ~/mambaforge.sh -b -p ~/mambaforge cibuildwheel_script: - - bash build_tools/github/build_wheels.sh + - bash build_tools/wheels/build_wheels.sh wheels_artifacts: path: "wheelhouse/*" @@ -53,7 +53,7 @@ linux_arm64_wheel_task: SKLEARN_SKIP_NETWORK_TESTS=1 SKLEARN_BUILD_PARALLEL=5 CPU_COUNT=4 - CIBW_TEST_COMMAND: bash {project}/build_tools/github/test_wheels.sh + CIBW_TEST_COMMAND: bash {project}/build_tools/wheels/test_wheels.sh CIBW_TEST_REQUIRES: pytest pandas threadpoolctl pytest-xdist CIBW_BUILD_VERBOSITY: 1 matrix: @@ -68,7 +68,7 @@ linux_arm64_wheel_task: cibuildwheel_script: - apt install -y python3 python-is-python3 - - bash build_tools/github/build_wheels.sh + - bash build_tools/wheels/build_wheels.sh wheels_artifacts: path: "wheelhouse/*" diff --git a/build_tools/github/build_wheels.sh b/build_tools/wheels/build_wheels.sh similarity index 100% rename from build_tools/github/build_wheels.sh rename to build_tools/wheels/build_wheels.sh diff --git a/build_tools/github/test_wheels.sh b/build_tools/wheels/test_wheels.sh similarity index 100% rename from build_tools/github/test_wheels.sh rename to build_tools/wheels/test_wheels.sh