diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6412606..f40369f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,13 +5,9 @@ jobs: - job: linux pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy: - CONFIG: linux_64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython: CONFIG: linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython UPLOAD_PACKAGES: 'True' @@ -32,10 +28,6 @@ jobs: CONFIG: linux_64_c_compiler_version7cxx_compiler_version7python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy: - CONFIG: linux_64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_c_compiler_version9cxx_compiler_version9python3.6.____cpython: CONFIG: linux_64_c_compiler_version9cxx_compiler_version9python3.6.____cpython UPLOAD_PACKAGES: 'True' @@ -56,10 +48,6 @@ jobs: CONFIG: linux_64_c_compiler_version9cxx_compiler_version9python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy: - CONFIG: linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____cpython: CONFIG: linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____cpython UPLOAD_PACKAGES: 'True' @@ -80,10 +68,6 @@ jobs: CONFIG: linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy: - CONFIG: linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____cpython: CONFIG: linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 9b237b8..c01d76d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,9 +8,6 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_python3.6.____73_pypy: - CONFIG: osx_64_python3.6.____73_pypy - UPLOAD_PACKAGES: 'True' osx_64_python3.6.____cpython: CONFIG: osx_64_python3.6.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml b/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml deleted file mode 100644 index f7cfff3..0000000 --- a/.ci_support/linux_64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -fmt: -- '7' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image diff --git a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml b/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml deleted file mode 100644 index 6620a93..0000000 --- a/.ci_support/linux_64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -fmt: -- '7' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml b/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml deleted file mode 100644 index 7425ff4..0000000 --- a/.ci_support/linux_aarch64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml +++ /dev/null @@ -1,33 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -fmt: -- '7' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_73_pypy -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml b/.ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml deleted file mode 100644 index efcbec3..0000000 --- a/.ci_support/linux_aarch64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml +++ /dev/null @@ -1,33 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -fmt: -- '7' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_73_pypy -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml b/.ci_support/linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml deleted file mode 100644 index 2a5b5d9..0000000 --- a/.ci_support/linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '7' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -fmt: -- '7' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_73_pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml b/.ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml deleted file mode 100644 index 8eb4c02..0000000 --- a/.ci_support/linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -fmt: -- '7' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_73_pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/migrations/pypy.yaml b/.ci_support/migrations/pypy.yaml deleted file mode 100644 index fd87557..0000000 --- a/.ci_support/migrations/pypy.yaml +++ /dev/null @@ -1,46 +0,0 @@ -migrator_ts: 1580746218 # The timestamp of when the migration was made -__migrator: - kind: - version - exclude: - - c_compiler - - vc - - cxx_compiler - - cuda_compiler_version - - docker_image - migration_number: # Only use this if the bot messes up, putting this in will cause a complete rerun of the migration - 1 - bump_number: 1 # Hashes changed for cpython, so it's better to bump build numbers. - # do not use mamba to check if the issued PRs are solvable - check_solvable: false - -python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.6.* *_73_pypy # [not win64] - -numpy: - - 1.14 # [not (aarch64 or ppc64le)] - - 1.14 # [not (aarch64 or ppc64le)] - - 1.14 # [not (aarch64 or ppc64le)] - - 1.16 # [aarch64 or ppc64le] - - 1.16 # [aarch64 or ppc64le] - - 1.16 # [aarch64 or ppc64le] - - 1.18 # [not win64] - -python_impl: - - cpython - - cpython - - cpython - - pypy # [not win64] - - -zip_keys: - - - - python - - numpy - - python_impl - - # [linux64] - - cuda_compiler_version # [linux64] - - docker_image # [linux64] diff --git a/.ci_support/osx_64_python3.6.____73_pypy.yaml b/.ci_support/osx_64_python3.6.____73_pypy.yaml deleted file mode 100644 index 414a802..0000000 --- a/.ci_support/osx_64_python3.6.____73_pypy.yaml +++ /dev/null @@ -1,29 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -fmt: -- '7' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_73_pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.drone.yml b/.drone.yml index 92aa0af..5078716 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,34 +1,3 @@ ---- -kind: pipeline -name: linux_aarch64_c_compiler_version7cx_h17a3301759 - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - --- kind: pipeline name: linux_aarch64_c_compiler_version7cx_h3ef33b76aa @@ -184,37 +153,6 @@ steps: - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - echo "Done building" ---- -kind: pipeline -name: linux_aarch64_c_compiler_version9cx_h925985a2ed - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - --- kind: pipeline name: linux_aarch64_c_compiler_version9cx_h7477737bae diff --git a/README.md b/README.md index ffab24f..1649fa1 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,6 @@ Current build status - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy - - variant - -
linux_64_c_compiler_version7cxx_compiler_version7python3.6.____cpython @@ -81,13 +74,6 @@ Current build status variant
linux_64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy - - variant - -
linux_64_c_compiler_version9cxx_compiler_version9python3.6.____cpython @@ -123,13 +109,6 @@ Current build status variant
linux_aarch64_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy - - variant - -
linux_aarch64_c_compiler_version7cxx_compiler_version7python3.6.____cpython @@ -165,13 +144,6 @@ Current build status variant
linux_aarch64_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy - - variant - -
linux_aarch64_c_compiler_version9cxx_compiler_version9python3.6.____cpython @@ -207,13 +179,6 @@ Current build status variant
linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____73_pypy - - variant - -
linux_ppc64le_c_compiler_version7cxx_compiler_version7python3.6.____cpython @@ -249,13 +214,6 @@ Current build status variant
linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____73_pypy - - variant - -
linux_ppc64le_c_compiler_version9cxx_compiler_version9python3.6.____cpython @@ -291,13 +249,6 @@ Current build status variant
osx_64_python3.6.____73_pypy - - variant - -
osx_64_python3.6.____cpython diff --git a/recipe/0001-workaround-gcc7-bug.patch b/recipe/0001-workaround-gcc7-bug.patch new file mode 100644 index 0000000..79c2fc0 --- /dev/null +++ b/recipe/0001-workaround-gcc7-bug.patch @@ -0,0 +1,29 @@ +diff --git src/annotator.cc src/annotator.cc +index 513c0c0..33eb3b2 100644 +--- src/annotator.cc ++++ src/annotator.cc +@@ -72,11 +72,11 @@ inline void ComputeBranchLoopImpl( + const treelite::DenseDMatrixImpl* dmat, size_t rbegin, size_t rend, int nthread, + const size_t* count_row_ptr, uint64_t* counts_tloc) { + std::vector> inst(nthread * dmat->num_col, {-1}); +- const size_t ntree = model.trees.size(); ++ size_t ntree = model.trees.size(); + TREELITE_CHECK_LE(rbegin, rend); +- const size_t num_col = dmat->num_col; +- const ElementType missing_value = dmat->missing_value; +- const bool nan_missing = treelite::math::CheckNAN(missing_value); ++ size_t num_col = dmat->num_col; ++ ElementType missing_value = dmat->missing_value; ++ bool nan_missing = treelite::math::CheckNAN(missing_value); + treelite::threading_utils::ParallelFor(rbegin, rend, nthread, + [&](std::size_t rid, std::size_t thread_id) { + const ElementType* row = &dmat->data[rid * num_col]; +@@ -105,7 +105,7 @@ inline void ComputeBranchLoopImpl( + const treelite::CSRDMatrixImpl* dmat, size_t rbegin, size_t rend, int nthread, + const size_t* count_row_ptr, uint64_t* counts_tloc) { + std::vector> inst(nthread * dmat->num_col, {-1}); +- const size_t ntree = model.trees.size(); ++ size_t ntree = model.trees.size(); + TREELITE_CHECK_LE(rbegin, rend); + treelite::threading_utils::ParallelFor(rbegin, rend, nthread, + [&](std::size_t rid, std::size_t thread_id) { diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b0732e8..81cae1c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "treelite" %} -{% set version = "1.3.0" %} +{% set version = "2.0.0" %} package: name: {{ name|lower }} @@ -7,7 +7,9 @@ package: source: url: https://github.com/dmlc/treelite/archive/{{ version }}.tar.gz - sha256: 38babc3be02aa95181f02cc4cb607453ff4c3046dcc7b7aa7795d0a936ae61bf + sha256: 5e8df3d0c2fc141db82f43c05ce8d5e4353bdba4aa652d58e7b409b4983b5524 + patches: + - 0001-workaround-gcc7-bug.patch build: number: 0 @@ -20,8 +22,6 @@ requirements: - rapidjson - {{ compiler('c') }} - {{ compiler('cxx') }} - - llvm-openmp # [osx] - - libgomp # [linux] host: - python - pip >=19.0