From c9e5b59b7936b4b576f5adc87dae8cf127197149 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Mon, 6 May 2024 13:54:36 -0500 Subject: [PATCH 1/8] Bump the build --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b978d6b2..1bd481ca 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "2.1.2" %} -{% set build = 3 %} +{% set build = 4 %} {% if cuda_compiler_version != "None" %} {% set build = build + 200 %} From 972878df806ca97f5983b68bf7c68b38502f5973 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Mon, 6 May 2024 13:56:46 -0500 Subject: [PATCH 2/8] BLD: Remove redundant magma run requirements The magma package as had run_exports for over a year now. --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1bd481ca..36da9fd5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -146,7 +146,6 @@ requirements: run: # GPU requirements without run_exports - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] - - {{ pin_compatible('magma', max_pin='x.x.x') }} # [cuda_compiler_version != "None"] run_constrained: # These constraints ensure conflict between pytorch and # pytorch-cpu 1.1 which we built before conda-forge had GPU infrastructure @@ -257,7 +256,6 @@ outputs: - llvm-openmp # [osx] # GPU requirements without run_exports - {{ pin_compatible('cudnn') }} # [cuda_compiler_version != "None"] - - {{ pin_compatible('magma', max_pin='x.x.x') }} # [cuda_compiler_version != "None"] # other requirements - python - typing_extensions From 399d3b28209058077c9a3df6920a71f1f2c1f40e Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Mon, 6 May 2024 13:59:44 -0500 Subject: [PATCH 3/8] BUG: Add missing run_export of libtorch from pytorch Closes https://github.com/conda-forge/pytorch-cpu-feedstock/issues/234 --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 36da9fd5..326c3dfd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -168,6 +168,7 @@ outputs: detect_binary_files_with_prefix: false run_exports: - {{ pin_subpackage('pytorch', max_pin='x.x') }} + - {{ pin_subpackage('libtorch', max_pin='x.x') }} skip: true # [win] skip: true # [cuda_compiler_version != "None" and linux64 and blas_impl != "mkl"] skip: true # [cuda_compiler_version == "10.2"] From 0854918852f2e96d322ca3321de3970075f6f214 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Mon, 6 May 2024 14:05:16 -0500 Subject: [PATCH 4/8] BLD: Migrate to new stdlib template --- recipe/conda_build_config.yaml | 5 +++++ recipe/meta.yaml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index fe2a114c..10d7747b 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -23,3 +23,8 @@ megabuild: zip_keys: - - github_actions_labels - blas_impl + +c_stdlib: # [linux64] + - sysroot # [linux64] +c_stdlib_version: # [linux64] + - 2.17 # [linux64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 326c3dfd..4e37eb6e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -70,7 +70,7 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy * # [megabuild and build_platform != target_platform] - numpy # [not megabuild and build_platform != target_platform] - - sysroot_linux-64 2.17 # [linux64] + - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] @@ -181,7 +181,7 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - - sysroot_linux-64 2.17 # [linux64] + - {{ stdlib('c') }} - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] From 5c7da733d798cf0176559127b6988b1dbafd4bff Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Mon, 6 May 2024 14:07:02 -0500 Subject: [PATCH 5/8] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.35.0, and conda-forge-pinning 2024.05.06.18.03.21 --- ...ler_version11.2cxx_compiler_version10.yaml | 69 ------------------ ...ler_version11.8cxx_compiler_version11.yaml | 7 +- ...ler_versionNonecxx_compiler_version12.yaml | 7 +- ...ler_version12.0cxx_compiler_version12.yaml | 7 +- ...ler_version11.2cxx_compiler_version10.yaml | 69 ------------------ ...ler_version11.8cxx_compiler_version11.yaml | 7 +- ...ler_versionNonecxx_compiler_version12.yaml | 7 +- ...ler_version12.0cxx_compiler_version12.yaml | 7 +- ...ler_version11.2cxx_compiler_version10.yaml | 73 ------------------- ...ler_versionNonecxx_compiler_version12.yaml | 7 +- ...ler_version12.0cxx_compiler_version12.yaml | 7 +- ...enericnumpy1.22python3.10.____cpython.yaml | 6 +- ...genericnumpy1.22python3.8.____cpython.yaml | 6 +- ...genericnumpy1.22python3.9.____cpython.yaml | 6 +- ...enericnumpy1.23python3.11.____cpython.yaml | 6 +- ...enericnumpy1.26python3.12.____cpython.yaml | 6 +- ...mplmklnumpy1.22python3.10.____cpython.yaml | 6 +- ...implmklnumpy1.22python3.8.____cpython.yaml | 6 +- ...implmklnumpy1.22python3.9.____cpython.yaml | 6 +- ...mplmklnumpy1.23python3.11.____cpython.yaml | 6 +- ...mplmklnumpy1.26python3.12.____cpython.yaml | 6 +- ...arm64_numpy1.22python3.10.____cpython.yaml | 6 +- ..._arm64_numpy1.22python3.8.____cpython.yaml | 6 +- ..._arm64_numpy1.22python3.9.____cpython.yaml | 6 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 6 +- ...arm64_numpy1.26python3.12.____cpython.yaml | 6 +- .github/workflows/conda-build.yml | 23 +----- README.md | 21 ------ 28 files changed, 124 insertions(+), 277 deletions(-) delete mode 100644 .ci_support/linux_64_blas_implgenericc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml delete mode 100644 .ci_support/linux_64_blas_implmklc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml delete mode 100644 .ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml deleted file mode 100644 index 6e7f2304..00000000 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ /dev/null @@ -1,69 +0,0 @@ -blas_impl: -- generic -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -github_actions_labels: -- cirun-openstack-cpu-large -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 4.25.1 -megabuild: -- 'true' -mkl: -- '2023' -nccl: -- '2' -numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -pytorch: -- '2.1' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image -- - github_actions_labels - - blas_impl -- - python - - numpy 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 7889ffa0..2e67092f 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 @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,7 +33,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 megabuild: - 'true' mkl: @@ -59,6 +63,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 5ecbe1fb..db278ca9 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,7 +33,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 megabuild: - 'true' mkl: @@ -59,6 +63,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version 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 8bd0c8b0..7122a81a 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 @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,7 +33,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 megabuild: - 'true' mkl: @@ -59,6 +63,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml deleted file mode 100644 index a86e13a6..00000000 --- a/.ci_support/linux_64_blas_implmklc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ /dev/null @@ -1,69 +0,0 @@ -blas_impl: -- mkl -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -github_actions_labels: -- cirun-openstack-gpu-large -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 4.25.1 -megabuild: -- 'true' -mkl: -- '2023' -nccl: -- '2' -numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -pytorch: -- '2.1' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image -- - github_actions_labels - - blas_impl -- - python - - numpy 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 d103dd84..d1dce69f 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 @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,7 +33,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 megabuild: - 'true' mkl: @@ -59,6 +63,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 7619452b..e939de2a 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,7 +33,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 megabuild: - 'true' mkl: @@ -59,6 +63,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version 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 a1671a90..f5cdc2cb 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 @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,7 +33,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 megabuild: - 'true' mkl: @@ -59,6 +63,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml deleted file mode 100644 index 4787c866..00000000 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml +++ /dev/null @@ -1,73 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -blas_impl: -- generic -c_compiler: -- gcc -c_compiler_version: -- '10' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.2' -cudnn: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 -github_actions_labels: -- cirun-openstack-cpu-large -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 4.25.1 -megabuild: -- 'true' -mkl: -- '2023' -nccl: -- '2' -numpy: -- '1.22' -- '1.23' -- '1.26' -- '1.22' -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.8.* *_cpython -- 3.9.* *_cpython -pytorch: -- '2.1' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cdt_name - - cuda_compiler - - cuda_compiler_version - - docker_image -- - github_actions_labels - - blas_impl -- - python - - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 4e54d143..98e73405 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -6,6 +6,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,7 +37,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 megabuild: - 'true' mkl: @@ -63,6 +67,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 2df33e85..c6d042f8 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -6,6 +6,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,7 +37,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 megabuild: - 'true' mkl: @@ -63,6 +67,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.10.____cpython.yaml index f5188c96..a1fbf974 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.10.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml index 03091905..b4c37f03 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.9.____cpython.yaml index 6079fae0..428ff0ce 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.9.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implgenericnumpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy1.23python3.11.____cpython.yaml index 33aa2d9e..7844a37f 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.23python3.11.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implgenericnumpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy1.26python3.12.____cpython.yaml index c05da81b..7c22b967 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.26python3.12.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implmklnumpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy1.22python3.10.____cpython.yaml index 9e923d11..f6edae5e 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.22python3.10.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml index a8af4941..baec06ad 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____cpython.yaml index 447adb60..297ef04f 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implmklnumpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy1.23python3.11.____cpython.yaml index c528b1bb..3e3fb553 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.23python3.11.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_64_blas_implmklnumpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy1.26python3.12.____cpython.yaml index ee5654cf..c7ffb0b3 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.26python3.12.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 183af384..23607722 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 21343448..29efdfdb 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 6a83b5fb..caa2080b 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 56b3b9be..e50b8f44 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 080b14a3..a3ddf4a7 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -8,6 +8,10 @@ c_compiler: - clang c_compiler_version: - '15' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -27,7 +31,7 @@ libcblas: liblapack: - 3.9 *netlib libprotobuf: -- 4.25.1 +- 4.25.3 llvm_openmp: - '16' macos_machine: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 46db0733..731fb160 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,11 +21,6 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_blas_implgenericc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_h321679fe71', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - CONFIG: linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: True os: ubuntu @@ -41,12 +36,6 @@ jobs: os: ubuntu runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_h018d675136', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_blas_implmklc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-large--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_h0108e1f8f3', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - 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 @@ -65,16 +54,6 @@ jobs: runs_on: ['cirun-openstack-gpu-large--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_h46f1704d51', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_c_compiler_version10c_hb0ea797ce5', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - - CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-large--${{ github.run_id }}-linux_aarch64_c_compiler_version11c_h16465f209e', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: True os: ubuntu @@ -142,7 +121,7 @@ jobs: ./.scripts/run_osx_build.sh - name: Install Miniconda for windows - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest miniforge-variant: Mambaforge diff --git a/README.md b/README.md index 91cf68a7..708ce129 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,6 @@ Current build status - - - - - - - - -
VariantStatus
linux_64_blas_implgenericc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - - variant - -
linux_64_blas_implgenericc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 @@ -54,13 +47,6 @@ Current build status variant
linux_64_blas_implmklc_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - - variant - -
linux_64_blas_implmklc_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 @@ -82,13 +68,6 @@ Current build status variant
linux_aarch64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10 - - variant - -
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 From b5098bfc88b4a1d5f5fa33d0c172873f160f736b Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Tue, 7 May 2024 12:10:34 -0500 Subject: [PATCH 6/8] BLD: Use tarball instead of git Closes #230 Co-authored-by: Bas Zalmstra --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4e37eb6e..61c9b8cb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,9 +20,8 @@ package: version: {{ version }} source: - # for local testing use a tarball including submodules - git_url: https://github.com/pytorch/pytorch.git - git_tag: v{{ version }} + url: https://github.com/pytorch/pytorch/releases/download/v{{ version }}/pytorch-v{{ version }}.tar.gz + sha256: 85effbcce037bffa290aea775c9a4bad5f769cb229583450c40055501ee1acd7 patches: - patches/nvml.patch # [cuda_compiler_version == "11.2"] # The patch below is probably OK for other versions too, but it is untested with them From d4655cc566bb44889492bfb3916d8d0bbbd78005 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Tue, 7 May 2024 12:14:56 -0500 Subject: [PATCH 7/8] REF: Remove CUDA 11.2 related patches --- recipe/meta.yaml | 2 +- recipe/patches/nvml.patch | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 recipe/patches/nvml.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 61c9b8cb..65ea6794 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,6 @@ source: url: https://github.com/pytorch/pytorch/releases/download/v{{ version }}/pytorch-v{{ version }}.tar.gz sha256: 85effbcce037bffa290aea775c9a4bad5f769cb229583450c40055501ee1acd7 patches: - - patches/nvml.patch # [cuda_compiler_version == "11.2"] # The patch below is probably OK for other versions too, but it is untested with them # https://github.com/conda-forge/pytorch-cpu-feedstock/pull/203#issuecomment-1797352452 # https://github.com/pytorch/pytorch/pull/82695/files#diff-8e5cb190cc46be808993381a31fe9c027705d356b6bc0460368c0310ae82b273R61-R66 @@ -55,6 +54,7 @@ build: skip: true # [cuda_compiler_version == "10.2"] skip: true # [cuda_compiler_version == "11.0"] skip: true # [cuda_compiler_version == "11.1"] + skip: true # [cuda_compiler_version == "11.2"] # 2024/04 This build seems to fail due to disk space on the CIs # We can potentially re-enable it at a later time skip: true # [cuda_compiler_version == "11.8" and aarch64] diff --git a/recipe/patches/nvml.patch b/recipe/patches/nvml.patch deleted file mode 100644 index 4c90f078..00000000 --- a/recipe/patches/nvml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/c10/cuda/CUDACachingAllocator.cpp b/c10/cuda/CUDACachingAllocator.cpp -index 05941947ed..c8e0bafe0a 100644 ---- a/c10/cuda/CUDACachingAllocator.cpp -+++ b/c10/cuda/CUDACachingAllocator.cpp -@@ -1141,7 +1141,7 @@ static std::string reportProcessMemoryInfo(int device) { - DriverAPI::get()->nvmlDeviceGetHandleByPciBusId_v2_( - pci_id, &nvml_device)); - -- std::vector procs(8); -+ std::vector procs(8); - unsigned int size = procs.size(); - nvmlReturn_t r; - while ((r = DriverAPI::get()->nvmlDeviceGetComputeRunningProcesses_( From ef00600f06a0c86dff19bdfb3f5ffbb85ce3ddc2 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 7 May 2024 17:00:41 -0400 Subject: [PATCH 8/8] trigger a build on the large runners --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 65ea6794..08dd9c3c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -159,7 +159,6 @@ requirements: outputs: - name: libtorch - - name: pytorch build: string: cuda{{ cuda_compiler_version | replace('.', '') }}_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"]