diff --git a/.ci_support/linux_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec.yaml b/.ci_support/linux_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec.yaml deleted file mode 100644 index 3e99f1b1..00000000 --- a/.ci_support/linux_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '14' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.9' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '14' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-cpu-4xlarge -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -suffix: -- -novec -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cuda_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec.yaml b/.ci_support/linux_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec.yaml deleted file mode 100644 index 3ad365bc..00000000 --- a/.ci_support/linux_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '14' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.9' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '14' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-cpu-4xlarge -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -suffix: -- -novec -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cuda_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec.yaml b/.ci_support/linux_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec.yaml deleted file mode 100644 index b7d7b638..00000000 --- a/.ci_support/linux_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '14' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.9' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '14' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-cpu-4xlarge -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -suffix: -- -novec -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cuda_compiler_version -zlib: -- '1' diff --git a/.ci_support/linux_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec.yaml b/.ci_support/linux_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec.yaml deleted file mode 100644 index fa298efc..00000000 --- a/.ci_support/linux_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '14' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.9' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '14' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-cpu-4xlarge -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -suffix: -- -novec -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - c_stdlib_version - - cuda_compiler_version -zlib: -- '1' diff --git a/.ci_support/migrations/cuda129.yaml b/.ci_support/migrations/cuda129.yaml deleted file mode 100644 index 5074cd12..00000000 --- a/.ci_support/migrations/cuda129.yaml +++ /dev/null @@ -1,57 +0,0 @@ -migrator_ts: 1738229377 -__migrator: - kind: - version - migration_number: - 1 - build_number: - 1 - paused: false - override_cbc_keys: - - cuda_compiler_stub - check_solvable: false - primary_key: cuda_compiler_version - ordering: - cuda_compiler_version: - - 12.4 - - 12.6 - - 12.8 - - None - - 12.9 - # to allow manual opt-in for CUDA 11.8, see - # https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/7472 - # must be last due to how cuda_compiler ordering in that migrator works - - 11.8 - commit_message: | - Upgrade to CUDA 12.9 - - CUDA 12.8 added support for architectures `sm_100`, `sm_101` and `sm_120`, - while CUDA 12.9 further added `sm_103` and `sm_121`. To build for these, - maintainers will need to modify their existing list of specified architectures - (e.g. `CMAKE_CUDA_ARCHITECTURES`, `TORCH_CUDA_ARCH_LIST`, etc.) - for their package. A good balance between broad support and storage - footprint (resp. compilation time) is to add `sm_100` and `sm_120`. - - Since CUDA 12.8, the conda-forge nvcc package now sets `CUDAARCHS` and - `TORCH_CUDA_ARCH_LIST` in its activation script to a string containing all - of the supported real architectures plus the virtual architecture of the - latest. Recipes for packages who use these variables to control their build - but do not want to build for all supported architectures will need to override - these variables in their build script. - - ref: https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#new-features - -cuda_compiler_version: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.9 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cuda_compiler_version_min: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.9 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -c_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] diff --git a/.ci_support/win_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec.yaml deleted file mode 100644 index e4e0941e..00000000 --- a/.ci_support/win_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec.yaml +++ /dev/null @@ -1,32 +0,0 @@ -c_compiler: -- vs2022 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.9' -cudnn: -- '9' -cxx_compiler: -- vs2022 -github_actions_labels: -- cirun-azure-windows-4xlarge -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -suffix: -- -novec -target_platform: -- win-64 -zlib: -- '1' diff --git a/.ci_support/win_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec.yaml deleted file mode 100644 index 24091db3..00000000 --- a/.ci_support/win_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec.yaml +++ /dev/null @@ -1,32 +0,0 @@ -c_compiler: -- vs2022 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.9' -cudnn: -- '9' -cxx_compiler: -- vs2022 -github_actions_labels: -- cirun-azure-windows-4xlarge -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -suffix: -- -novec -target_platform: -- win-64 -zlib: -- '1' diff --git a/.ci_support/win_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec.yaml deleted file mode 100644 index d3dd6bf7..00000000 --- a/.ci_support/win_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec.yaml +++ /dev/null @@ -1,32 +0,0 @@ -c_compiler: -- vs2022 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.9' -cudnn: -- '9' -cxx_compiler: -- vs2022 -github_actions_labels: -- cirun-azure-windows-4xlarge -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -suffix: -- -novec -target_platform: -- win-64 -zlib: -- '1' diff --git a/.ci_support/win_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec.yaml b/.ci_support/win_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec.yaml deleted file mode 100644 index a1f7d65a..00000000 --- a/.ci_support/win_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec.yaml +++ /dev/null @@ -1,32 +0,0 @@ -c_compiler: -- vs2022 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.9' -cudnn: -- '9' -cxx_compiler: -- vs2022 -github_actions_labels: -- cirun-azure-windows-4xlarge -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -suffix: -- -novec -target_platform: -- win-64 -zlib: -- '1' diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 1621df35..39e7d4a5 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -26,41 +26,21 @@ jobs: os: ubuntu runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9python_h3a66bdde', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9python_h31d65d89', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_cuda_compiler_version12.9python3.11.____cpythonsuffix UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9python_hc301f952', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9python_hca068e97', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_cuda_compiler_version12.9python3.12.____cpythonsuffix UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9python_h562205ff', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9python_hfcb0a960', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_cuda_compiler_version12.9python3.13.____cp313suffix UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9python_h5ed9d557', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_cuda_compiler_version12.9python_h1cca7428', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_cuda_compiler_versionNonepython3.10.____cpythonsuffix UPLOAD_PACKAGES: True os: ubuntu @@ -145,34 +125,18 @@ jobs: UPLOAD_PACKAGES: True os: windows runs_on: ['cirun-azure-windows-4xlarge--${{ github.run_id }}-win_64_cuda_compiler_version12.9python3._haca5f550', 'windows', 'x64', 'self-hosted'] - - CONFIG: win_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec - UPLOAD_PACKAGES: True - os: windows - runs_on: ['cirun-azure-windows-4xlarge--${{ github.run_id }}-win_64_cuda_compiler_version12.9python3._hda3d5d91', 'windows', 'x64', 'self-hosted'] - CONFIG: win_64_cuda_compiler_version12.9python3.11.____cpythonsuffix UPLOAD_PACKAGES: True os: windows runs_on: ['cirun-azure-windows-4xlarge--${{ github.run_id }}-win_64_cuda_compiler_version12.9python3._h2845a0b2', 'windows', 'x64', 'self-hosted'] - - CONFIG: win_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec - UPLOAD_PACKAGES: True - os: windows - runs_on: ['cirun-azure-windows-4xlarge--${{ github.run_id }}-win_64_cuda_compiler_version12.9python3._hf5f00a0b', 'windows', 'x64', 'self-hosted'] - CONFIG: win_64_cuda_compiler_version12.9python3.12.____cpythonsuffix UPLOAD_PACKAGES: True os: windows runs_on: ['cirun-azure-windows-4xlarge--${{ github.run_id }}-win_64_cuda_compiler_version12.9python3._h39d4b130', 'windows', 'x64', 'self-hosted'] - - CONFIG: win_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec - UPLOAD_PACKAGES: True - os: windows - runs_on: ['cirun-azure-windows-4xlarge--${{ github.run_id }}-win_64_cuda_compiler_version12.9python3._h512b08c8', 'windows', 'x64', 'self-hosted'] - CONFIG: win_64_cuda_compiler_version12.9python3.13.____cp313suffix UPLOAD_PACKAGES: True os: windows runs_on: ['cirun-azure-windows-4xlarge--${{ github.run_id }}-win_64_cuda_compiler_version12.9python3._h3665483b', 'windows', 'x64', 'self-hosted'] - - CONFIG: win_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec - UPLOAD_PACKAGES: True - os: windows - runs_on: ['cirun-azure-windows-4xlarge--${{ github.run_id }}-win_64_cuda_compiler_version12.9python3._hc205d925', 'windows', 'x64', 'self-hosted'] - CONFIG: win_64_cuda_compiler_versionNonepython3.10.____cpythonsuffix UPLOAD_PACKAGES: True os: windows diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 361edeb2..bac7141a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -63,6 +63,25 @@ if [[ "${sha:-}" == "" ]]; then sha=$(git rev-parse HEAD) fi +if [[ "${OSX_SDK_DIR:-}" == "" ]]; then + if [[ "${CI:-}" == "" ]]; then + echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting" + exit 1 + else + export OSX_SDK_DIR=/opt/conda-sdks + /usr/bin/sudo mkdir -p "${OSX_SDK_DIR}" + /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" + fi +else + if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + rm -f "$tmpf" + echo "OSX_SDK_DIR is writeable without sudo, continuing" + else + echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting" + exit 1 + fi +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup diff --git a/README.md b/README.md index 7e11dd0e..db8017d1 100644 --- a/README.md +++ b/README.md @@ -73,13 +73,6 @@ Current build status variant - - linux_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec - - - variant - - linux_64_cuda_compiler_version12.9python3.11.____cpythonsuffix @@ -87,13 +80,6 @@ Current build status variant - - linux_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec - - - variant - - linux_64_cuda_compiler_version12.9python3.12.____cpythonsuffix @@ -101,13 +87,6 @@ Current build status variant - - linux_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec - - - variant - - linux_64_cuda_compiler_version12.9python3.13.____cp313suffix @@ -115,13 +94,6 @@ Current build status variant - - linux_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec - - - variant - - linux_64_cuda_compiler_versionNonepython3.10.____cpythonsuffix @@ -353,13 +325,6 @@ Current build status variant - - win_64_cuda_compiler_version12.9python3.10.____cpythonsuffix-novec - - - variant - - win_64_cuda_compiler_version12.9python3.11.____cpythonsuffix @@ -367,13 +332,6 @@ Current build status variant - - win_64_cuda_compiler_version12.9python3.11.____cpythonsuffix-novec - - - variant - - win_64_cuda_compiler_version12.9python3.12.____cpythonsuffix @@ -381,13 +339,6 @@ Current build status variant - - win_64_cuda_compiler_version12.9python3.12.____cpythonsuffix-novec - - - variant - - win_64_cuda_compiler_version12.9python3.13.____cp313suffix @@ -395,13 +346,6 @@ Current build status variant - - win_64_cuda_compiler_version12.9python3.13.____cp313suffix-novec - - - variant - - win_64_cuda_compiler_versionNonepython3.10.____cpythonsuffix diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a13f0ae2..7e0f633d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ stages: jobs: - job: Skip pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-latest' variables: DECODE_PERCENTS: 'false' RET: 'true' diff --git a/recipe/bld.bat b/recipe/bld.bat index b5ea7516..7349122b 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -29,6 +29,10 @@ if "%cuda_compiler_version%"=="None" ( if errorlevel 1 exit 1 ) +:: Install the project into cwd. +:: This is needed only to produce the exported CMake targets. +cmake --install build-ci/Release --prefix "install-ci" + :: In theory there should be only one wheel for %%F in (build-ci\Release\dist\onnxruntime*.whl) do ( python -m pip install %%F diff --git a/recipe/build.sh b/recipe/build.sh index 30c60b34..d9ec212d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -59,7 +59,8 @@ cmake_extra_defines=( "EIGEN_MPL2_ONLY=ON" \ "onnxruntime_BUILD_SHARED_LIB=ON" \ "onnxruntime_BUILD_UNIT_TESTS=$BUILD_UNIT_TESTS" \ "CMAKE_PREFIX_PATH=$PREFIX" \ - "CMAKE_CUDA_ARCHITECTURES=all-major" + "CMAKE_CUDA_ARCHITECTURES=all-major" \ + "CMAKE_INSTALL_LIBDIR=lib" ) # Copy the defines from the "activate" script (e.g. activate-gcc_linux-aarch64.sh) @@ -88,6 +89,10 @@ python tools/ci_build/build.py \ --path_to_protoc_exe $BUILD_PREFIX/bin/protoc \ ${BUILD_ARGS} +# Install the project into cwd. +# This is needed only to produce the exported CMake targets. +cmake --install build-ci/Release --prefix "install-ci" + for whl_file in build-ci/Release/dist/onnxruntime*.whl; do python -m pip install "$whl_file" done diff --git a/recipe/install-cpp.bat b/recipe/install-cpp.bat index 0210959b..56d9187d 100644 --- a/recipe/install-cpp.bat +++ b/recipe/install-cpp.bat @@ -2,9 +2,10 @@ setlocal enabledelayedexpansion mkdir "%PREFIX%\Library\include\onnxruntime" -mkdir "%PREFIX%\Library\lib" +mkdir "%PREFIX%\Library\lib\cmake" mkdir "%PREFIX%\Library\bin" xcopy /E /I include\onnxruntime "%PREFIX%\Library\include\onnxruntime" +xcopy /E /I install-ci\lib\cmake\onnxruntime "%PREFIX%\Library\lib\cmake\onnxruntime" xcopy /Y build-ci\Release\onnxruntime_conda.lib "%PREFIX%\Library\lib\" xcopy /Y build-ci\Release\onnxruntime_conda.dll "%PREFIX%\Library\bin\" diff --git a/recipe/install-cpp.sh b/recipe/install-cpp.sh index 57a76a0a..307c6ab9 100644 --- a/recipe/install-cpp.sh +++ b/recipe/install-cpp.sh @@ -3,8 +3,9 @@ set -exuo pipefail mkdir -p "${PREFIX}/include" -mkdir -p "${PREFIX}/lib" +mkdir -p "${PREFIX}/lib/cmake" cp -pr include/onnxruntime "${PREFIX}/include/" +cp -pr install-ci/lib/cmake/onnxruntime "${PREFIX}/lib/cmake/" if [[ -n "${OSX_ARCH:+yes}" ]]; then install build-ci/Release/libonnxruntime.*dylib "${PREFIX}/lib" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4d803df1..447b0813 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set build_ext = ("cuda" ~ cuda_compiler_version).replace(".", "") if cuda_enabled else "cpu" %} {% set version = "1.22.2" %} {% set suffix = "" %} # [suffix == None] -{% set build = 1 %} +{% set build = 2 %} {% if cuda_enabled %} {% set build = build + 200 %} @@ -144,6 +144,7 @@ outputs: requires: - {{ compiler('cxx') }} - {{ stdlib("c") }} + - cmake-package-check files: - test.cpp - run_cpp_test.bat # [win] @@ -163,6 +164,7 @@ outputs: - $CXX $CXXFLAGS -I$PREFIX/include/ -L$PREFIX/lib/ -lonnxruntime -Wl,-rpath,$CONDA_PREFIX/lib test.cpp # [osx] - ./a.out # [unix] - call .\run_cpp_test.bat # [win] + - cmake-package-check onnxruntime --targets onnxruntime::onnxruntime about: home: https://github.com/microsoft/onnxruntime/