From da70beb846dc5bc235643684b1b6176585dd094a Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Fri, 1 Nov 2024 12:57:20 -0700 Subject: [PATCH] Fix missing includes (#591) * Fix missing includes * Use a different emulator for aarch64 * Remove deprecate Mambaforge * Specify platform flag for Docker --- .github/workflows/coverage-tests.yml | 6 +++--- .github/workflows/linux-wheel-builder.yml | 9 ++++++--- .github/workflows/macos-wheel-builder.yml | 2 +- .github/workflows/misc-tests.yml | 8 ++++---- .github/workflows/windows-wheel-builder.yml | 2 +- include/treelite/model_loader.h | 1 + ops/build-cpack.sh | 3 +-- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/coverage-tests.yml b/.github/workflows/coverage-tests.yml index cd1937ca..f5d67015 100644 --- a/.github/workflows/coverage-tests.yml +++ b/.github/workflows/coverage-tests.yml @@ -30,7 +30,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml @@ -51,7 +51,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml @@ -74,7 +74,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml diff --git a/.github/workflows/linux-wheel-builder.yml b/.github/workflows/linux-wheel-builder.yml index a6b6fc8f..4fbd1f21 100644 --- a/.github/workflows/linux-wheel-builder.yml +++ b/.github/workflows/linux-wheel-builder.yml @@ -32,7 +32,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml @@ -56,7 +56,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml @@ -81,11 +81,14 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml use-mamba: true + - uses: dbhi/qus/action@main + with: + targets: aarch64 - name: Build CPack run: | bash ops/build-cpack.sh diff --git a/.github/workflows/macos-wheel-builder.yml b/.github/workflows/macos-wheel-builder.yml index fc8b2a23..fe47dd6a 100644 --- a/.github/workflows/macos-wheel-builder.yml +++ b/.github/workflows/macos-wheel-builder.yml @@ -38,7 +38,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml diff --git a/.github/workflows/misc-tests.yml b/.github/workflows/misc-tests.yml index b3cd5d4a..eea4a594 100644 --- a/.github/workflows/misc-tests.yml +++ b/.github/workflows/misc-tests.yml @@ -31,7 +31,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml @@ -56,7 +56,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml @@ -81,7 +81,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml @@ -102,7 +102,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml diff --git a/.github/workflows/windows-wheel-builder.yml b/.github/workflows/windows-wheel-builder.yml index 3905559a..42532078 100644 --- a/.github/workflows/windows-wheel-builder.yml +++ b/.github/workflows/windows-wheel-builder.yml @@ -32,7 +32,7 @@ jobs: submodules: 'true' - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: dev environment-file: ops/conda_env/dev.yml diff --git a/include/treelite/model_loader.h b/include/treelite/model_loader.h index c8a87afa..f58cb188 100644 --- a/include/treelite/model_loader.h +++ b/include/treelite/model_loader.h @@ -8,6 +8,7 @@ #define TREELITE_MODEL_LOADER_H_ #include +#include #include #include #include diff --git a/ops/build-cpack.sh b/ops/build-cpack.sh index 99902713..c369031c 100755 --- a/ops/build-cpack.sh +++ b/ops/build-cpack.sh @@ -18,11 +18,10 @@ python -m awscli s3 cp build/*.tar.gz s3://treelite-cpack/ --acl public-read --r rm -rf build/ echo "##[section] Building Treelite for aarch64..." -docker run --rm --privileged multiarch/qemu-user-static --reset -p yes +export DOCKER_DEFAULT_PLATFORM=linux/arm64/v8 tests/ci_build/ci_build.sh ubuntu20_aarch64 tests/ci_build/build_via_cmake.sh echo "##[section] Packing CPack for aarch64..." -docker run --rm --privileged multiarch/qemu-user-static --reset -p yes tests/ci_build/ci_build.sh ubuntu20_aarch64 bash -c "cd build/ && cpack -G TGZ" for tgz in build/treelite-*-Linux.tar.gz do