From c4b663c58ac9e99750072ad78aa64bde57a5136c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:32:31 +0000 Subject: [PATCH 1/2] Rebuild for pytorch 2.5 --- .ci_support/migrations/pytorch25.yaml | 10 ++++++++++ recipe/conda_build_config.yaml | 3 +++ recipe/meta.yaml | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 .ci_support/migrations/pytorch25.yaml create mode 100644 recipe/conda_build_config.yaml diff --git a/.ci_support/migrations/pytorch25.yaml b/.ci_support/migrations/pytorch25.yaml new file mode 100644 index 0000000..13816d4 --- /dev/null +++ b/.ci_support/migrations/pytorch25.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for pytorch 2.5 + kind: version + migration_number: 1 +libtorch: +- '2.5' +migrator_ts: 1730666768.682698 +pytorch: +- '2.5' diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..6608a66 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,3 @@ + +c_stdlib_version: # [linux] + - "2.17" # [linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6eca709..239b2d5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: sha256: 0418cb5bb560e127764afa28578e3fc3679ba8afa31fee6b7447e5e3d39c8c4b build: - number: 1 + number: 2 # no pytorch on windows in conda-forge, see # https://github.com/conda-forge/pytorch-cpu-feedstock/issues/32 skip: true # [win] @@ -25,9 +25,9 @@ requirements: build: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - - sysroot_linux-64 2.17 # [linux] # compilers only needed for CUDA extensions - {{ compiler('cxx') }} # [cuda_compiler_version != "None"] + - {{ stdlib("c") }} # [cuda_compiler_version != "None"] - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] host: - python From 8ce4775edd07556bab23b61b81a1e5d4566df27f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:33:29 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.2, and conda-forge-pinning 2024.11.05.10.46.50 --- .azure-pipelines/azure-pipelines-linux.yml | 57 ++++++++++------ .azure-pipelines/azure-pipelines-osx.yml | 11 +-- ...iler_version13python3.10.____cpython.yaml} | 11 ++- ...iler_version13python3.11.____cpython.yaml} | 11 ++- ...iler_version13python3.12.____cpython.yaml} | 13 ++-- ...piler_version13python3.9.____cpython.yaml} | 11 ++- ...piler_version12python3.10.____cpython.yaml | 37 ++++++++++ ...piler_version12python3.11.____cpython.yaml | 37 ++++++++++ ...piler_version12python3.12.____cpython.yaml | 37 ++++++++++ ...mpiler_version12python3.9.____cpython.yaml | 37 ++++++++++ ...iler_version11python3.10.____cpython.yaml} | 15 ++-- ...iler_version11python3.11.____cpython.yaml} | 15 ++-- ...iler_version11python3.12.____cpython.yaml} | 17 +++-- ...piler_version11python3.9.____cpython.yaml} | 15 ++-- .ci_support/migrations/pytorch21.yaml | 7 -- .../osx_64_python3.10.____cpython.yaml | 8 ++- .../osx_64_python3.11.____cpython.yaml | 8 ++- ...aml => osx_64_python3.12.____cpython.yaml} | 10 ++- .ci_support/osx_64_python3.9.____cpython.yaml | 8 ++- .../osx_arm64_python3.10.____cpython.yaml | 6 +- .../osx_arm64_python3.11.____cpython.yaml | 6 +- ... => osx_arm64_python3.12.____cpython.yaml} | 8 ++- .../osx_arm64_python3.9.____cpython.yaml | 6 +- .gitattributes | 4 +- .gitignore | 25 ++++++- .scripts/build_steps.sh | 26 +++---- .scripts/run_docker_build.sh | 6 ++ .scripts/run_osx_build.sh | 48 +++++++++---- README.md | 68 +++++++++++++------ azure-pipelines.yml | 31 ++++++++- build-locally.py | 14 ++-- 31 files changed, 474 insertions(+), 139 deletions(-) rename .ci_support/{linux_64_cuda_compiler_versionNonepython3.10.____cpython.yaml => linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml} (85%) rename .ci_support/{linux_64_cuda_compiler_versionNonepython3.11.____cpython.yaml => linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml} (85%) rename .ci_support/{linux_64_cuda_compiler_versionNonepython3.8.____cpython.yaml => linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml} (81%) rename .ci_support/{linux_64_cuda_compiler_versionNonepython3.9.____cpython.yaml => linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml} (85%) create mode 100644 .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml create mode 100644 .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml create mode 100644 .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml create mode 100644 .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml rename .ci_support/{linux_64_cuda_compiler_version11.2python3.10.____cpython.yaml => linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml} (75%) rename .ci_support/{linux_64_cuda_compiler_version11.2python3.11.____cpython.yaml => linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml} (75%) rename .ci_support/{linux_64_cuda_compiler_version11.2python3.8.____cpython.yaml => linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml} (72%) rename .ci_support/{linux_64_cuda_compiler_version11.2python3.9.____cpython.yaml => linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml} (75%) delete mode 100644 .ci_support/migrations/pytorch21.yaml rename .ci_support/{osx_64_python3.8.____cpython.yaml => osx_64_python3.12.____cpython.yaml} (75%) rename .ci_support/{osx_arm64_python3.8.____cpython.yaml => osx_arm64_python3.12.____cpython.yaml} (78%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7b91c1d..d88e6d2 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,39 +8,56 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compiler_version11.2python3.10.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2python3.10.____cpython + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_version11.2python3.11.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2python3.11.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_version11.2python3.8.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2python3.8.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_version11.2python3.9.____cpython: - CONFIG: linux_64_cuda_compiler_version11.2python3.9.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython: + CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_cuda_compiler_versionNonepython3.10.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonepython3.10.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython: + CONFIG: linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cuda_compiler_versionNonepython3.11.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonepython3.11.____cpython + linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython: + CONFIG: linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cuda_compiler_versionNonepython3.8.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonepython3.8.____cpython + linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython: + CONFIG: linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cuda_compiler_versionNonepython3.9.____cpython: - CONFIG: linux_64_cuda_compiler_versionNonepython3.9.____cpython + linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython: + CONFIG: linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 + linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython: + CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 19f48f7..5f820ea 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-13 strategy: matrix: osx_64_python3.10.____cpython: @@ -14,8 +14,8 @@ jobs: osx_64_python3.11.____cpython: CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' osx_64_python3.9.____cpython: CONFIG: osx_64_python3.9.____cpython @@ -26,13 +26,14 @@ jobs: osx_arm64_python3.11.____cpython: CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' osx_arm64_python3.9.____cpython: CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_cuda_compiler_versionNonepython3.10.____cpython.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_cuda_compiler_versionNonepython3.10.____cpython.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index 8163a9c..a873c2f 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonepython3.10.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -11,7 +15,7 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: @@ -21,12 +25,13 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_versionNonepython3.11.____cpython.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_cuda_compiler_versionNonepython3.11.____cpython.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index d84e974..376a63e 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonepython3.11.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -11,7 +15,7 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: @@ -21,12 +25,13 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_versionNonepython3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml similarity index 81% rename from .ci_support/linux_64_cuda_compiler_versionNonepython3.8.____cpython.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index 4133c79..1cacac0 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonepython3.8.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -11,7 +15,7 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: @@ -19,14 +23,15 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_versionNonepython3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_cuda_compiler_versionNonepython3.9.____cpython.yaml rename to .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index f05290b..a1e2e9c 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNonepython3.9.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -11,7 +15,7 @@ cuda_compiler_version: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 pin_run_as_build: @@ -21,12 +25,13 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml new file mode 100644 index 0000000..66e1619 --- /dev/null +++ b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -0,0 +1,37 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +pytorch: +- '2.5' +target_platform: +- linux-64 +zip_keys: +- - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image diff --git a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml new file mode 100644 index 0000000..1c12bc1 --- /dev/null +++ b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -0,0 +1,37 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +pytorch: +- '2.5' +target_platform: +- linux-64 +zip_keys: +- - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image diff --git a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml new file mode 100644 index 0000000..622f16d --- /dev/null +++ b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -0,0 +1,37 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +pytorch: +- '2.5' +target_platform: +- linux-64 +zip_keys: +- - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image diff --git a/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml new file mode 100644 index 0000000..c356cd6 --- /dev/null +++ b/.ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -0,0 +1,37 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +pytorch: +- '2.5' +target_platform: +- linux-64 +zip_keys: +- - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_version11.2python3.10.____cpython.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml similarity index 75% rename from .ci_support/linux_64_cuda_compiler_version11.2python3.10.____cpython.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml index 1b3dae1..d3c287b 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2python3.10.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -7,13 +11,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 pin_run_as_build: python: min_pin: x.x @@ -21,12 +25,13 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_version11.2python3.11.____cpython.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml similarity index 75% rename from .ci_support/linux_64_cuda_compiler_version11.2python3.11.____cpython.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml index 651cb29..c39348a 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2python3.11.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -7,13 +11,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 pin_run_as_build: python: min_pin: x.x @@ -21,12 +25,13 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_version11.2python3.8.____cpython.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml similarity index 72% rename from .ci_support/linux_64_cuda_compiler_version11.2python3.8.____cpython.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml index 6de1505..9328320 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2python3.8.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -7,26 +11,27 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image diff --git a/.ci_support/linux_64_cuda_compiler_version11.2python3.9.____cpython.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml similarity index 75% rename from .ci_support/linux_64_cuda_compiler_version11.2python3.9.____cpython.yaml rename to .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index 9a8e27d..4e9e845 100644 --- a/.ci_support/linux_64_cuda_compiler_version11.2python3.9.____cpython.yaml +++ b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml @@ -1,3 +1,7 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -7,13 +11,13 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 pin_run_as_build: python: min_pin: x.x @@ -21,12 +25,13 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image diff --git a/.ci_support/migrations/pytorch21.yaml b/.ci_support/migrations/pytorch21.yaml deleted file mode 100644 index bb91f52..0000000 --- a/.ci_support/migrations/pytorch21.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1699325293.519726 -pytorch: -- '2.1' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 11ce525..d61fd27 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None macos_machine: @@ -15,6 +19,6 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - osx-64 diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index dfdacaa..388e351 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None macos_machine: @@ -15,6 +19,6 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - osx-64 diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 75% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index 4bd4c0d..f2fca6a 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None macos_machine: @@ -13,8 +17,8 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - osx-64 diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 29e6a43..bdad1c4 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None macos_machine: @@ -15,6 +19,6 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - osx-64 diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index f0ee449..b42b0f2 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None macos_machine: @@ -15,6 +19,6 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - osx-arm64 diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 5fa7ea5..39658cc 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None macos_machine: @@ -15,6 +19,6 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - osx-arm64 diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 78% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml index 1a72a21..27a6f36 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None macos_machine: @@ -13,8 +17,8 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - osx-arm64 diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index aae0bf1..fdcb49c 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -1,9 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' channel_sources: - conda-forge channel_targets: - conda-forge main +cuda_compiler: +- None cuda_compiler_version: - None macos_machine: @@ -15,6 +19,6 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.1' +- '2.5' target_platform: - osx-arm64 diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfd..827a29f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,18 +31,20 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -57,12 +59,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -74,10 +70,16 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..7f948c4 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -7,28 +7,39 @@ source .scripts/logging_utils.sh set -xe MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} +MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + @@ -81,10 +92,17 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index 9e19c54..e367dae 100644 --- a/README.md +++ b/README.md @@ -31,59 +31,87 @@ Current build status - + - + - + - + - + - + - + - + + + + + + + + + + + + + @@ -101,10 +129,10 @@ Current build status - + @@ -129,10 +157,10 @@ Current build status - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..013bdc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + 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 + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): @@ -64,8 +67,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." )
VariantStatus
linux_64_cuda_compiler_version11.2python3.10.____cpythonlinux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython - variant + variant
linux_64_cuda_compiler_version11.2python3.11.____cpythonlinux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython - variant + variant
linux_64_cuda_compiler_version11.2python3.8.____cpythonlinux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython - variant + variant
linux_64_cuda_compiler_version11.2python3.9.____cpythonlinux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython - variant + variant
linux_64_cuda_compiler_versionNonepython3.10.____cpythonlinux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_cuda_compiler_versionNonepython3.11.____cpythonlinux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_cuda_compiler_versionNonepython3.8.____cpythonlinux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_cuda_compiler_versionNonepython3.9.____cpythonlinux_64_cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython - variant + variant + +
linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython + + variant + +
linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython + + variant + +
linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython + + variant + +
linux_64_cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython + + variant
osx_64_python3.8.____cpythonosx_64_python3.12.____cpython - variant + variant
osx_arm64_python3.8.____cpythonosx_arm64_python3.12.____cpython - variant + variant