diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 094069d96..1d0475553 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -25,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 github_actions_labels: - cirun-openstack-gpu-2xlarge libabseil: @@ -36,6 +36,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' megabuild: - 'true' mkl: @@ -48,8 +50,6 @@ numpy: - '2.0' - '2' - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x @@ -67,8 +67,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 46dcb28a7..abba9c1b6 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -25,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-gpu-2xlarge libabseil: @@ -36,6 +36,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' megabuild: - 'true' mkl: @@ -48,8 +50,6 @@ numpy: - '2.0' - '2' - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x @@ -67,8 +67,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index 18a6610c6..08374ac9d 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -25,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-gpu-2xlarge libabseil: @@ -36,6 +36,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' megabuild: - 'true' mkl: @@ -48,8 +50,6 @@ numpy: - '2.0' - '2' - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x @@ -67,8 +67,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 1abab3543..effaa26cd 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -25,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.8 +- quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 github_actions_labels: - cirun-openstack-gpu-2xlarge libabseil: @@ -36,6 +36,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' megabuild: - 'true' mkl: @@ -48,8 +50,6 @@ numpy: - '2.0' - '2' - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x @@ -67,8 +67,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 941a8bf04..877f4f17a 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -25,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-gpu-2xlarge libabseil: @@ -36,6 +36,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' megabuild: - 'true' mkl: @@ -48,8 +50,6 @@ numpy: - '2.0' - '2' - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x @@ -67,8 +67,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index a136f59c9..925d6787c 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -25,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-gpu-2xlarge libabseil: @@ -36,6 +36,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' megabuild: - 'true' mkl: @@ -48,8 +50,6 @@ numpy: - '2.0' - '2' - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x @@ -67,8 +67,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 85% rename from .ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 3f3558231..38ae9ebe9 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu blas_impl: - generic c_compiler: @@ -9,9 +7,7 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.28' -cdt_arch: -- aarch64 +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-alma-x86_64:8 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-gpu-2xlarge libabseil: @@ -40,6 +36,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' megabuild: - 'true' mkl: @@ -52,8 +50,6 @@ numpy: - '2.0' - '2' - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x @@ -71,8 +67,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml similarity index 85% rename from .ci_support/linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml rename to .ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index e3fbcb093..d1dd65887 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -1,5 +1,3 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu blas_impl: - generic c_compiler: @@ -10,8 +8,6 @@ c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: - cos7 channel_sources: @@ -29,7 +25,7 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 github_actions_labels: - cirun-openstack-gpu-2xlarge libabseil: @@ -40,6 +36,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' megabuild: - 'true' mkl: @@ -52,8 +50,6 @@ numpy: - '2.0' - '2' - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x @@ -71,8 +67,6 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml deleted file mode 100644 index 67f50fd9d..000000000 --- a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml +++ /dev/null @@ -1,10 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libgrpc 1.67 & libprotobuf 5.28.2 - kind: version - migration_number: 1 -libgrpc: -- "1.67" -libprotobuf: -- 5.28.2 -migrator_ts: 1729238463 diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml index 8f4c6eefc..8a2044f6b 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml index 89c0a84e1..684ee946d 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml index 643859832..286cace9e 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml index d26176eac..2184e22e7 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml index 800eba7af..716f9e320 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml index 06494a4e0..1ca6127e5 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml index d0c262005..84c73aedf 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml index e2d68bf00..2cee41e7d 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml index ba929b5d1..36a79bae9 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml index 8cf0ae236..91759a618 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index 492c47517..4214f4b16 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 204a41371..d9ffadbe6 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 4a02c84ce..b28d0456a 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index 2f5b5051b..923446b0e 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2.0' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index b33882f6f..7e477c194 100644 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -32,6 +32,8 @@ liblapack: - 3.9 *netlib libprotobuf: - 5.28.2 +libtorch: +- '2.4' llvm_openmp: - '17' macos_machine: @@ -42,8 +44,6 @@ mkl: - '2023' numpy: - '2' -orc: -- 2.0.2 pin_run_as_build: python: min_pin: x.x diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0535f6aa8..000000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - status: {} - check_suite: - types: - - completed - -jobs: - automerge-action: - runs-on: ubuntu-latest - name: automerge - steps: - - name: automerge-action - id: automerge-action - uses: conda-forge/automerge-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index ca9abcd6a..6f0839a85 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -25,49 +25,49 @@ jobs: UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_ha43477854c', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_blas_implgenericc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_h018d675136', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_blas_implgenericc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_h55a08dafba', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_h4755e832d1', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_blas_implmklc_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_h46f1704d51', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_blas_implmklc_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_h3b58d95c2f', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + - CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version12c_h90d0c58ec0', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-alma-x86_64:8 + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version12c_h235c88ac5f', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 + - CONFIG: linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version13c_h5d7796dce5', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version13c_h048947eff7', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" steps: diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml deleted file mode 100644 index d6f06b5c9..000000000 --- a/.github/workflows/webservices.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: repository_dispatch - -jobs: - webservices: - runs-on: ubuntu-latest - name: webservices - steps: - - name: webservices - id: webservices - uses: conda-forge/webservices-dispatch-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 7f948c41f..0e3c39422 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,8 +6,9 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} -MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" ( startgroup "Provisioning base env with micromamba" ) 2> /dev/null MICROMAMBA_VERSION="1.5.10-0" @@ -33,7 +34,7 @@ rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true ( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - +echo "Activating environment" source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" diff --git a/README.md b/README.md index 757cf2d81..14a9e72b0 100644 --- a/README.md +++ b/README.md @@ -71,17 +71,17 @@ Current build status - linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - variant + variant - linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 + linux_aarch64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 - variant + variant diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 071a9aff2..a13f0ae28 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ stages: echo "##vso[task.setvariable variable=log]$git_log" displayName: Obtain commit message - bash: echo "##vso[task.setvariable variable=RET]false" - condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) displayName: Skip build? - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" name: result diff --git a/build-locally.py b/build-locally.py index 6788aea66..c4a56c667 100755 --- a/build-locally.py +++ b/build-locally.py @@ -26,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" diff --git a/conda-forge.yml b/conda-forge.yml index 9f4edb7e8..fc809378b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -17,8 +17,6 @@ github_actions: triggers: - push - pull_request -os_version: - linux_64: cos7 provider: linux_64: github_actions linux_aarch64: azure diff --git a/recipe/bld.bat b/recipe/bld.bat index c1c2b2e61..324c74795 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -2,7 +2,9 @@ set TH_BINARY_BUILD=1 set PYTORCH_BUILD_VERSION=%PKG_VERSION% -set PYTORCH_BUILD_NUMBER=%PKG_BUILDNUM% +:: Always pass 0 to avoid appending ".post" to version string. +:: https://github.com/conda-forge/pytorch-cpu-feedstock/issues/315 +set PYTORCH_BUILD_NUMBER=0 if "%pytorch_variant%" == "gpu" ( set build_with_cuda=1 diff --git a/recipe/build.sh b/recipe/build.sh index 20bcc3aa7..ef56a90cc 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -62,7 +62,9 @@ done unset CMAKE_INSTALL_PREFIX export TH_BINARY_BUILD=1 export PYTORCH_BUILD_VERSION=$PKG_VERSION -export PYTORCH_BUILD_NUMBER=$PKG_BUILDNUM +# Always pass 0 to avoid appending ".post" to version string. +# https://github.com/conda-forge/pytorch-cpu-feedstock/issues/315 +export PYTORCH_BUILD_NUMBER=0 export INSTALL_TEST=0 export BUILD_TEST=0 @@ -230,5 +232,8 @@ else # With upstream non-split build, `libtorch_python.so` # and TorchConfig.cmake are both in ${SP_DIR}/torch/lib and therefore # this is not needed. - mv ${SP_DIR}/torch/lib/libtorch_python${SHLIB_EXT} ${PREFIX}/lib + # + # NB: we are using cp rather than mv, so that the loop in build_pytorch.sh + # symlinks it back. + cp ${SP_DIR}/torch/lib/libtorch_python${SHLIB_EXT} ${PREFIX}/lib fi diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 401238dd3..131f70c29 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -4,42 +4,47 @@ c_stdlib_version: # [osx and x86_64] MACOSX_SDK_VERSION: # [osx] - 12.3 # [osx] -# Needs higher stdlib for CUDNN9 -# CUDA 12 on aarch needs newer glibc, which requires us to override -# the whole monster zip just to bump c_stdlib_version / docker_image -c_stdlib_version: # [linux and aarch64] - - 2.17 # [linux and aarch64] - - 2.17 # [linux and aarch64] - - 2.28 # [linux and aarch64] -docker_image: # [linux and aarch64] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux and aarch64] - - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux and aarch64] - - quay.io/condaforge/linux-anvil-alma-x86_64:8 # [linux and aarch64] -# rest just to make smithy happy -c_compiler_version: # [linux and aarch64] - - 13 # [linux and aarch64] - - 11 # [linux and aarch64] - - 12 # [linux and aarch64] -cxx_compiler_version: # [linux and aarch64] - - 13 # [linux and aarch64] - - 11 # [linux and aarch64] - - 12 # [linux and aarch64] -fortran_compiler_version: # [linux and aarch64] - - 13 # [linux and aarch64] - - 11 # [linux and aarch64] - - 12 # [linux and aarch64] -cdt_name: # [linux and aarch64] - - cos7 # [linux and aarch64] - - cos7 # [linux and aarch64] - - cos7 # [linux and aarch64] -cuda_compiler: # [linux and aarch64] - - None # [linux and aarch64] - - nvcc # [linux and aarch64] - - cuda-nvcc # [linux and aarch64] -cuda_compiler_version: # [linux and aarch64] - - None # [linux and aarch64] - - 11.8 # [linux and aarch64] - - 12.0 # [linux and aarch64] +c_compiler_version: # [osx] + - 17 # [osx] +cxx_compiler_version: # [osx] + - 17 # [osx] +llvm_openmp: # [osx] + - 17 # [osx] + +mkl: + - 2023 +libprotobuf: + - 5.28.2 + +# override global pinning to stay on CUDA 12.0 +docker_image: # [linux] + - quay.io/condaforge/linux-anvil-x86_64:alma9 # [linux] + - quay.io/condaforge/linux-anvil-x86_64-cuda11.8:ubi8 # [linux] + - quay.io/condaforge/linux-anvil-x86_64:alma9 # [linux] +c_compiler_version: # [linux] + - 13 # [linux] + - 11 # [linux] + - 12 # [linux] +cxx_compiler_version: # [linux] + - 13 # [linux] + - 11 # [linux] + - 12 # [linux] +fortran_compiler_version: # [linux] + - 13 # [linux] + - 11 # [linux] + - 12 # [linux] +cdt_name: # [linux] + - cos7 # [linux] + - cos7 # [linux] + - cos7 # [linux] +cuda_compiler: # [linux] + - None # [linux] + - nvcc # [linux] + - cuda-nvcc # [linux] +cuda_compiler_version: # [linux] + - None # [linux] + - 11.8 # [linux] + - 12.0 # [linux] # end override of monster zip blas_impl: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 36439cd00..1a9db8a28 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "2.4.1" %} -{% set build = 3 %} +{% set build = 4 %} {% if cuda_compiler_version != "None" %} {% set build = build + 200 %} @@ -40,11 +40,13 @@ source: # Fix linker script inclusion for aarch64 # Already merged, can remove on Pytorch 2.4.1+ # https://github.com/pytorch/pytorch/pull/130370 - - patches/130370.patch + - patches/0005-CMAKE-Avoid-double-setting-of-LDFLAGS-130370.patch # See https://github.com/pytorch/pytorch/pull/137331 # for status - - patches/137331.patch + - patches/0006-Allow-users-to-overwrite-ld-with-environment-variabl.patch + + - patches/0007-Fix-duplicate-linker-script.patch # [cuda_compiler_version != "None" and aarch64] build: number: {{ build }} diff --git a/recipe/patches/0001-Allow-splayed-layouts.patch b/recipe/patches/0001-Allow-splayed-layouts.patch index aaef3117d..bb403c3fa 100644 --- a/recipe/patches/0001-Allow-splayed-layouts.patch +++ b/recipe/patches/0001-Allow-splayed-layouts.patch @@ -1,14 +1,14 @@ -From 22592775d6dbeade28acd11508779287a4542ed3 Mon Sep 17 00:00:00 2001 +From 1fd3e6ca57f1c1b1cfd3ffb6daa7f5df26c08a89 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 6 Nov 2023 22:46:47 -0500 -Subject: [PATCH 1/3] Allow splayed layouts +Subject: [PATCH 1/7] Allow splayed layouts --- cmake/public/cuda.cmake | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake -index 8160b5e1..39e7af74 100644 +index b37036d2f2d..77f4aecf0d3 100644 --- a/cmake/public/cuda.cmake +++ b/cmake/public/cuda.cmake @@ -60,16 +60,6 @@ find_package(CUDAToolkit REQUIRED) diff --git a/recipe/patches/0002-Use-new-nvtoolset.patch b/recipe/patches/0002-Use-new-nvtoolset.patch index e0a4c9780..30527507f 100644 --- a/recipe/patches/0002-Use-new-nvtoolset.patch +++ b/recipe/patches/0002-Use-new-nvtoolset.patch @@ -1,7 +1,7 @@ -From 8571816718e3f035bbeba8c72f8ff16f849903ee Mon Sep 17 00:00:00 2001 +From cab00a2caffd4c4b4d64443827fa81a68c625852 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 12 May 2024 09:17:00 -0400 -Subject: [PATCH 2/3] Use new nvtoolset +Subject: [PATCH 2/7] Use new nvtoolset --- caffe2/CMakeLists.txt | 11 +++++++++-- @@ -10,10 +10,10 @@ Subject: [PATCH 2/3] Use new nvtoolset 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index a6b6f0f7..a3c06482 100644 +index 89c31fab113..ed5be9b74b3 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt -@@ -1615,7 +1615,14 @@ if(USE_CUDA) +@@ -1576,7 +1576,14 @@ if(USE_CUDA) target_link_libraries(torch_cpu PRIVATE torch::cudart) endif() target_link_libraries(torch_cuda INTERFACE torch::cudart) @@ -29,20 +29,20 @@ index a6b6f0f7..a3c06482 100644 target_include_directories( torch_cuda INTERFACE $) -@@ -1685,7 +1692,7 @@ if(BUILD_SHARED_LIBS) +@@ -1649,7 +1656,7 @@ if(BUILD_SHARED_LIBS) # not find them, because they're usually in non-standard locations) if(USE_CUDA) target_link_libraries(torch_global_deps ${Caffe2_PUBLIC_CUDA_DEPENDENCY_LIBS}) - target_link_libraries(torch_global_deps torch::cudart torch::nvtoolsext) + target_link_libraries(torch_global_deps torch::cudart) endif() - if(USE_TBB) - target_link_libraries(torch_global_deps TBB::tbb) + install(TARGETS torch_global_deps DESTINATION "${TORCH_INSTALL_LIB_DIR}") + endif() diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake -index 39e7af74..1a3f026d 100644 +index 77f4aecf0d3..2cfb0554494 100644 --- a/cmake/public/cuda.cmake +++ b/cmake/public/cuda.cmake -@@ -203,12 +203,6 @@ else() +@@ -172,12 +172,6 @@ else() CUDA::cudart) endif() @@ -56,10 +56,10 @@ index 39e7af74..1a3f026d 100644 add_library(caffe2::cublas INTERFACE IMPORTED) if(CAFFE2_STATIC_LINK_CUDA AND NOT WIN32) diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt -index 97a72eed..444ef988 100644 +index 10a44af747b..5bb5e36dec4 100644 --- a/torch/CMakeLists.txt +++ b/torch/CMakeLists.txt -@@ -131,7 +131,12 @@ if(USE_CUDA) +@@ -134,7 +134,12 @@ if(USE_CUDA) list(APPEND TORCH_PYTHON_COMPILE_DEFINITIONS USE_CUDNN) endif() diff --git a/recipe/patches/0003-Force-usage-of-python-3-and-error-without-numpy.patch b/recipe/patches/0003-Force-usage-of-python-3-and-error-without-numpy.patch index 8c2e9aa40..94851b686 100644 --- a/recipe/patches/0003-Force-usage-of-python-3-and-error-without-numpy.patch +++ b/recipe/patches/0003-Force-usage-of-python-3-and-error-without-numpy.patch @@ -1,14 +1,14 @@ -From 3e2745efd746576b51a1428406f05205d84d5208 Mon Sep 17 00:00:00 2001 +From d3358d039bfd79930a9ce5e99e8007b40300136b Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 1 Sep 2024 17:35:40 -0400 -Subject: [PATCH] Force usage of python 3 and error without numpy +Subject: [PATCH 3/7] Force usage of python 3 and error without numpy --- cmake/Dependencies.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index c4661e39e18..97206b10ca2 100644 +index c4661e39e18..a0285327763 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -854,9 +854,9 @@ if(BUILD_PYTHON) @@ -32,6 +32,3 @@ index c4661e39e18..97206b10ca2 100644 caffe2_update_option(USE_NUMPY OFF) else() caffe2_update_option(USE_NUMPY ON) --- -2.46.0 - diff --git a/recipe/patches/0004-Help-find-numpy.patch b/recipe/patches/0004-Help-find-numpy.patch index f7ca4a33b..b1dd7d221 100644 --- a/recipe/patches/0004-Help-find-numpy.patch +++ b/recipe/patches/0004-Help-find-numpy.patch @@ -1,14 +1,14 @@ -From 4046adbfd65c203da169aaff4cc989d41ee5cf8a Mon Sep 17 00:00:00 2001 +From 9f39eccd9373934dcae125edc4e270d52e4a294c Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 1 Oct 2024 00:28:40 -0400 -Subject: [PATCH] Help find numpy +Subject: [PATCH 4/7] Help find numpy --- tools/setup_helpers/cmake.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index 4d10b3db1..238605a55 100644 +index 4d10b3db1aa..238605a5522 100644 --- a/tools/setup_helpers/cmake.py +++ b/tools/setup_helpers/cmake.py @@ -304,9 +304,15 @@ class CMake: @@ -27,6 +27,3 @@ index 4d10b3db1..238605a55 100644 TORCH_BUILD_VERSION=version, **build_options, ) --- -2.46.1 - diff --git a/recipe/patches/0005-CMAKE-Avoid-double-setting-of-LDFLAGS-130370.patch b/recipe/patches/0005-CMAKE-Avoid-double-setting-of-LDFLAGS-130370.patch new file mode 100644 index 000000000..aeb6a3904 --- /dev/null +++ b/recipe/patches/0005-CMAKE-Avoid-double-setting-of-LDFLAGS-130370.patch @@ -0,0 +1,38 @@ +From 1cb18db694f997058d7f3b901370a2c6d81642f2 Mon Sep 17 00:00:00 2001 +From: Aidyn-A +Date: Tue, 30 Jul 2024 18:16:04 +0000 +Subject: [PATCH 5/7] [CMAKE] Avoid double setting of LDFLAGS (#130370) + +It was observed that in some environments `LDFLAGS` gets directly appended to `CMAKE_SHARED_LINKER_FLAGS`. As the result, the same linker flag can appear twice in `CMAKE_SHARED_LINKER_FLAGS` due to manual set: +https://github.com/pytorch/pytorch/blob/1bf4a44b335b53ba9f9c7056a54ed8e4010e561b/CMakeLists.txt#L541-L542 +This flag collision causes the build failures at the `cmake` stage. +This PR adds an instruction to `CMakeLists.txt` to avoid double setting of `LDFLAGS` into `CMAKE_SHARED_LINKER_FLAGS`. + +Co-authored-by: Nikita Shulga <2453524+malfet@users.noreply.github.com> +Pull Request resolved: https://github.com/pytorch/pytorch/pull/130370 +Approved by: https://github.com/atalman, https://github.com/tinglvv, https://github.com/malfet +--- + CMakeLists.txt | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4cd4b2c2a9..562ee2d57d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -539,8 +539,14 @@ option(BUILD_EXECUTORCH "Master flag to build Executorch" ON) + if(LINUX) + set(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed") +- set(CMAKE_SHARED_LINKER_FLAGS +- "${CMAKE_SHARED_LINKER_FLAGS} $ENV{LDFLAGS}") ++ ++ set(ENV_LDFLAGS "$ENV{LDFLAGS}") ++ string(STRIP "${ENV_LDFLAGS}" ENV_LDFLAGS) ++ # Do not append linker flags passed via env var if they already there ++ if(NOT ${CMAKE_SHARED_LINKER_FLAGS} MATCHES "${ENV_LDFLAGS}") ++ set(CMAKE_SHARED_LINKER_FLAGS ++ "${CMAKE_SHARED_LINKER_FLAGS} ${ENV_LDFLAGS}") ++ endif() + endif() + + if(MSVC) diff --git a/recipe/patches/137331.patch b/recipe/patches/0006-Allow-users-to-overwrite-ld-with-environment-variabl.patch similarity index 69% rename from recipe/patches/137331.patch rename to recipe/patches/0006-Allow-users-to-overwrite-ld-with-environment-variabl.patch index 508a0d65f..85249b05c 100644 --- a/recipe/patches/137331.patch +++ b/recipe/patches/0006-Allow-users-to-overwrite-ld-with-environment-variabl.patch @@ -1,17 +1,23 @@ -From 8d6af90b51d135a4e805621873ea60656691f8bf Mon Sep 17 00:00:00 2001 +From 65c465aa1353711ccd0d16edee2455757a7a641a Mon Sep 17 00:00:00 2001 From: Mark Harfouche -Date: Thu, 3 Oct 2024 22:49:56 -0400 -Subject: [PATCH] Allow users to overwrite ld with environment variables +Date: Tue, 26 Nov 2024 22:54:21 +0000 +Subject: [PATCH 6/7] Allow users to overwrite ld with environment variable in + linker optimization script (#137331) This should help in the case of cross compilation. xref: https://github.com/conda-forge/pytorch-cpu-feedstock/pull/261 + +Fixes #ISSUE_NUMBER + +Pull Request resolved: https://github.com/pytorch/pytorch/pull/137331 +Approved by: https://github.com/isuruf, https://github.com/seemethere --- tools/setup_helpers/generate_linker_script.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/setup_helpers/generate_linker_script.py b/tools/setup_helpers/generate_linker_script.py -index 11c397a9e5f3d..e66fc197062ad 100644 +index 11c397a9e5f..e66fc197062 100644 --- a/tools/setup_helpers/generate_linker_script.py +++ b/tools/setup_helpers/generate_linker_script.py @@ -1,3 +1,4 @@ diff --git a/recipe/patches/0007-Fix-duplicate-linker-script.patch b/recipe/patches/0007-Fix-duplicate-linker-script.patch new file mode 100644 index 000000000..96710918f --- /dev/null +++ b/recipe/patches/0007-Fix-duplicate-linker-script.patch @@ -0,0 +1,24 @@ +From f61b413da8f70fa720a44f384ff1946173aaff12 Mon Sep 17 00:00:00 2001 +From: Jeongseok Lee +Date: Sun, 3 Nov 2024 01:12:36 -0700 +Subject: [PATCH 7/7] Fix duplicate linker script + +--- + setup.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 499e0b06ef2..2ccba3bd205 100644 +--- a/setup.py ++++ b/setup.py +@@ -1152,7 +1152,9 @@ def main(): + filein="cmake/prioritized_text.txt", fout="cmake/linker_script.ld" + ) + linker_script_path = os.path.abspath("cmake/linker_script.ld") +- os.environ["LDFLAGS"] = os.getenv("LDFLAGS", "") + f" -T{linker_script_path}" ++ ldflags = os.getenv("LDFLAGS", "") ++ if f"-T{linker_script_path}" not in ldflags: ++ os.environ["LDFLAGS"] = ldflags + f" -T{linker_script_path}" + os.environ["CFLAGS"] = ( + os.getenv("CFLAGS", "") + " -ffunction-sections -fdata-sections" + ) diff --git a/recipe/patches/130370.patch b/recipe/patches/130370.patch deleted file mode 100644 index 4a323defa..000000000 --- a/recipe/patches/130370.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4cd4b2c2a9..2f3ba6c2a19 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -539,8 +539,12 @@ option(BUILD_EXECUTORCH "Master flag to build Executorch" ON) - if(LINUX) - set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed") -- set(CMAKE_SHARED_LINKER_FLAGS -- "${CMAKE_SHARED_LINKER_FLAGS} $ENV{LDFLAGS}") -+ set(ENV_LDFLAGS "$ENV{LDFLAGS}") -+ string(STRIP "${ENV_LDFLAGS}" ENV_LDFLAGS) -+ if(NOT ${CMAKE_SHARED_LINKER_FLAGS} MATCHES "${ENV_LDFLAGS}") -+ set(CMAKE_SHARED_LINKER_FLAGS -+ "${CMAKE_SHARED_LINKER_FLAGS} ${ENV_LDFLAGS}") -+ endif() - endif() - - if(MSVC) diff --git a/recipe/patches/133177_remove_qnnpack.patch b/recipe/patches/133177_remove_qnnpack.patch deleted file mode 100644 index c740ae33e..000000000 --- a/recipe/patches/133177_remove_qnnpack.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/setup.py b/setup.py -index 9ec41cd37cd..5d1952b67b0 100644 ---- a/setup.py -+++ b/setup.py -@@ -68,9 +68,6 @@ - # USE_NNPACK=0 - # disables NNPACK build - # --# USE_QNNPACK=0 --# disables QNNPACK build (quantized 8-bit operators) --# - # USE_DISTRIBUTED=0 - # disables distributed (c10d, gloo, mpi, etc.) build - # -@@ -366,7 +363,6 @@ def get_submodule_folders(): - "cpuinfo", - "onnx", - "foxi", -- "QNNPACK", - "fbgemm", - "cutlass", - ]