From cbcc5b909792abde93f10810beefc97c408bd081 Mon Sep 17 00:00:00 2001 From: Nicholas Dahm Date: Fri, 14 Mar 2025 16:43:31 -0700 Subject: [PATCH 1/2] Fixed bug in recipe.yaml with "true" and "false" strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems these `"true"` and `"false"` strings don't work as expected. Using `"true"` and `"false"` in cuda build: ``` │ │ Resolving build environment: │ │ Platform: linux-64 [__unix=0=0, __linux=6.13.5=0, __glibc=2.34=0, __cuda=12.6=0, __archspec=1=zen2] │ │ Channels: │ │ - file:///home/conda/feedstock_root/build_artifacts/ │ │ - conda-forge │ │ Specs: │ │ - gxx_linux-64 13.* │ │ - sysroot_linux-64 2.17.* │ │ - git │ │ ``` Using `"enabled"` and `"disabled"` in cuda build: ``` │ │ Resolving build environment: │ │ Platform: linux-64 [__unix=0=0, __linux=6.13.5=0, __glibc=2.34=0, __cuda=12.6=0, __archspec=1=zen2] │ │ Channels: │ │ - file:///home/conda/feedstock_root/build_artifacts/ │ │ - conda-forge │ │ Specs: │ │ - gxx_linux-64 13.* │ │ - sysroot_linux-64 2.17.* │ │ - git │ │ - cuda-nvcc_linux-64 12.6.* │ │ - cuda-version ==12.6 │ │ ``` --- recipe/recipe.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/recipe/recipe.yaml b/recipe/recipe.yaml index 943d5b2..13a8d10 100644 --- a/recipe/recipe.yaml +++ b/recipe/recipe.yaml @@ -1,11 +1,11 @@ context: name: xformers version: "0.0.29.post1" - build_number: 1 + build_number: 2 cuda_version: ${{ env.get("CONDA_OVERRIDE_CUDA", default="None")}} - cuda: ${{ "true" if cuda_version != "None" else "false" }} + cuda: ${{ "enabled" if cuda_version != "None" else "disabled" }} cuda_build_string: cuda_${{ cuda_version | version_to_buildstring }} - string_prefix: ${{ cuda_build_string if cuda == "true" else "cpu_" }} + string_prefix: ${{ cuda_build_string if cuda == "enabled" else "cpu_" }} package: name: ${{ name|lower }} @@ -28,9 +28,9 @@ build: variant: use_keys: # use cuda from the variant config, e.g. to build multiple CUDA variants - - ${{ "cuda" if cuda == "true" }} + - ${{ "cuda" if cuda == "enabled" }} # this will down-prioritize the cuda variant versus other variants of the package - down_prioritize_variant: ${{ 1 if cuda == "true" else 0 }} + down_prioritize_variant: ${{ 1 if cuda == "enabled" else 0 }} script: file: build env: @@ -62,7 +62,7 @@ requirements: - ${{ stdlib('c') }} - git - - if: cuda == "true" + - if: cuda == "enabled" then: - ${{ compiler('cuda') }} - cuda-version ==${{ cuda_version }} @@ -71,11 +71,11 @@ requirements: - python - pip - setuptools - - ${{ "pytorch * cuda*" if cuda == "true" }} - - ${{ "pytorch * cpu*" if cuda == "false" }} + - ${{ "pytorch * cuda*" if cuda == "enabled" }} + - ${{ "pytorch * cpu*" if cuda == "disabled" }} - pytorch - - if: cuda == "true" + - if: cuda == "enabled" then: - cuda-version ==${{ cuda_version }} @@ -95,8 +95,8 @@ requirements: - python - numpy - pyre-extensions >=0.0.29 - - ${{ "pytorch * cuda*" if cuda == "true" }} - - ${{ "pytorch * cpu*" if cuda == "false" }} + - ${{ "pytorch * cuda*" if cuda == "enabled" }} + - ${{ "pytorch * cpu*" if cuda == "disabled" }} ignore_run_exports: # not identical to list of host deps; we do need cuda-cudart, From 8d2c42854d64fc6dc1fe3fc480c4b6ec6e05696e Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 15 Mar 2025 00:03:15 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.47.0, and conda-forge-pinning 2025.03.14.13.23.22 --- .gitignore | 2 ++ .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- pixi.toml | 54 +++++++++++++++++++-------------------- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index bb38536..47b5408 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ # Rattler-build's artifacts are in `output` when not specifying anything. /output +# Pixi's configuration +.pixi diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8efa40d..e33a630 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -59,7 +59,7 @@ source run_conda_forge_build_setup make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --test skip" fi diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b7dad22..1d78eef 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -69,7 +69,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --test skip" fi rattler-build build --recipe ./recipe \ diff --git a/pixi.toml b/pixi.toml index c97c969..8f08000 100644 --- a/pixi.toml +++ b/pixi.toml @@ -4,11 +4,11 @@ [project] name = "xformers-feedstock" -version = "3.45.4" +version = "3.47.0" description = "Pixi configuration for conda-forge/xformers-feedstock" authors = ["@conda-forge/xformers"] channels = ["conda-forge"] -platforms = ['linux-64', 'osx-64', 'win-64'] +platforms = ["linux-64", "osx-64", "win-64"] [dependencies] conda-build = ">=24.1" @@ -18,46 +18,46 @@ rattler-build = "*" [tasks] inspect-all = "inspect_artifacts --all-packages" build = "rattler-build build --recipe recipe" +"build-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml" +"inspect-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml" +"build-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml" +"inspect-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml" "build-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml" "inspect-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.12.____cpython.yaml" -"build-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml" -"inspect-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml" -"build-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml" -"inspect-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml" -"build-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml" -"inspect-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml" "build-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml" "inspect-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.13.____cp313.yaml" -"build-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml" -"inspect-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml" -"build-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml" -"inspect-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.10.____cpython.yaml" +"build-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml" +"inspect-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.9.____cpython.yaml" "build-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml" "inspect-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml" -"build-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml" -"inspect-linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13python3.11.____cpython.yaml" "build-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml" "inspect-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml" -"build-osx_64_python3.12.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.12.____cpython.yaml" -"inspect-osx_64_python3.12.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.12.____cpython.yaml" -"build-osx_64_python3.9.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.9.____cpython.yaml" -"inspect-osx_64_python3.9.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.9.____cpython.yaml" -"build-osx_64_python3.13.____cp313" = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.13.____cp313.yaml" -"inspect-osx_64_python3.13.____cp313" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.13.____cp313.yaml" +"build-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml" +"inspect-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml" +"build-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml" +"inspect-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.13.____cp313.yaml" +"build-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython" = "rattler-build build --recipe recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml" +"inspect-linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml" "build-osx_64_python3.10.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.10.____cpython.yaml" "inspect-osx_64_python3.10.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.10.____cpython.yaml" "build-osx_64_python3.11.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.11.____cpython.yaml" "inspect-osx_64_python3.11.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.11.____cpython.yaml" -"build-osx_arm64_python3.12.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.12.____cpython.yaml" -"inspect-osx_arm64_python3.12.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.12.____cpython.yaml" -"build-osx_arm64_python3.9.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.9.____cpython.yaml" -"inspect-osx_arm64_python3.9.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.9.____cpython.yaml" -"build-osx_arm64_python3.13.____cp313" = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.13.____cp313.yaml" -"inspect-osx_arm64_python3.13.____cp313" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.13.____cp313.yaml" +"build-osx_64_python3.12.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.12.____cpython.yaml" +"inspect-osx_64_python3.12.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.12.____cpython.yaml" +"build-osx_64_python3.13.____cp313" = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.13.____cp313.yaml" +"inspect-osx_64_python3.13.____cp313" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.13.____cp313.yaml" +"build-osx_64_python3.9.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_64_python3.9.____cpython.yaml" +"inspect-osx_64_python3.9.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_64_python3.9.____cpython.yaml" "build-osx_arm64_python3.10.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.10.____cpython.yaml" "inspect-osx_arm64_python3.10.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.10.____cpython.yaml" "build-osx_arm64_python3.11.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.11.____cpython.yaml" "inspect-osx_arm64_python3.11.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.11.____cpython.yaml" +"build-osx_arm64_python3.12.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.12.____cpython.yaml" +"inspect-osx_arm64_python3.12.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.12.____cpython.yaml" +"build-osx_arm64_python3.13.____cp313" = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.13.____cp313.yaml" +"inspect-osx_arm64_python3.13.____cp313" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.13.____cp313.yaml" +"build-osx_arm64_python3.9.____cpython" = "rattler-build build --recipe recipe -m .ci_support/osx_arm64_python3.9.____cpython.yaml" +"inspect-osx_arm64_python3.9.____cpython" = "inspect_artifacts --recipe-dir recipe -m .ci_support/osx_arm64_python3.9.____cpython.yaml" [feature.smithy.dependencies] conda-smithy = "*" @@ -69,4 +69,4 @@ rerender = "conda-smithy rerender" lint = "conda-smithy lint recipe" [environments] -smithy = ["smithy"] \ No newline at end of file +smithy = ["smithy"]