From 20edc86e59c9d58a3ae6ed809c56cd72e56db257 Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 20:34:25 +0800 Subject: [PATCH 01/15] Add cmake install for build.sh --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index deec5ff..f96fad0 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,3 +7,4 @@ export ONNX_ML=1 export CONDA_PREFIX="$PREFIX" export CMAKE_ARGS="${CMAKE_ARGS} -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DProtobuf_LIBRARY=$PREFIX/lib/libprotobuf${SHLIB_EXT}" $PYTHON -m pip install --no-deps --ignore-installed --verbose . +cmake --install .setuptools-cmake-build From ecd01c3652ae4ef3df0bf2340a349de6eef634cf Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 20:36:51 +0800 Subject: [PATCH 02/15] Add cmake install for bld.bat --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index bd0d891..e27c0f9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -8,3 +8,4 @@ set "PYTHON_EXECUTABLE=%PYTHON%" set "PYTHON_LIBRARIES=%LIBRARY_LIB%" set USE_MSVC_STATIC_RUNTIME=0 %PYTHON% -m pip install --no-deps --no-use-pep517 --ignore-installed --verbose . +cmake --install .setuptools-cmake-build From d4de136547deb431590fb7598ac986dc78f93319 Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 20:37:07 +0800 Subject: [PATCH 03/15] Bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2050936..20d2b1d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - 4535-relax_protobuf_to_under_4.patch build: - number: 0 + number: 1 entry_points: - check-model = onnx.bin.checker:check_model - check-node = onnx.bin.checker:check_node From 2fb83bda8c3f63cb8eff6588be57cef3e6d74311 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 12:39:47 +0000 Subject: [PATCH 04/15] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.03.29.16.02.14 --- .azure-pipelines/azure-pipelines-linux.yml | 60 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 32 ++--- .azure-pipelines/azure-pipelines-win.yml | 20 ++-- ...ux_64_numpy1.21python3.8.____73_pypy.yaml} | 2 +- ...ux_64_numpy1.21python3.8.____cpython.yaml} | 2 +- ...ux_64_numpy1.21python3.9.____73_pypy.yaml} | 2 +- ...ux_64_numpy1.21python3.9.____cpython.yaml} | 2 +- ...rch64_numpy1.21python3.8.____73_pypy.yaml} | 2 +- ...rch64_numpy1.21python3.8.____cpython.yaml} | 2 +- ...rch64_numpy1.21python3.9.____73_pypy.yaml} | 2 +- ...rch64_numpy1.21python3.9.____cpython.yaml} | 2 +- ...c64le_numpy1.21python3.8.____73_pypy.yaml} | 2 +- ...c64le_numpy1.21python3.8.____cpython.yaml} | 2 +- ...c64le_numpy1.21python3.9.____73_pypy.yaml} | 2 +- ...c64le_numpy1.21python3.9.____cpython.yaml} | 2 +- ...sx_64_numpy1.21python3.8.____73_pypy.yaml} | 2 +- ...sx_64_numpy1.21python3.8.____cpython.yaml} | 2 +- ...sx_64_numpy1.21python3.9.____73_pypy.yaml} | 2 +- ...sx_64_numpy1.21python3.9.____cpython.yaml} | 2 +- ...arm64_numpy1.21python3.8.____cpython.yaml} | 2 +- ...arm64_numpy1.21python3.9.____cpython.yaml} | 2 +- ...in_64_numpy1.21python3.8.____73_pypy.yaml} | 2 +- ...in_64_numpy1.21python3.8.____cpython.yaml} | 2 +- ...in_64_numpy1.21python3.9.____73_pypy.yaml} | 2 +- ...in_64_numpy1.21python3.9.____cpython.yaml} | 2 +- README.md | 112 +++++++++--------- 26 files changed, 134 insertions(+), 134 deletions(-) rename .ci_support/{linux_64_numpy1.20python3.8.____73_pypy.yaml => linux_64_numpy1.21python3.8.____73_pypy.yaml} (98%) rename .ci_support/{linux_64_numpy1.20python3.8.____cpython.yaml => linux_64_numpy1.21python3.8.____cpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.20python3.9.____73_pypy.yaml => linux_64_numpy1.21python3.9.____73_pypy.yaml} (98%) rename .ci_support/{linux_64_numpy1.20python3.9.____cpython.yaml => linux_64_numpy1.21python3.9.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.20python3.8.____73_pypy.yaml => linux_aarch64_numpy1.21python3.8.____73_pypy.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.20python3.8.____cpython.yaml => linux_aarch64_numpy1.21python3.8.____cpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.20python3.9.____73_pypy.yaml => linux_aarch64_numpy1.21python3.9.____73_pypy.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.20python3.9.____cpython.yaml => linux_aarch64_numpy1.21python3.9.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.20python3.8.____73_pypy.yaml => linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.20python3.8.____cpython.yaml => linux_ppc64le_numpy1.21python3.8.____cpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.20python3.9.____73_pypy.yaml => linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.20python3.9.____cpython.yaml => linux_ppc64le_numpy1.21python3.9.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.20python3.8.____73_pypy.yaml => osx_64_numpy1.21python3.8.____73_pypy.yaml} (98%) rename .ci_support/{osx_64_numpy1.20python3.8.____cpython.yaml => osx_64_numpy1.21python3.8.____cpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.20python3.9.____73_pypy.yaml => osx_64_numpy1.21python3.9.____73_pypy.yaml} (98%) rename .ci_support/{osx_64_numpy1.20python3.9.____cpython.yaml => osx_64_numpy1.21python3.9.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.20python3.8.____cpython.yaml => osx_arm64_numpy1.21python3.8.____cpython.yaml} (98%) rename .ci_support/{osx_arm64_numpy1.20python3.9.____cpython.yaml => osx_arm64_numpy1.21python3.9.____cpython.yaml} (98%) rename .ci_support/{win_64_numpy1.20python3.8.____73_pypy.yaml => win_64_numpy1.21python3.8.____73_pypy.yaml} (96%) rename .ci_support/{win_64_numpy1.20python3.8.____cpython.yaml => win_64_numpy1.21python3.8.____cpython.yaml} (96%) rename .ci_support/{win_64_numpy1.20python3.9.____73_pypy.yaml => win_64_numpy1.21python3.9.____73_pypy.yaml} (96%) rename .ci_support/{win_64_numpy1.20python3.9.____cpython.yaml => win_64_numpy1.21python3.9.____cpython.yaml} (96%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 09113c4..2cc7296 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,72 +8,72 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.20python3.8.____73_pypy: - CONFIG: linux_64_numpy1.20python3.8.____73_pypy + linux_64_numpy1.21python3.10.____cpython: + CONFIG: linux_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.8.____cpython: - CONFIG: linux_64_numpy1.20python3.8.____cpython + linux_64_numpy1.21python3.8.____73_pypy: + CONFIG: linux_64_numpy1.21python3.8.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____73_pypy: - CONFIG: linux_64_numpy1.20python3.9.____73_pypy + linux_64_numpy1.21python3.8.____cpython: + CONFIG: linux_64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____cpython: - CONFIG: linux_64_numpy1.20python3.9.____cpython + linux_64_numpy1.21python3.9.____73_pypy: + CONFIG: linux_64_numpy1.21python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.21python3.9.____cpython: + CONFIG: linux_64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpython: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.20python3.8.____73_pypy: - CONFIG: linux_aarch64_numpy1.20python3.8.____73_pypy + linux_aarch64_numpy1.21python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_numpy1.20python3.8.____cpython: - CONFIG: linux_aarch64_numpy1.20python3.8.____cpython + linux_aarch64_numpy1.21python3.8.____73_pypy: + CONFIG: linux_aarch64_numpy1.21python3.8.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_numpy1.20python3.9.____73_pypy: - CONFIG: linux_aarch64_numpy1.20python3.9.____73_pypy + linux_aarch64_numpy1.21python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_numpy1.20python3.9.____cpython: - CONFIG: linux_aarch64_numpy1.20python3.9.____cpython + linux_aarch64_numpy1.21python3.9.____73_pypy: + CONFIG: linux_aarch64_numpy1.21python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_numpy1.21python3.10.____cpython: - CONFIG: linux_aarch64_numpy1.21python3.10.____cpython + linux_aarch64_numpy1.21python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_aarch64_numpy1.23python3.11.____cpython: CONFIG: linux_aarch64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_numpy1.20python3.8.____73_pypy: - CONFIG: linux_ppc64le_numpy1.20python3.8.____73_pypy + linux_ppc64le_numpy1.21python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.20python3.8.____cpython: - CONFIG: linux_ppc64le_numpy1.20python3.8.____cpython + linux_ppc64le_numpy1.21python3.8.____73_pypy: + CONFIG: linux_ppc64le_numpy1.21python3.8.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.20python3.9.____73_pypy: - CONFIG: linux_ppc64le_numpy1.20python3.9.____73_pypy + linux_ppc64le_numpy1.21python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.20python3.9.____cpython: - CONFIG: linux_ppc64le_numpy1.20python3.9.____cpython + linux_ppc64le_numpy1.21python3.9.____73_pypy: + CONFIG: linux_ppc64le_numpy1.21python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.21python3.10.____cpython: - CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + linux_ppc64le_numpy1.21python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le linux_ppc64le_numpy1.23python3.11.____cpython: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 982b2d0..e3774bf 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,33 +8,33 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.20python3.8.____73_pypy: - CONFIG: osx_64_numpy1.20python3.8.____73_pypy + osx_64_numpy1.21python3.10.____cpython: + CONFIG: osx_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.8.____cpython: - CONFIG: osx_64_numpy1.20python3.8.____cpython + osx_64_numpy1.21python3.8.____73_pypy: + CONFIG: osx_64_numpy1.21python3.8.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____73_pypy: - CONFIG: osx_64_numpy1.20python3.9.____73_pypy + osx_64_numpy1.21python3.8.____cpython: + CONFIG: osx_64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____cpython: - CONFIG: osx_64_numpy1.20python3.9.____cpython + osx_64_numpy1.21python3.9.____73_pypy: + CONFIG: osx_64_numpy1.21python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.21python3.9.____cpython: + CONFIG: osx_64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.20python3.8.____cpython: - CONFIG: osx_arm64_numpy1.20python3.8.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.20python3.9.____cpython: - CONFIG: osx_arm64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.21python3.10.____cpython: CONFIG: osx_arm64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.21python3.8.____cpython: + CONFIG: osx_arm64_numpy1.21python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.21python3.9.____cpython: + CONFIG: osx_arm64_numpy1.21python3.9.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8d8a5ff..448c825 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,20 +8,20 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_numpy1.20python3.8.____73_pypy: - CONFIG: win_64_numpy1.20python3.8.____73_pypy + win_64_numpy1.21python3.10.____cpython: + CONFIG: win_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.8.____cpython: - CONFIG: win_64_numpy1.20python3.8.____cpython + win_64_numpy1.21python3.8.____73_pypy: + CONFIG: win_64_numpy1.21python3.8.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____73_pypy: - CONFIG: win_64_numpy1.20python3.9.____73_pypy + win_64_numpy1.21python3.8.____cpython: + CONFIG: win_64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.20python3.9.____cpython: - CONFIG: win_64_numpy1.20python3.9.____cpython + win_64_numpy1.21python3.9.____73_pypy: + CONFIG: win_64_numpy1.21python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - win_64_numpy1.21python3.10.____cpython: - CONFIG: win_64_numpy1.21python3.10.____cpython + win_64_numpy1.21python3.9.____cpython: + CONFIG: win_64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.23python3.11.____cpython: CONFIG: win_64_numpy1.23python3.11.____cpython diff --git a/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml index 5505c45..e37d06f 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.21python3.8.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml index 459cc1a..15f00f1 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml index 4c1d8d2..588fd2f 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.21python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml index e235b07..16b7af4 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.20python3.8.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml index 44fb1a0..6403eb9 100644 --- a/.ci_support/linux_aarch64_numpy1.20python3.8.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.8.____73_pypy.yaml @@ -21,7 +21,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml index 6642868..5566d22 100644 --- a/.ci_support/linux_aarch64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.8.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml index 12ae368..b97d3fc 100644 --- a/.ci_support/linux_aarch64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.9.____73_pypy.yaml @@ -21,7 +21,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_aarch64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml index 7f74b82..23e6f53 100644 --- a/.ci_support/linux_aarch64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.9.____cpython.yaml @@ -21,7 +21,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.20python3.8.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml index 974eac2..c7a3cfc 100644 --- a/.ci_support/linux_ppc64le_numpy1.20python3.8.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.8.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml index 44903f0..c1ee2fc 100644 --- a/.ci_support/linux_ppc64le_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml index 5708db2..d9a2826 100644 --- a/.ci_support/linux_ppc64le_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml index 36694f9..93b6b10 100644 --- a/.ci_support/linux_ppc64le_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml index a9cc4cb..a97380e 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.21python3.8.____73_pypy.yaml @@ -17,7 +17,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml index aa13dfe..b88a066 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml @@ -17,7 +17,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml index 0ba5da2..716cfe6 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.21python3.9.____73_pypy.yaml @@ -17,7 +17,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml index c0e76f3..4305172 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml @@ -17,7 +17,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml index 2ace1c4..62e90f0 100644 --- a/.ci_support/osx_arm64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.8.____cpython.yaml @@ -17,7 +17,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml similarity index 98% rename from .ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml index 022947f..daf9130 100644 --- a/.ci_support/osx_arm64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.21python3.9.____cpython.yaml @@ -17,7 +17,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml similarity index 96% rename from .ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml rename to .ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml index ced1068..870028f 100644 --- a/.ci_support/win_64_numpy1.20python3.8.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.21python3.8.____73_pypy.yaml @@ -9,7 +9,7 @@ cxx_compiler: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.21python3.8.____cpython.yaml index 1daaa91..ad9c393 100644 --- a/.ci_support/win_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.8.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml similarity index 96% rename from .ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml index 26e2b69..b04ae8a 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.21python3.9.____73_pypy.yaml @@ -9,7 +9,7 @@ cxx_compiler: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml similarity index 96% rename from .ci_support/win_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.21python3.9.____cpython.yaml index 69955cd..79c42b9 100644 --- a/.ci_support/win_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.9.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: libprotobuf: - '3.21' numpy: -- '1.20' +- '1.21' pin_run_as_build: python: min_pin: x.x diff --git a/README.md b/README.md index eceffb9..4e810ba 100644 --- a/README.md +++ b/README.md @@ -35,38 +35,38 @@ Current build status - + - + - + - + - + @@ -77,38 +77,38 @@ Current build status - + - + - + - + - + @@ -119,38 +119,38 @@ Current build status - + - + - + - + - + @@ -161,38 +161,38 @@ Current build status - + - + - + - + - + @@ -203,24 +203,24 @@ Current build status - + - + - + @@ -231,38 +231,38 @@ Current build status - + - + - + - + - + From 7259feefe857a8357aef60871b8a13999b398e35 Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 20:57:49 +0800 Subject: [PATCH 05/15] Build shared libs instead --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index f96fad0..62ae7f4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -5,6 +5,6 @@ set -euxo pipefail export ONNX_ML=1 # build script looks at this, but not set on export CONDA_PREFIX="$PREFIX" -export CMAKE_ARGS="${CMAKE_ARGS} -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DProtobuf_LIBRARY=$PREFIX/lib/libprotobuf${SHLIB_EXT}" +export CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_SHARED_LIBS=ON -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DProtobuf_LIBRARY=$PREFIX/lib/libprotobuf${SHLIB_EXT}" $PYTHON -m pip install --no-deps --ignore-installed --verbose . cmake --install .setuptools-cmake-build From f362f7d0216c60dee74f5b93292fa93f9e312633 Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 20:58:54 +0800 Subject: [PATCH 06/15] Build shared libs on windows --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index e27c0f9..8260b6c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,7 +3,7 @@ set "ONNX_ML=1" set CONDA_PREFIX=%LIBRARY_PREFIX% set CMAKE_GENERATOR="Visual Studio 15 2017" set CMAKE_BUILD_TYPE=Release -set CMAKE_ARGS="-DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_STATIC_LIBS=OFF -DONNX_USE_LITE_PROTO=ON" +set CMAKE_ARGS="-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_STATIC_LIBS=OFF -DONNX_USE_LITE_PROTO=ON" set "PYTHON_EXECUTABLE=%PYTHON%" set "PYTHON_LIBRARIES=%LIBRARY_LIB%" set USE_MSVC_STATIC_RUNTIME=0 From 8d22487ff8459e4316ceafd5694af1e3cc66ef24 Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 21:26:53 +0800 Subject: [PATCH 07/15] Install shared libs before pip install --- recipe/bld.bat | 3 ++- recipe/build.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 8260b6c..3aaf3b2 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,5 +7,6 @@ set CMAKE_ARGS="-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProt set "PYTHON_EXECUTABLE=%PYTHON%" set "PYTHON_LIBRARIES=%LIBRARY_LIB%" set USE_MSVC_STATIC_RUNTIME=0 -%PYTHON% -m pip install --no-deps --no-use-pep517 --ignore-installed --verbose . +$PYTHON setup.py cmake_build cmake --install .setuptools-cmake-build +%PYTHON% -m pip install --no-deps --no-use-pep517 --ignore-installed --verbose . diff --git a/recipe/build.sh b/recipe/build.sh index 62ae7f4..0f0c986 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,5 +6,6 @@ export ONNX_ML=1 # build script looks at this, but not set on export CONDA_PREFIX="$PREFIX" export CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_SHARED_LIBS=ON -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DProtobuf_LIBRARY=$PREFIX/lib/libprotobuf${SHLIB_EXT}" -$PYTHON -m pip install --no-deps --ignore-installed --verbose . +$PYTHON setup.py cmake_build cmake --install .setuptools-cmake-build +$PYTHON -m pip install --no-deps --ignore-installed --verbose . From a3b40102e23ebe47340d34e2172e362a2e5dd019 Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 21:41:51 +0800 Subject: [PATCH 08/15] Fix %PYTHON% typo --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 3aaf3b2..397c040 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,6 +7,6 @@ set CMAKE_ARGS="-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProt set "PYTHON_EXECUTABLE=%PYTHON%" set "PYTHON_LIBRARIES=%LIBRARY_LIB%" set USE_MSVC_STATIC_RUNTIME=0 -$PYTHON setup.py cmake_build +%PYTHON% setup.py cmake_build cmake --install .setuptools-cmake-build %PYTHON% -m pip install --no-deps --no-use-pep517 --ignore-installed --verbose . From b93671919beef828b56f2ba82926b3ca65616b5a Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 22:13:46 +0800 Subject: [PATCH 09/15] Remove old generator --- recipe/bld.bat | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 397c040..96842e3 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,7 +1,6 @@ set "ONNX_ML=1" set CONDA_PREFIX=%LIBRARY_PREFIX% -set CMAKE_GENERATOR="Visual Studio 15 2017" set CMAKE_BUILD_TYPE=Release set CMAKE_ARGS="-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_STATIC_LIBS=OFF -DONNX_USE_LITE_PROTO=ON" set "PYTHON_EXECUTABLE=%PYTHON%" From 628886a7cfb795af90dfd503efe96e142663bffb Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Thu, 30 Mar 2023 22:41:12 +0800 Subject: [PATCH 10/15] Use full protobuf for dll exports --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 96842e3..2442c85 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -2,7 +2,7 @@ set "ONNX_ML=1" set CONDA_PREFIX=%LIBRARY_PREFIX% set CMAKE_BUILD_TYPE=Release -set CMAKE_ARGS="-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_STATIC_LIBS=OFF -DONNX_USE_LITE_PROTO=ON" +set CMAKE_ARGS="-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_STATIC_LIBS=OFF -DONNX_USE_LITE_PROTO=OFF" set "PYTHON_EXECUTABLE=%PYTHON%" set "PYTHON_LIBRARIES=%LIBRARY_LIB%" set USE_MSVC_STATIC_RUNTIME=0 From 6e8d7d747f9b9f89a411049386b5a18f6cb1a19d Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Fri, 31 Mar 2023 07:58:05 +0800 Subject: [PATCH 11/15] Fix cmd CMAKE_ARGS def --- recipe/bld.bat | 5 ++--- recipe/build.sh | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 2442c85..ca44349 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -2,10 +2,9 @@ set "ONNX_ML=1" set CONDA_PREFIX=%LIBRARY_PREFIX% set CMAKE_BUILD_TYPE=Release -set CMAKE_ARGS="-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_STATIC_LIBS=OFF -DONNX_USE_LITE_PROTO=OFF" +set "CMAKE_ARGS=-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON" set "PYTHON_EXECUTABLE=%PYTHON%" set "PYTHON_LIBRARIES=%LIBRARY_LIB%" set USE_MSVC_STATIC_RUNTIME=0 -%PYTHON% setup.py cmake_build -cmake --install .setuptools-cmake-build %PYTHON% -m pip install --no-deps --no-use-pep517 --ignore-installed --verbose . +cmake --install .setuptools-cmake-build diff --git a/recipe/build.sh b/recipe/build.sh index 0f0c986..62ae7f4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -6,6 +6,5 @@ export ONNX_ML=1 # build script looks at this, but not set on export CONDA_PREFIX="$PREFIX" export CMAKE_ARGS="${CMAKE_ARGS} -DBUILD_SHARED_LIBS=ON -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DProtobuf_LIBRARY=$PREFIX/lib/libprotobuf${SHLIB_EXT}" -$PYTHON setup.py cmake_build -cmake --install .setuptools-cmake-build $PYTHON -m pip install --no-deps --ignore-installed --verbose . +cmake --install .setuptools-cmake-build From b3bbda13522059f187b2e877aacbe57cd0f591dd Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Fri, 31 Mar 2023 08:27:29 +0800 Subject: [PATCH 12/15] Use static protobuf for windows --- recipe/bld.bat | 2 +- recipe/meta.yaml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index ca44349..5aca841 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -2,7 +2,7 @@ set "ONNX_ML=1" set CONDA_PREFIX=%LIBRARY_PREFIX% set CMAKE_BUILD_TYPE=Release -set "CMAKE_ARGS=-DBUILD_SHARED_LIBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON" +set "CMAKE_ARGS=-DBUILD_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON" set "PYTHON_EXECUTABLE=%PYTHON%" set "PYTHON_LIBRARIES=%LIBRARY_LIB%" set USE_MSVC_STATIC_RUNTIME=0 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 20d2b1d..dc18e96 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,12 +28,14 @@ requirements: - {{ compiler('cxx') }} - cmake - make - - libprotobuf + - libprotobuf # [not win] + - libprotobuf-static # [win] host: - python - pip - protobuf - - libprotobuf + - libprotobuf # [not win] + - libprotobuf-static # [win] - pytest-runner - ninja - pybind11 From 68183c7b556777a452b728641714b9328ca0cd0a Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Fri, 31 Mar 2023 08:48:24 +0800 Subject: [PATCH 13/15] Revert windows shared build --- recipe/bld.bat | 3 +-- recipe/meta.yaml | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 5aca841..e7077f3 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -2,9 +2,8 @@ set "ONNX_ML=1" set CONDA_PREFIX=%LIBRARY_PREFIX% set CMAKE_BUILD_TYPE=Release -set "CMAKE_ARGS=-DBUILD_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON" +set "CMAKE_ARGS=-DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_STATIC_LIBS=OFF -DONNX_USE_LITE_PROTO=ON" set "PYTHON_EXECUTABLE=%PYTHON%" set "PYTHON_LIBRARIES=%LIBRARY_LIB%" set USE_MSVC_STATIC_RUNTIME=0 %PYTHON% -m pip install --no-deps --no-use-pep517 --ignore-installed --verbose . -cmake --install .setuptools-cmake-build diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc18e96..20d2b1d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,14 +28,12 @@ requirements: - {{ compiler('cxx') }} - cmake - make - - libprotobuf # [not win] - - libprotobuf-static # [win] + - libprotobuf host: - python - pip - protobuf - - libprotobuf # [not win] - - libprotobuf-static # [win] + - libprotobuf - pytest-runner - ninja - pybind11 From 2ab605907418008c9dda076dad80a4a24f92d71c Mon Sep 17 00:00:00 2001 From: Kerry Su Date: Fri, 28 Apr 2023 14:01:24 +0800 Subject: [PATCH 14/15] Add tests to indicate new cmake files --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 20d2b1d..0db8a21 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -54,6 +54,8 @@ test: - check-model --help - check-node --help - backend-test-tools --help + - test -f "$PREFIX/lib/libonnx.so" # [unix] + - test -f "$PREFIX/lib/cmake/ONNX/ONNXConfig.cmake" # [unix] about: home: https://github.com/onnx/onnx/ From c2a30e88a801e27ca0ebd5ad26f84dd057584795 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 28 Apr 2023 09:07:05 +0200 Subject: [PATCH 15/15] Update recipe/meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0db8a21..cfeeb6f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -54,7 +54,7 @@ test: - check-model --help - check-node --help - backend-test-tools --help - - test -f "$PREFIX/lib/libonnx.so" # [unix] + - test -f "$PREFIX/lib/libonnx${SHLIB_EXT}" # [unix] - test -f "$PREFIX/lib/cmake/ONNX/ONNXConfig.cmake" # [unix] about:
VariantStatus
linux_64_numpy1.20python3.8.____73_pypylinux_64_numpy1.21python3.10.____cpython - variant + variant
linux_64_numpy1.20python3.8.____cpythonlinux_64_numpy1.21python3.8.____73_pypy - variant + variant
linux_64_numpy1.20python3.9.____73_pypylinux_64_numpy1.21python3.8.____cpython - variant + variant
linux_64_numpy1.20python3.9.____cpythonlinux_64_numpy1.21python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.21python3.9.____cpython - variant + variant
linux_aarch64_numpy1.20python3.8.____73_pypylinux_aarch64_numpy1.21python3.10.____cpython - variant + variant
linux_aarch64_numpy1.20python3.8.____cpythonlinux_aarch64_numpy1.21python3.8.____73_pypy - variant + variant
linux_aarch64_numpy1.20python3.9.____73_pypylinux_aarch64_numpy1.21python3.8.____cpython - variant + variant
linux_aarch64_numpy1.20python3.9.____cpythonlinux_aarch64_numpy1.21python3.9.____73_pypy - variant + variant
linux_aarch64_numpy1.21python3.10.____cpythonlinux_aarch64_numpy1.21python3.9.____cpython - variant + variant
linux_ppc64le_numpy1.20python3.8.____73_pypylinux_ppc64le_numpy1.21python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.20python3.8.____cpythonlinux_ppc64le_numpy1.21python3.8.____73_pypy - variant + variant
linux_ppc64le_numpy1.20python3.9.____73_pypylinux_ppc64le_numpy1.21python3.8.____cpython - variant + variant
linux_ppc64le_numpy1.20python3.9.____cpythonlinux_ppc64le_numpy1.21python3.9.____73_pypy - variant + variant
linux_ppc64le_numpy1.21python3.10.____cpythonlinux_ppc64le_numpy1.21python3.9.____cpython - variant + variant
osx_64_numpy1.20python3.8.____73_pypyosx_64_numpy1.21python3.10.____cpython - variant + variant
osx_64_numpy1.20python3.8.____cpythonosx_64_numpy1.21python3.8.____73_pypy - variant + variant
osx_64_numpy1.20python3.9.____73_pypyosx_64_numpy1.21python3.8.____cpython - variant + variant
osx_64_numpy1.20python3.9.____cpythonosx_64_numpy1.21python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_numpy1.21python3.9.____cpython - variant + variant
osx_arm64_numpy1.20python3.8.____cpythonosx_arm64_numpy1.21python3.10.____cpython - variant + variant
osx_arm64_numpy1.20python3.9.____cpythonosx_arm64_numpy1.21python3.8.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_arm64_numpy1.21python3.9.____cpython - variant + variant
win_64_numpy1.20python3.8.____73_pypywin_64_numpy1.21python3.10.____cpython - variant + variant
win_64_numpy1.20python3.8.____cpythonwin_64_numpy1.21python3.8.____73_pypy - variant + variant
win_64_numpy1.20python3.9.____73_pypywin_64_numpy1.21python3.8.____cpython - variant + variant
win_64_numpy1.20python3.9.____cpythonwin_64_numpy1.21python3.9.____73_pypy - variant + variant
win_64_numpy1.21python3.10.____cpythonwin_64_numpy1.21python3.9.____cpython - variant + variant