Rerendering locally with conda-smithy fails #217
Comments
|
@conda-forge/conda-smithy ? |
|
You need to add a 11.8 at https://github.com/conda-forge/pytorch-cpu-feedstock/blob/main/.ci_support/migrations/cuda120.yaml#L53-L54 This is why I was skeptical of updating the migration_number conda-forge/conda-forge-pinning-feedstock#5121 and preferred a new migrator. cc @jakirkham |
Not sure that link was intended (if it was I'm not following). Think you are referring to PR ( conda-forge/conda-forge-pinning-feedstock#5340 ) where the 11.8 was added to the CUDA 12 migrator Generally conda-smithy does the right thing as pointed out by Axel and later confirmed by me in this thread ( conda-forge/conda-forge-pinning-feedstock#5340 (comment) ) There are two cases we have seen where re-rendering out of the box doesn't work:
For 1, I sent a bunch of PRs xref'd at the bottom that manually fix those feedstocks. Nearly all are merged. The 2 remaining we could merge if we like. Have left that task to maintainers for now 2 is what Julien ran into. All that is needed is to purge conda-smithy's stale migrator cache so it refreshes. In cases where there is no cache (like the bot) this issue doesn't occur On my system purging conda-smithy's migrator cache looks like this Ideally conda-smithy could detect if the cache is stale and do this for us |
As of 99445d4, re-rendering locally using
conda-smithy==3.30.4fails:Full log
Yet, I have been able to re-render with the following naive changes to conda smithy as of conda-forge/conda-smithy@a8d9761 to work around the observed error:
Work around for
conda-smithyFor convenient to skip version verification which is 0.0.0 when built from sources:
This produces the following changes, but I am unsure about their validity:
Result of rerendering
commit 681f737cdd81b4a0571a8cd6ad53c35244069323 Author: Julien Jerphanion <git@jjerphan.xyz> Date: Fri Jan 26 16:17:52 2024 +0100 MNT: Re-rendered with conda-build 3.28.4, conda-smithy 0.0.0, and conda-forge-pinning 2024.01.26.12.19.12 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 index 422cfca..cc0deda 100644 --- 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-64 zip_keys: 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 275ca69..59c8f10 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-64 zip_keys: 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 6b1bbdb..f9333cf 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-64 zip_keys: 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 fb0eb66..658ccea 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-64 zip_keys: 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 index b880b6a..7bc53cf 100644 --- 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-64 zip_keys: 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 1af79a1..2d1e826 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-64 zip_keys: 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 fcbd570..8ccdb5e 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-64 zip_keys: 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 81c6629..ecb96b7 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-64 zip_keys: 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 01a7fc8..cb1a16a 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 @@ -53,7 +53,7 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - linux-aarch64 zip_keys: 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 5ce1032..2978c14 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.10.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 30b969c..8771535 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.8.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 6e0a210..b6011a2 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.9.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 820ec68..2c24668 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.23python3.11.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 4cda12b..1b9e625 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy1.26python3.12.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.12.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 3a53c6e..e822315 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.22python3.10.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 23390a1..c9948a8 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.8.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 1ec3aa4..8e57437 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.22python3.9.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 f56d6b9..5bd7bdd 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.23python3.11.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: 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 f7688b2..223142e 100644 --- a/.ci_support/osx_64_blas_implmklnumpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy1.26python3.12.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.12.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 8e4ec93..59de737 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.10.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index f0fbcc9..84b0ff4 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.8.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index a147fb4..e39f354 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.9.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index b35ff54..71c0a57 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.11.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 850e734..9b20761 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -45,7 +45,7 @@ pin_run_as_build: python: - 3.12.* *_cpython pytorch: -- '2.0' +- '2.1' target_platform: - osx-arm64 zip_keys: diff --git a/.gitignore b/.gitignore index c002910..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # 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/** +# 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 657b2cd..6c18885 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,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}" 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/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,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<ver>.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX<ver>.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." )I do not know whether this is an issue with conda-smithy or this feedstock yet.
The text was updated successfully, but these errors were encountered: