diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 425b907e..1b44f19f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -32,28 +32,28 @@ jobs: : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix: - CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix + ? linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix + : CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - ? linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec - : CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec + ? linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec + : CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix: - CONFIG: linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix + ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix + : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - ? linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec - : CONFIG: linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec + ? linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec + : CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix: - CONFIG: linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix + ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec - : CONFIG: linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec + ? linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec.yaml rename to .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix.yaml rename to .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec.yaml rename to .ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix.yaml rename to .ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec.yaml diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix.yaml similarity index 100% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix.yaml diff --git a/README.md b/README.md index 3f01868c..caed225e 100644 --- a/README.md +++ b/README.md @@ -69,45 +69,45 @@ Current build status - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix + linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix - variant + variant - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec + linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpythonsuffix-novec - variant + variant - linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix + linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix - variant + variant - linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec + linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpythonsuffix-novec - variant + variant - linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix - variant + variant - linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonsuffix-novec - variant + variant diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d046f6b8..8a27f885 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,6 +2,7 @@ {% set cuda_enabled = cuda_compiler_version != "None" %} {% set build_ext = "cuda" if cuda_enabled else "cpu" %} {% set version = "1.16.3" %} +{% set suffix = "" %} # [suffix == None] # help the linter package: name: {{ name|lower }}{{ suffix }} @@ -12,6 +13,7 @@ source: sha256: d26b8a7eed1df4440aa3d8eac5049980cbe585514ccedfda809712051a4b1721 patches: - never_call_install_python_deps.patch + - soname_fix.patch # [unix] # Workaround for https://github.com/conda-forge/onnxruntime-feedstock/pull/56#issuecomment-1586080419 - windows_workaround_conflict_onnxruntime_dll_system32.patch # [win] # Workaround for https://github.com/microsoft/onnxruntime/issues/13225 @@ -19,7 +21,7 @@ source: build: - number: 1 + number: 2 # Since 1.11, power9 seems to be required. skip: true # [ppc64le] skip: true # [cuda_compiler_version == "10.2" or cuda_compiler_version == "11.0" or cuda_compiler_version == "11.1"] @@ -89,6 +91,8 @@ outputs: - name: {{ name|lower }}{{ suffix }}-cpp build: string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} + run_exports: + - {{ pin_subpackage((name|lower) + suffix + '-cpp', min_pin='x.x', max_pin='x') }} script: install-cpp.sh # [unix] script: install-cpp.bat # [win] requirements: diff --git a/recipe/soname_fix.patch b/recipe/soname_fix.patch new file mode 100644 index 00000000..a92b3881 --- /dev/null +++ b/recipe/soname_fix.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 82a4547..0d09299 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -510,6 +510,7 @@ set(ORTTRAINING_ROOT ${PROJECT_SOURCE_DIR}/../orttraining) + set(ORTTRAINING_SOURCE_DIR ${ORTTRAINING_ROOT}/orttraining) + + file (STRINGS "${REPO_ROOT}/VERSION_NUMBER" ORT_VERSION) ++string(REGEX MATCH "[^.]+\\.[^.]+" ORT_VER_MAJ_MIN "${ORT_VERSION}") + + find_package(Threads) + # On Windows we directly use Windows APIs to do the job +diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake +index 59ebf8e..d22aa05 100644 +--- a/cmake/onnxruntime.cmake ++++ b/cmake/onnxruntime.cmake +@@ -247,6 +247,7 @@ set_target_properties(onnxruntime PROPERTIES + PUBLIC_HEADER "${ONNXRUNTIME_PUBLIC_HEADERS}" + LINK_DEPENDS ${SYMBOL_FILE} + VERSION ${ORT_VERSION} ++ SOVERSION ${ORT_VER_MAJ_MIN} + FOLDER "ONNXRuntime" + ) +