Skip to content

Commit

Permalink
[CI] Fix wheel builders (#25)
Browse files Browse the repository at this point in the history
* [CI] Fix wheel builders

* Remove unneeded files

* Use MacOS 10.15+

* Require Treelite 4.1.2

* Remove scheduled jobs
  • Loading branch information
hcho3 authored Mar 4, 2024
1 parent 4a1786e commit 73c3c2a
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 280 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/linux-wheel-builder.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: linux-wheel-builder

on:
pull_request:
push:
schedule:
- cron: "0 7 * * *" # Run once daily
on: [pull_request, push]

permissions:
contents: read # to fetch code (actions/checkout)
Expand All @@ -30,12 +26,14 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: 'true'
- uses: mamba-org/provision-with-micromamba@v14
- uses: mamba-org/setup-micromamba@v1.8.1
with:
micromamba-version: '1.5.6-0'
cache-downloads: true
cache-env: true
cache-environment: true
environment-name: dev
environment-file: ops/conda_env/dev.yml
init-shell: bash
- name: Display Conda env
run: |
conda info
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/macos-wheel-builder.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: macos-wheel-builder

on:
pull_request:
push:
schedule:
- cron: "0 7 * * *" # Run once daily
on: [pull_request, push]

permissions:
contents: read # to fetch code (actions/checkout)
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/misc-tests.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: misc-tests

on:
pull_request:
push:
schedule:
- cron: "0 7 * * *" # Run once daily
on: [pull_request, push]

permissions:
contents: read # to fetch code (actions/checkout)
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/windows-wheel-builder.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: windows-wheel-builder

on:
pull_request:
push:
schedule:
- cron: "0 7 * * *" # Run once daily
on: [push, pull_request]

permissions:
contents: read # to fetch code (actions/checkout)
Expand Down
5 changes: 3 additions & 2 deletions cmake/ExternalLibs.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
include(FetchContent)

# Treelite
find_package(Treelite 4.1.1)
set(TREELITE_VERSION 4.1.2)
find_package(Treelite ${TREELITE_VERSION})
if (Treelite_FOUND)
set(TREELITE_FROM_SYSTEM_ROOT TRUE)
set(TREELITE_LIB treelite::treelite)
Expand All @@ -10,7 +11,7 @@ else ()
FetchContent_Declare(
treelite
GIT_REPOSITORY https://github.com/dmlc/treelite.git
GIT_TAG 4.1.1
GIT_TAG ${TREELITE_VERSION}
)
set(Treelite_BUILD_STATIC_LIBS ON)
FetchContent_MakeAvailable(treelite)
Expand Down
15 changes: 8 additions & 7 deletions ops/build-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ set -euo pipefail

TAG=manylinux2014_x86_64

echo "##[section]Building TL2cgen..."
ops/docker/ci_build.sh cpu ops/scripts/build_via_cmake.sh
export CIBW_BUILD=cp38-manylinux_x86_64
export CIBW_ARCHS=x86_64
export CIBW_BUILD_VERBOSITY=3
export CIBW_MANYLINUX_X86_64_IMAGE=manylinux2014

echo "##[section]Packaging Python wheel for TL2cgen..."
ops/docker/ci_build.sh cpu bash -c "cd python/ && pip wheel --no-deps -v . --wheel-dir dist/"
ops/docker/ci_build.sh auditwheel_x86_64 auditwheel repair --only-plat --plat ${TAG} python/dist/*.whl
rm -v python/dist/*.whl
echo "##[section]Building Python wheel (amd64) for Treelite..."
python -m cibuildwheel python --output-dir wheelhouse
python ops/scripts/rename_whl.py wheelhouse ${COMMIT_ID} ${TAG}
mkdir -vp python/dist/
mv -v wheelhouse/*.whl python/dist/
ops/docker/ci_build.sh cpu python ops/scripts/rename_whl.py python/dist ${COMMIT_ID} ${TAG}
2 changes: 2 additions & 0 deletions ops/conda_env/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ dependencies:
- pip
- python-build
- treelite=4.1.1
- pip:
- cibuildwheel
15 changes: 0 additions & 15 deletions ops/docker/Dockerfile.auditwheel_x86_64

This file was deleted.

39 changes: 0 additions & 39 deletions ops/docker/Dockerfile.cpu

This file was deleted.

150 changes: 0 additions & 150 deletions ops/docker/ci_build.sh

This file was deleted.

43 changes: 0 additions & 43 deletions ops/docker/entrypoint.sh

This file was deleted.

2 changes: 1 addition & 1 deletion ops/scripts/build_macos_python_wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if [[ "$platform_id" == macosx_* ]]; then
# MacOS, Intel
wheel_tag=macosx_10_15_x86_64.macosx_11_0_x86_64.macosx_12_0_x86_64
cpython_ver=38
export MACOSX_DEPLOYMENT_TARGET=10.13
export MACOSX_DEPLOYMENT_TARGET=10.15
OPENMP_URL="https://anaconda.org/conda-forge/llvm-openmp/11.1.0/download/osx-64/llvm-openmp-11.1.0-hda6cdc1_1.tar.bz2"
else
echo "Platform not supported: $platform_id"
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"numpy",
"scipy",
"packaging",
"treelite>=4.1.1"
"treelite>=4.1.2"
]

[project.urls]
Expand Down

0 comments on commit 73c3c2a

Please sign in to comment.