From ad9c1a772b0eab1c8436fb48bc404c6f4fbe2044 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 25 Oct 2024 04:08:33 +0000 Subject: [PATCH 01/64] updated v2.18.0 --- recipe/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4001732e4..68ff17688 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,8 @@ -{% set version = "2.17.0" %} +{% set tensorflow_cpu_gpu = "tensorflow-gpu" %} # [cuda_compiler_version != "None"] +{% set tensorflow_cpu_gpu = "tensorflow-cpu" %} # [cuda_compiler_version == "None" or cuda_compiler_version is undefined] +{% set version = "2.18.0" %} {% set estimator_version = "2.15.0" %} -{% set build = 3 %} +{% set build = 0 %} {% if cuda_compiler_version != "None" %} {% set build = build + 200 %} @@ -18,7 +20,7 @@ package: source: - url: https://github.com/tensorflow/tensorflow/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 9cc4d5773b8ee910079baaecb4086d0c28939f024dd74b33fc5e64779b6533dc + sha256: d7876f4bb0235cac60eb6316392a7c48676729860da1ab659fb440379ad5186d patches: - patches/0001-loosen-requirements.patch - patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch From e3ea41a694b6d2fc8e8a70c0d55144f9d3aca766 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 22 Oct 2024 22:40:01 +0000 Subject: [PATCH 02/64] Rebuild for libgrpc 1.67 & libprotobuf 5.28.2 --- .ci_support/migrations/libgrpc167_libprotobuf5282.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .ci_support/migrations/libgrpc167_libprotobuf5282.yaml diff --git a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml new file mode 100644 index 000000000..67f50fd9d --- /dev/null +++ b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libgrpc 1.67 & libprotobuf 5.28.2 + kind: version + migration_number: 1 +libgrpc: +- "1.67" +libprotobuf: +- 5.28.2 +migrator_ts: 1729238463 From b2fcf0da48b1adce0346cfb060fe3334c0097039 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 9 Nov 2024 18:52:24 -0500 Subject: [PATCH 03/64] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.44.2, and conda-forge-pinning 2024.11.09.23.22.20 --- ...piler_version12python3.10.____cpython.yaml | 7 ++- ...piler_version12python3.11.____cpython.yaml | 7 ++- ...piler_version12python3.12.____cpython.yaml | 7 ++- ...mpiler_version12python3.9.____cpython.yaml | 7 ++- ...piler_version13python3.10.____cpython.yaml | 7 ++- ...piler_version13python3.11.____cpython.yaml | 7 ++- ...piler_version13python3.12.____cpython.yaml | 7 ++- ...mpiler_version13python3.9.____cpython.yaml | 7 ++- .../osx_64_python3.10.____cpython.yaml | 8 ++-- .../osx_64_python3.11.____cpython.yaml | 8 ++-- .../osx_64_python3.12.____cpython.yaml | 8 ++-- .ci_support/osx_64_python3.9.____cpython.yaml | 8 ++-- .../osx_arm64_python3.10.____cpython.yaml | 8 ++-- .../osx_arm64_python3.11.____cpython.yaml | 8 ++-- .../osx_arm64_python3.12.____cpython.yaml | 8 ++-- .../osx_arm64_python3.9.____cpython.yaml | 8 ++-- .github/workflows/automerge.yml | 17 ------- .github/workflows/conda-build.yml | 7 +-- .github/workflows/webservices.yml | 13 ------ .scripts/build_steps.sh | 14 +++--- .scripts/run_osx_build.sh | 45 ++++++++++++------- azure-pipelines.yml | 3 +- 22 files changed, 93 insertions(+), 126 deletions(-) delete mode 100644 .github/workflows/automerge.yml delete mode 100644 .github/workflows/webservices.yml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml index e2f780e78..253b3752a 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml index a5c499032..b2ddf943f 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml index 687f43393..df9726290 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml index 519ac3da5..e929754f2 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index ece2ee591..c748ac27d 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index 53d5ba0e1..6ecbb2b65 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index 2ea107bec..f3f3e434a 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 00d5b9a30..5c6fcd4c3 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 nccl: - '2' numpy: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 807994357..09e1321e5 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: - 24.3.25 giflib: @@ -35,13 +35,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 8881b7b25..4208968bf 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: - 24.3.25 giflib: @@ -35,13 +35,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 9d0f31c86..dfe989d3d 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: - 24.3.25 giflib: @@ -35,13 +35,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 97dd727cb..e167a0776 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: - 24.3.25 giflib: @@ -35,13 +35,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index c6fa878a4..8b70571ee 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: - 24.3.25 giflib: @@ -35,13 +35,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 33dde1c7f..645ce4171 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: - 24.3.25 giflib: @@ -35,13 +35,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 93dfb0b7a..36c222980 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: - 24.3.25 giflib: @@ -35,13 +35,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 900e33f6b..4c1128255 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: - 24.3.25 giflib: @@ -35,13 +35,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0535f6aa8..000000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - status: {} - check_suite: - types: - - completed - -jobs: - automerge-action: - runs-on: ubuntu-latest - name: automerge - steps: - - name: automerge-action - id: automerge-action - uses: conda-forge/automerge-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 22aa35492..493b8af7a 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -117,12 +117,6 @@ jobs: fi ./.scripts/run_osx_build.sh - - name: Install Miniconda for windows - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4 - with: - miniforge-version: latest - if: matrix.os == 'windows' - - name: Build on windows shell: cmd run: | @@ -131,6 +125,7 @@ jobs: set "sha=%GITHUB_SHA%" call ".scripts\run_win_build.bat" env: + MINIFORGE_HOME: D:\Miniforge PYTHONUNBUFFERED: 1 CONFIG: ${{ matrix.CONFIG }} CI: github_actions diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml deleted file mode 100644 index d6f06b5c9..000000000 --- a/.github/workflows/webservices.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: repository_dispatch - -jobs: - webservices: - runs-on: ubuntu-latest - name: webservices - steps: - - name: webservices - id: webservices - uses: conda-forge/webservices-dispatch-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 8601d5313..6970424c7 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ 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-libmamba-solver 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 conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -76,8 +76,8 @@ else --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.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # 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 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 353866d9d..5c66aebd2 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="Miniforge3-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-libmamba-solver 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 +echo "Activating environment" +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 conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -88,8 +99,8 @@ else ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # 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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e21431e51..a13f0ae28 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,14 +13,13 @@ stages: 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: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) displayName: Skip build? - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" name: result From 3fa46b47ed4250d7c383ff1b27aebffb6c54356d Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 10 Nov 2024 21:23:40 -0500 Subject: [PATCH 04/64] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.2, and conda-forge-pinning 2024.11.10.22.41.52 --- ...piler_version12python3.10.____cpython.yaml | 9 +++--- ...piler_version12python3.11.____cpython.yaml | 9 +++--- ...piler_version12python3.12.____cpython.yaml | 9 +++--- ...mpiler_version12python3.9.____cpython.yaml | 9 +++--- ...piler_version13python3.10.____cpython.yaml | 9 +++--- ...piler_version13python3.11.____cpython.yaml | 9 +++--- ...piler_version13python3.12.____cpython.yaml | 9 +++--- ...mpiler_version13python3.9.____cpython.yaml | 9 +++--- .../libgrpc167_libprotobuf5282.yaml | 10 ------- .../osx_64_python3.10.____cpython.yaml | 11 +++---- .../osx_64_python3.11.____cpython.yaml | 11 +++---- .../osx_64_python3.12.____cpython.yaml | 11 +++---- .ci_support/osx_64_python3.9.____cpython.yaml | 11 +++---- .../osx_arm64_python3.10.____cpython.yaml | 11 +++---- .../osx_arm64_python3.11.____cpython.yaml | 11 +++---- .../osx_arm64_python3.12.____cpython.yaml | 11 +++---- .../osx_arm64_python3.9.____cpython.yaml | 11 +++---- README.md | 30 ++++++++----------- 18 files changed, 92 insertions(+), 108 deletions(-) delete mode 100644 .ci_support/migrations/libgrpc167_libprotobuf5282.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml index 253b3752a..54e7e9ac0 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -30,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -37,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 nccl: - '2' -numpy: -- '1.22' openssl: - '3' perl: @@ -76,7 +76,6 @@ zip_keys: - cuda_compiler_version - docker_image - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml index b2ddf943f..2a2b8b896 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -30,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -37,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 nccl: - '2' -numpy: -- '1.23' openssl: - '3' perl: @@ -76,7 +76,6 @@ zip_keys: - cuda_compiler_version - docker_image - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml index df9726290..6062425f3 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -30,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -37,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 nccl: - '2' -numpy: -- '1.26' openssl: - '3' perl: @@ -76,7 +76,6 @@ zip_keys: - cuda_compiler_version - docker_image - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml index e929754f2..c591d7a6d 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -30,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -37,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 nccl: - '2' -numpy: -- '1.22' openssl: - '3' perl: @@ -76,7 +76,6 @@ zip_keys: - cuda_compiler_version - docker_image - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index c748ac27d..edaa18295 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -30,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -37,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 nccl: - '2' -numpy: -- '1.22' openssl: - '3' perl: @@ -76,7 +76,6 @@ zip_keys: - cuda_compiler_version - docker_image - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index 6ecbb2b65..aa5df3759 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -30,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -37,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 nccl: - '2' -numpy: -- '1.23' openssl: - '3' perl: @@ -76,7 +76,6 @@ zip_keys: - cuda_compiler_version - docker_image - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index f3f3e434a..119fad61f 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -30,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -37,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 nccl: - '2' -numpy: -- '1.26' openssl: - '3' perl: @@ -76,7 +76,6 @@ zip_keys: - cuda_compiler_version - docker_image - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 5c6fcd4c3..d88ec2be6 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -30,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -37,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 nccl: - '2' -numpy: -- '1.22' openssl: - '3' perl: @@ -76,7 +76,6 @@ zip_keys: - cuda_compiler_version - docker_image - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml deleted file mode 100644 index 67f50fd9d..000000000 --- a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml +++ /dev/null @@ -1,10 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libgrpc 1.67 & libprotobuf 5.28.2 - kind: version - migration_number: 1 -libgrpc: -- "1.67" -libprotobuf: -- 5.28.2 -migrator_ts: 1729238463 diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 09e1321e5..3211e8e2d 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -18,6 +18,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -28,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -35,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.22' openssl: - '3' pin_run_as_build: @@ -68,7 +70,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 4208968bf..7e2a477a1 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -18,6 +18,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -28,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -35,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.23' openssl: - '3' pin_run_as_build: @@ -68,7 +70,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index dfe989d3d..416306b40 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -18,6 +18,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -28,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -35,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.26' openssl: - '3' pin_run_as_build: @@ -68,7 +70,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index e167a0776..150a7e151 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -18,6 +18,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -28,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -35,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.22' openssl: - '3' pin_run_as_build: @@ -68,7 +70,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 8b70571ee..3443213bd 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -18,6 +18,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -28,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -35,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.22' openssl: - '3' pin_run_as_build: @@ -68,7 +70,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 645ce4171..f57f589b6 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -18,6 +18,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -28,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -35,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.23' openssl: - '3' pin_run_as_build: @@ -68,7 +70,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 36c222980..fab04db7c 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -18,6 +18,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -28,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -35,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.26' openssl: - '3' pin_run_as_build: @@ -68,7 +70,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 4c1128255..d859f4053 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -18,6 +18,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -28,6 +30,8 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge +grpc_cpp: +- '1.52' icu: - '75' libabseil: @@ -35,17 +39,15 @@ libabseil: libcurl: - '8' libgrpc: -- '1.67' +- '1.65' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.28.2 +- 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.22' openssl: - '3' pin_run_as_build: @@ -68,7 +70,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1' diff --git a/README.md b/README.md index 1ea77e280..14db7d1bd 100644 --- a/README.md +++ b/README.md @@ -161,13 +161,7 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libtensorflow-green.svg)](https://anaconda.org/conda-forge/libtensorflow) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libtensorflow.svg)](https://anaconda.org/conda-forge/libtensorflow) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libtensorflow.svg)](https://anaconda.org/conda-forge/libtensorflow) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libtensorflow.svg)](https://anaconda.org/conda-forge/libtensorflow) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libtensorflow_cc-green.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow-green.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--base-green.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--cpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--estimator-green.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--gpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--split-green.svg)](https://anaconda.org/conda-forge/tensorflow-split) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-split.svg)](https://anaconda.org/conda-forge/tensorflow-split) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-split.svg)](https://anaconda.org/conda-forge/tensorflow-split) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-split.svg)](https://anaconda.org/conda-forge/tensorflow-split) | Installing tensorflow ===================== @@ -179,41 +173,41 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator, tensorflow-gpu` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `tensorflow-split` can be installed with `conda`: ``` -conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu +conda install tensorflow-split ``` or with `mamba`: ``` -mamba install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu +mamba install tensorflow-split ``` -It is possible to list all of the versions of `libtensorflow` available on your platform with `conda`: +It is possible to list all of the versions of `tensorflow-split` available on your platform with `conda`: ``` -conda search libtensorflow --channel conda-forge +conda search tensorflow-split --channel conda-forge ``` or with `mamba`: ``` -mamba search libtensorflow --channel conda-forge +mamba search tensorflow-split --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search libtensorflow --channel conda-forge +mamba repoquery search tensorflow-split --channel conda-forge -# List packages depending on `libtensorflow`: -mamba repoquery whoneeds libtensorflow --channel conda-forge +# List packages depending on `tensorflow-split`: +mamba repoquery whoneeds tensorflow-split --channel conda-forge -# List dependencies of `libtensorflow`: -mamba repoquery depends libtensorflow --channel conda-forge +# List dependencies of `tensorflow-split`: +mamba repoquery depends tensorflow-split --channel conda-forge ``` From 581974cfe615839164a81a7d03cd84dc52c1497d Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 19 Nov 2024 00:37:29 -0500 Subject: [PATCH 05/64] Add numpy 2 --- .ci_support/migrations/numpy2.yaml | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .ci_support/migrations/numpy2.yaml diff --git a/.ci_support/migrations/numpy2.yaml b/.ci_support/migrations/numpy2.yaml new file mode 100644 index 000000000..fd981b850 --- /dev/null +++ b/.ci_support/migrations/numpy2.yaml @@ -0,0 +1,52 @@ +__migrator: + build_number: 1 + kind: version + commit_message: | + Rebuild for numpy 2.0 + + TL;DR: The way we build against numpy has changed as of numpy 2.0. This bot + PR has updated the recipe to account for the changes (see below for details). + + The biggest change is that we no longer need to use the oldest available numpy + version at build time in order to support old numpy version at runtime - numpy + will by default use a compatible ABI for the oldest still-supported numpy versions. + + Additionally, we no longer need to use `{{ pin_compatible("numpy") }}` as a + run requirement - this has been handled for more than two years now by a + run-export on the numpy package itself. The migrator will therefore remove + any occurrences of this. + + However, you will still need to add the lower bound for the numpy version, + in line with what the upstream package requires. The default lower bound from + the run-export is `>=1.19`; if your package needs a newer version than that, + please add `numpy >=x.y` under `run:`. + + Finally, by default, building against numpy 2.0 will assume that the package + is compatible with numpy 2.0, which is not necessarily the case. You should + check that the upstream package explicitly supports numpy 2.0, otherwise you + need to add a `- numpy <2.0dev0` run requirement until that happens (check numpy + issue 26191 for an overview of the most important packages). + + ### To-Dos: + * [ ] Match run-requirements for numpy (i.e. check upstream `pyproject.toml` or however the project specifies numpy compatibility) + * If upstream is not yet compatible with numpy 2.0, add `numpy <2.0dev0` upper bound under `run:`. + * If upstream is already compatible with numpy 2.0, double-check their supported numpy versions. + * If upstream requires a minimum numpy version newer than 1.19, you need to add `numpy >=x.y` under `run:`. + * [ ] Remove any remaining occurrences of `{{ pin_compatible("numpy") }}` that the bot may have missed. + + PS. If the build does not compile anymore, this is almost certainly a sign that + the upstream project is not yet ready for numpy 2.0; do not close this PR until + a version compatible with numpy 2.0 has been released upstream and on this + feedstock (in the meantime, you can keep the bot from reopening this PR in + case of git conflicts by marking it as a draft). + + migration_number: 1 + +# needs to match length of zip {python, python_impl, numpy} +# as it is in global CBC in order to override it +numpy: + - 2.0 + - 2.0 + - 2.0 + - 2.0 +migrator_ts: 1713572489.295986 From a17b3176d960d2b8d8e17ab0155fd7ff2b6052e7 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 19 Nov 2024 01:59:29 -0500 Subject: [PATCH 06/64] UPdate patches --- recipe/patches/0001-loosen-requirements.patch | 33 +++-------- ...absl_synchronization-linkage-to-gRPC.patch | 7 ++- .../0003-Fix-missing-abseil-linkages.patch | 7 ++- ...4-Fix-protobuf_python-for-systemlibs.patch | 15 +++-- .../patches/0005-Add-absl_log-systemlib.patch | 9 ++- ...layout_proto_cc-if-protobuf-linkage-.patch | 9 ++- .../0007-Fix-further-abseil-linkage.patch | 7 ++- ...Add-constraint-to-pybind11-systemlib.patch | 7 ++- ...-file-ending-for-flatbuffers-LICENSE.patch | 7 ++- .../0010-Use-correct-hermetic-python.patch | 9 ++- ...n_types_py_pb2-to-protobuf-systemlib.patch | 7 ++- .../patches/0012-Add-protobuf-toolchain.patch | 7 ++- recipe/patches/0013-fix-genproto.patch | 9 ++- ...ome-usage-of-absl-str_format-in-CUDA.patch | 11 ++-- ...5-Adjust-relative-path-for-libdevice.patch | 13 +++-- ...absl_log_flags-instead-of-absl_flags.patch | 9 ++- ...Definition-for-libabsl_vlog_config_i.patch | 7 ++- .../0018-add-absl_string_view-target.patch | 7 ++- .../0019-add-absl_nullability-target.patch | 7 ++- .../0020-add-absl_prefetch-target.patch | 7 ++- .../0021-add-absl_die_if_null-target.patch | 7 ++- .../0022-add-absl_crc32c-targets.patch | 9 ++- ...3-add-kernel_timeout_internal-target.patch | 7 ++- ...warning-that-clang-falsely-treats-as.patch | 9 ++- ...de-BUILD_PREFIX-in-build_pip_package.patch | 9 ++- ...-sparse_core_layout_proto_cc-headers.patch | 9 ++- .../0027-Protobuf-5-compatability.patch | 55 ++++++++++--------- 27 files changed, 181 insertions(+), 118 deletions(-) diff --git a/recipe/patches/0001-loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch index c6df4eb87..bd2e2e61a 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,42 +1,22 @@ -From e6a16ebf1cb912b32f8fa6f9b26dbe8add0d930b Mon Sep 17 00:00:00 2001 +From 8f4944fbf9840b311ce90ec3645f13a83e0bfb15 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 Subject: [PATCH 01/27] loosen requirements -* Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem -* unpin numpy Co-authored-by: Mark Harfouche Co-authored-by: ngam Co-authored-by: Uwe L. Korn --- - tensorflow/tools/pip_package/setup.py | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) + tensorflow/tools/pip_package/setup.py | 2 -- + 1 file changed, 2 deletions(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 88da8b54..ac24634f 100644 +index 746adba6911..a08ea45d5a2 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py -@@ -82,16 +82,12 @@ REQUIRED_PACKAGES = [ - 'gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2', - 'google_pasta >= 0.1.1', - 'h5py >= 3.10.0', -- 'libclang >= 13.0.0', - 'ml_dtypes >= 0.3.1, < 0.5.0', -- # TODO(b/304751256): Adjust the numpy pin to a single version, when ready -- 'numpy >= 1.23.5, < 2.0.0 ; python_version <= "3.11"', -- 'numpy >= 1.26.0, < 2.0.0 ; python_version >= "3.12"', - 'opt_einsum >= 2.3.2', - 'packaging', - # pylint:disable=line-too-long - ( -- 'protobuf>=3.20.3,<5.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5' -+ 'protobuf>=3.20.3,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5' - ), - 'requests >= 2.21.0, < 3', - 'setuptools', -@@ -99,8 +95,6 @@ REQUIRED_PACKAGES = [ +@@ -94,8 +94,6 @@ REQUIRED_PACKAGES = [ 'termcolor >= 1.1.0', 'typing_extensions >= 3.6.6', 'wrapt >= 1.11.0', @@ -45,3 +25,6 @@ index 88da8b54..ac24634f 100644 # grpcio does not build correctly on big-endian machines due to lack of # BoringSSL support. # See https://github.com/tensorflow/tensorflow/issues/17882. +-- +2.47.0 + diff --git a/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch b/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch index db5cd2baa..261261cc0 100644 --- a/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch +++ b/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch @@ -1,4 +1,4 @@ -From 14a1b6162855bfe8d8d16cbd054f98afba4f16e5 Mon Sep 17 00:00:00 2001 +From 104660cc81f2f4ef382b564670d26e098a2498cf Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 Subject: [PATCH 02/27] Add additional absl_synchronization linkage to gRPC @@ -8,7 +8,7 @@ Subject: [PATCH 02/27] Add additional absl_synchronization linkage to gRPC 1 file changed, 3 insertions(+) diff --git a/third_party/systemlibs/grpc.BUILD b/third_party/systemlibs/grpc.BUILD -index 8b703f11..417baf5d 100644 +index 8b703f11556..417baf5d342 100644 --- a/third_party/systemlibs/grpc.BUILD +++ b/third_party/systemlibs/grpc.BUILD @@ -10,6 +10,7 @@ cc_library( @@ -35,3 +35,6 @@ index 8b703f11..417baf5d 100644 ], visibility = ["//visibility:public"], ) +-- +2.47.0 + diff --git a/recipe/patches/0003-Fix-missing-abseil-linkages.patch b/recipe/patches/0003-Fix-missing-abseil-linkages.patch index 047d0fb0f..04c0e80fc 100644 --- a/recipe/patches/0003-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0003-Fix-missing-abseil-linkages.patch @@ -1,4 +1,4 @@ -From 7dc829cca3ae349278ca7f9186c5c5db5a81a390 Mon Sep 17 00:00:00 2001 +From 9662c813ce22d5899a06f4c59e9eb8d5eaf3b54a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 Subject: [PATCH 03/27] Fix missing abseil linkages @@ -8,7 +8,7 @@ Subject: [PATCH 03/27] Fix missing abseil linkages 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD -index fa9a7a84..d04776c9 100644 +index fa9a7a84f67..d04776c98bf 100644 --- a/third_party/absl/system.absl.strings.BUILD +++ b/third_party/absl/system.absl.strings.BUILD @@ -26,7 +26,7 @@ cc_library( @@ -20,3 +20,6 @@ index fa9a7a84..d04776c9 100644 deps = [ ":str_format", "//absl/container:compressed_tuple", +-- +2.47.0 + diff --git a/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch index 925704b26..95d8ca456 100644 --- a/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch @@ -1,4 +1,4 @@ -From d70aa0acf092f069a154502100abd8c6f230129d Mon Sep 17 00:00:00 2001 +From 5f5c511cf6f269856e1c97fd8388764b6033da61 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 Subject: [PATCH 04/27] Fix protobuf_python for systemlibs @@ -12,10 +12,10 @@ Subject: [PATCH 04/27] Fix protobuf_python for systemlibs create mode 100644 third_party/systemlibs/protobuf_python.bzl diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl -index fd29dff0..dc78011d 100644 +index be83c971749..5320aa187fd 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl -@@ -382,6 +382,7 @@ def _tf_repositories(): +@@ -390,6 +390,7 @@ def _tf_repositories(): system_link_files = { "//third_party/systemlibs:protobuf.bzl": "protobuf.bzl", "//third_party/systemlibs:protobuf_deps.bzl": "protobuf_deps.bzl", @@ -23,7 +23,7 @@ index fd29dff0..dc78011d 100644 }, urls = tf_mirror_urls("https://github.com/protocolbuffers/protobuf/archive/v3.21.9.zip"), ) -@@ -786,10 +787,10 @@ def _tf_repositories(): +@@ -794,10 +795,10 @@ def _tf_repositories(): tf_http_archive( name = "pybind11_protobuf", @@ -40,7 +40,7 @@ index fd29dff0..dc78011d 100644 tf_http_archive( diff --git a/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch b/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch new file mode 100644 -index 00000000..18a1ddf8 +index 00000000000..18a1ddf84f3 --- /dev/null +++ b/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch @@ -0,0 +1,26 @@ @@ -72,7 +72,7 @@ index 00000000..18a1ddf8 + diff --git a/third_party/systemlibs/protobuf_python.bzl b/third_party/systemlibs/protobuf_python.bzl new file mode 100644 -index 00000000..982617a7 +index 00000000000..982617a765c --- /dev/null +++ b/third_party/systemlibs/protobuf_python.bzl @@ -0,0 +1,5 @@ @@ -81,3 +81,6 @@ index 00000000..982617a7 + # hdrs = ["google/protobuf/proto_api.h"], + visibility = ["//visibility:public"], +) +-- +2.47.0 + diff --git a/recipe/patches/0005-Add-absl_log-systemlib.patch b/recipe/patches/0005-Add-absl_log-systemlib.patch index fffca4ebc..70c3fb7e9 100644 --- a/recipe/patches/0005-Add-absl_log-systemlib.patch +++ b/recipe/patches/0005-Add-absl_log-systemlib.patch @@ -1,4 +1,4 @@ -From 6d4c056204f6417cc7b01706d0a6b063a50e40e3 Mon Sep 17 00:00:00 2001 +From bdf51237e8fa9db086f9cfcc1a9badec3df86461 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 Subject: [PATCH 05/27] Add absl_log systemlib @@ -11,7 +11,7 @@ Subject: [PATCH 05/27] Add absl_log systemlib diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD new file mode 100644 -index 00000000..0248bda0 +index 00000000000..0248bda0f52 --- /dev/null +++ b/third_party/absl/system.absl.log.BUILD @@ -0,0 +1,22 @@ @@ -38,7 +38,7 @@ index 00000000..0248bda0 + ], +) diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl -index 06f75166..c54df3cf 100644 +index 9565a82c331..addb2410abd 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -20,6 +20,7 @@ def repo(): @@ -49,3 +49,6 @@ index 06f75166..c54df3cf 100644 "memory", "meta", "numeric", +-- +2.47.0 + diff --git a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 77c293cb5..0ad7d31d0 100644 --- a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,4 +1,4 @@ -From 5c31fdbd5aec3c392ae578bcac615c4d2c77e564 Mon Sep 17 00:00:00 2001 +From be37f93d76fea61793f3d4e4e133a1c2e74662db Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 Subject: [PATCH 06/27] Omit linking to layout_proto_cc if protobuf linkage is @@ -9,10 +9,10 @@ Subject: [PATCH 06/27] Omit linking to layout_proto_cc if protobuf linkage is 1 file changed, 1 deletion(-) diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD -index c3f9a377..b0432b14 100644 +index 0ad8e84b889..43843f32910 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD -@@ -1366,7 +1366,6 @@ tf_python_pybind_extension( +@@ -1363,7 +1363,6 @@ tf_python_pybind_extension( features = ["-layering_check"], deps = [ ":pywrap_densor_device_headers", @@ -20,3 +20,6 @@ index c3f9a377..b0432b14 100644 "//tensorflow/python/lib/core:pybind11_lib", "//tensorflow/python/lib/core:pybind11_status_headers", "//third_party/python_runtime:headers", # buildcleaner: keep +-- +2.47.0 + diff --git a/recipe/patches/0007-Fix-further-abseil-linkage.patch b/recipe/patches/0007-Fix-further-abseil-linkage.patch index 000b22397..3e8778cff 100644 --- a/recipe/patches/0007-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0007-Fix-further-abseil-linkage.patch @@ -1,4 +1,4 @@ -From 46645306963d53e96f4bde85a7a7fd4960a5a447 Mon Sep 17 00:00:00 2001 +From be174a9eab78a07aac031a68de1355f51889f04e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 Subject: [PATCH 07/27] Fix further abseil linkage @@ -8,7 +8,7 @@ Subject: [PATCH 07/27] Fix further abseil linkage 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index d6bf8748..b3e42f4d 100644 +index d6bf8748dee..b3e42f4dd8b 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -17,12 +17,22 @@ package(default_visibility = ["//visibility:public"]) @@ -36,3 +36,6 @@ index d6bf8748..b3e42f4d 100644 visibility = [ "//absl:__subpackages__", ], +-- +2.47.0 + diff --git a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch index 64e6905e6..ffe60effe 100644 --- a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch @@ -1,4 +1,4 @@ -From 6d8aae7e5e303b9b0bb6731e13032388d4e38d50 Mon Sep 17 00:00:00 2001 +From e935cf3f557e99bcdb2f6cfa55a53e448d07c3f0 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 Subject: [PATCH 08/27] Add constraint to pybind11 systemlib @@ -8,7 +8,7 @@ Subject: [PATCH 08/27] Add constraint to pybind11 systemlib 1 file changed, 6 insertions(+) diff --git a/third_party/systemlibs/pybind11.BUILD b/third_party/systemlibs/pybind11.BUILD -index 44e7496f..21ec073b 100644 +index 44e7496fc25..21ec073b7a4 100644 --- a/third_party/systemlibs/pybind11.BUILD +++ b/third_party/systemlibs/pybind11.BUILD @@ -6,3 +6,9 @@ cc_library( @@ -21,3 +21,6 @@ index 44e7496f..21ec073b 100644 + name = "osx", + constraint_values = ["@platforms//os:osx"], +) +-- +2.47.0 + diff --git a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch index 430ed382f..1e4513d1e 100644 --- a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,4 +1,4 @@ -From a2a3cc6043d732aa17498ef46735405498c59bf7 Mon Sep 17 00:00:00 2001 +From e06239813185b1575a21c7d8ce8b14bd720ae1c6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 Subject: [PATCH 09/27] Different file ending for flatbuffers LICENSE @@ -8,7 +8,7 @@ Subject: [PATCH 09/27] Different file ending for flatbuffers LICENSE 1 file changed, 5 insertions(+) diff --git a/third_party/flatbuffers/BUILD.system b/third_party/flatbuffers/BUILD.system -index 8fe4d7a5..297f8baf 100644 +index 8fe4d7a5907..297f8baf0c0 100644 --- a/third_party/flatbuffers/BUILD.system +++ b/third_party/flatbuffers/BUILD.system @@ -5,6 +5,11 @@ filegroup( @@ -23,3 +23,6 @@ index 8fe4d7a5..297f8baf 100644 # Public flatc library to compile flatbuffer files at runtime. cc_library( name = "flatbuffers", +-- +2.47.0 + diff --git a/recipe/patches/0010-Use-correct-hermetic-python.patch b/recipe/patches/0010-Use-correct-hermetic-python.patch index 757f74b9f..f4ad61a63 100644 --- a/recipe/patches/0010-Use-correct-hermetic-python.patch +++ b/recipe/patches/0010-Use-correct-hermetic-python.patch @@ -1,4 +1,4 @@ -From 95485b5d00566df1982a410672821a951697d05f Mon Sep 17 00:00:00 2001 +From cf6cfb2ccb6f6449e88e84a4fa2d757b13f3ce86 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 Subject: [PATCH 10/27] Use correct, hermetic python @@ -9,7 +9,7 @@ Subject: [PATCH 10/27] Use correct, hermetic python 2 files changed, 7 insertions(+) diff --git a/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py b/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py -index 8352b974..7eed8b4e 100644 +index 8352b974996..7eed8b4e373 100644 --- a/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py +++ b/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py @@ -14,6 +14,11 @@ @@ -25,7 +25,7 @@ index 8352b974..7eed8b4e 100644 import re import string diff --git a/tensorflow/python/tools/api/generator/create_python_api.py b/tensorflow/python/tools/api/generator/create_python_api.py -index cd76ae73..c12533c9 100644 +index cd76ae73f77..c12533c9b57 100644 --- a/tensorflow/python/tools/api/generator/create_python_api.py +++ b/tensorflow/python/tools/api/generator/create_python_api.py @@ -18,6 +18,8 @@ import collections @@ -37,3 +37,6 @@ index cd76ae73..c12533c9 100644 from tensorflow.python.tools.api.generator import doc_srcs from tensorflow.python.util import tf_decorator +-- +2.47.0 + diff --git a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index ee28b2922..450ba5d66 100644 --- a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,4 +1,4 @@ -From a878cc2a275f4887f0309ace423a049a30b1a39e Mon Sep 17 00:00:00 2001 +From 57f1c15968f28b4f0eaeaf731a50045693b984da Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 Subject: [PATCH 11/27] Add well_known_types_py_pb2 to protobuf systemlib @@ -8,7 +8,7 @@ Subject: [PATCH 11/27] Add well_known_types_py_pb2 to protobuf systemlib 1 file changed, 7 insertions(+) diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD -index c7d94060..504bc81a 100644 +index c7d940605f9..504bc81af0d 100644 --- a/third_party/systemlibs/protobuf.BUILD +++ b/third_party/systemlibs/protobuf.BUILD @@ -111,3 +111,10 @@ py_library( @@ -22,3 +22,6 @@ index c7d94060..504bc81a 100644 + srcs = [proto[1][0] for proto in WELL_KNOWN_PROTO_MAP.items()], + visibility = ["//visibility:public"], +) +-- +2.47.0 + diff --git a/recipe/patches/0012-Add-protobuf-toolchain.patch b/recipe/patches/0012-Add-protobuf-toolchain.patch index 4cc9dea81..12bd1c6df 100644 --- a/recipe/patches/0012-Add-protobuf-toolchain.patch +++ b/recipe/patches/0012-Add-protobuf-toolchain.patch @@ -1,4 +1,4 @@ -From de24030836aeecfa290e5f5ba11e61f9c6dbcbc5 Mon Sep 17 00:00:00 2001 +From 36b3f8835ad3cd1bb3b6cd3ea42be59b0f830921 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 Subject: [PATCH 12/27] Add protobuf toolchain @@ -8,7 +8,7 @@ Subject: [PATCH 12/27] Add protobuf toolchain 1 file changed, 14 insertions(+) diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD -index 504bc81a..4f105d33 100644 +index 504bc81af0d..4f105d33f84 100644 --- a/third_party/systemlibs/protobuf.BUILD +++ b/third_party/systemlibs/protobuf.BUILD @@ -65,12 +65,26 @@ cc_library( @@ -38,3 +38,6 @@ index 504bc81a..4f105d33 100644 cc_library( name = "protoc_lib", linkopts = ["-lprotoc"], +-- +2.47.0 + diff --git a/recipe/patches/0013-fix-genproto.patch b/recipe/patches/0013-fix-genproto.patch index e6da4e235..658a426b2 100644 --- a/recipe/patches/0013-fix-genproto.patch +++ b/recipe/patches/0013-fix-genproto.patch @@ -1,4 +1,4 @@ -From f9bf16ddf1cb2d288694871fa3383d90aa874a1a Mon Sep 17 00:00:00 2001 +From 929da4b59e8119551d5b1c2c558a48f1ce4c54e6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 Subject: [PATCH 13/27] fix genproto @@ -8,10 +8,10 @@ Subject: [PATCH 13/27] fix genproto 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl b/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl -index 35cdcdc5..ca4bdd0e 100644 +index 726f54634c5..62837c84837 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl +++ b/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl -@@ -401,10 +401,7 @@ def py_proto_library( +@@ -400,10 +400,7 @@ def py_proto_library( genproto_deps = [] for dep in deps: @@ -23,3 +23,6 @@ index 35cdcdc5..ca4bdd0e 100644 proto_gen( name = name + "_genproto", +-- +2.47.0 + diff --git a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch index ad416592c..c4bad18ac 100644 --- a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,4 +1,4 @@ -From ae92d44a00de6f162bdc045052be0d6140fc081f Mon Sep 17 00:00:00 2001 +From c88ca31929abb6fa46bbd7baadd2ee2055e18c3b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 Subject: [PATCH 14/27] Remove some usage of absl::str_format in CUDA @@ -13,7 +13,7 @@ yield the same results without the usage of absl. 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tensorflow/core/framework/resource_base.h b/tensorflow/core/framework/resource_base.h -index 46a76ea0..2f8d0a21 100644 +index 46a76ea094c..2f8d0a21878 100644 --- a/tensorflow/core/framework/resource_base.h +++ b/tensorflow/core/framework/resource_base.h @@ -18,8 +18,9 @@ limitations under the License. @@ -42,7 +42,7 @@ index 46a76ea0..2f8d0a21 100644 // Returns memory used by this resource. diff --git a/tensorflow/core/framework/resource_var.cc b/tensorflow/core/framework/resource_var.cc -index c441a8e2..7e1f1fdf 100644 +index c441a8e2648..7e1f1fdf0ea 100644 --- a/tensorflow/core/framework/resource_var.cc +++ b/tensorflow/core/framework/resource_var.cc @@ -18,6 +18,8 @@ limitations under the License. @@ -55,7 +55,7 @@ index c441a8e2..7e1f1fdf 100644 Status Var::AsGraphDef(GraphDefBuilder* builder, Node** out) const { diff --git a/tensorflow/core/kernels/conv_ops_gpu.h b/tensorflow/core/kernels/conv_ops_gpu.h -index 627450ef..d0c97527 100644 +index 627450ef2d6..d0c97527284 100644 --- a/tensorflow/core/kernels/conv_ops_gpu.h +++ b/tensorflow/core/kernels/conv_ops_gpu.h @@ -22,7 +22,7 @@ limitations under the License. @@ -67,3 +67,6 @@ index 627450ef..d0c97527 100644 #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/kernels/gpu_utils.h" #include "tensorflow/core/lib/gtl/inlined_vector.h" +-- +2.47.0 + diff --git a/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch index 3cc7bdd0b..e7bc3e5d5 100644 --- a/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch @@ -1,4 +1,4 @@ -From 38ca4efe105b78c1622f2246cc5b66c5c6aa5e7a Mon Sep 17 00:00:00 2001 +From 89df91e9b6489afbfafff439eb00642754a63261 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 Subject: [PATCH 15/27] Adjust relative path for libdevice @@ -8,15 +8,18 @@ Subject: [PATCH 15/27] Adjust relative path for libdevice 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc b/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc -index 46321e74..fd0cab0d 100644 +index ac0a804b4df..fe8305fd893 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc +++ b/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc -@@ -51,7 +51,7 @@ std::vector CandidateCudaRoots() { +@@ -69,7 +69,7 @@ std::vector CandidateCudaRoots() { // TF lib binaries are located in both the package's root dir and within a // 'python' subdirectory (for pywrap libs). So we check two possible paths // relative to the current binary for the wheel-based nvcc package. - for (auto path : {"../nvidia/cuda_nvcc", "../../nvidia/cuda_nvcc"}) + for (auto path : {"../nvidia/cuda_nvcc", "../../nvidia/cuda_nvcc", "../../../.."}) roots.emplace_back(io::JoinPath(dir, path)); - } - #endif // defined(PLATFORM_POSIX) && !defined(__APPLE__) + + // Also add the path to the copy of libdevice.10.bc that we include within +-- +2.47.0 + diff --git a/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch index a60d2f5a7..5c630378f 100644 --- a/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,4 +1,4 @@ -From 346c37a3c4273ee4d65a9275c26617b391876c33 Mon Sep 17 00:00:00 2001 +From 3884869677ce35c67842a530099fd9eaf595ecf9 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 Subject: [PATCH 16/27] Link to absl_log_flags instead of absl_flags @@ -9,7 +9,7 @@ Subject: [PATCH 16/27] Link to absl_log_flags instead of absl_flags 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/absl/system.absl.flags.BUILD b/third_party/absl/system.absl.flags.BUILD -index aff653c7..ee2e1bfe 100644 +index aff653c7e5b..ee2e1bfe5e3 100644 --- a/third_party/absl/system.absl.flags.BUILD +++ b/third_party/absl/system.absl.flags.BUILD @@ -97,7 +97,7 @@ cc_library( @@ -22,7 +22,7 @@ index aff653c7..ee2e1bfe 100644 ":config", ":flag_internal", diff --git a/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD b/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD -index aff653c7..ee2e1bfe 100644 +index aff653c7e5b..ee2e1bfe5e3 100644 --- a/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD +++ b/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD @@ -97,7 +97,7 @@ cc_library( @@ -34,3 +34,6 @@ index aff653c7..ee2e1bfe 100644 deps = [ ":config", ":flag_internal", +-- +2.47.0 + diff --git a/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index a69d1c977..b58ae2c16 100644 --- a/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,4 +1,4 @@ -From 81ff1b5ec7052ab02abc008d031b9a85a82069e0 Mon Sep 17 00:00:00 2001 +From 66af77db668f925c4bdc1b5886aa754f54a014fd Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 Subject: [PATCH 17/27] Update ABSL Log Definition for @@ -9,7 +9,7 @@ Subject: [PATCH 17/27] Update ABSL Log Definition for 1 file changed, 2 insertions(+) diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD -index 0248bda0..1fe1e342 100644 +index 0248bda0f52..1fe1e342594 100644 --- a/third_party/absl/system.absl.log.BUILD +++ b/third_party/absl/system.absl.log.BUILD @@ -5,6 +5,7 @@ package(default_visibility = ["//visibility:public"]) @@ -28,3 +28,6 @@ index 0248bda0..1fe1e342 100644 "-labsl_log_internal_check_op", "-labsl_log_internal_message", "-labsl_log_internal_nullguard", +-- +2.47.0 + diff --git a/recipe/patches/0018-add-absl_string_view-target.patch b/recipe/patches/0018-add-absl_string_view-target.patch index c0b4ad49e..d818f837d 100644 --- a/recipe/patches/0018-add-absl_string_view-target.patch +++ b/recipe/patches/0018-add-absl_string_view-target.patch @@ -1,4 +1,4 @@ -From 3d79a13204bb6fa626dc1cb82e03506280a53590 Mon Sep 17 00:00:00 2001 +From 134f011001350c88b2cda80242ce81a8276d1098 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 Subject: [PATCH 18/27] add absl_string_view target @@ -8,7 +8,7 @@ Subject: [PATCH 18/27] add absl_string_view target 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD -index d04776c9..9f537def 100644 +index d04776c98bf..9f537def3d7 100644 --- a/third_party/absl/system.absl.strings.BUILD +++ b/third_party/absl/system.absl.strings.BUILD @@ -2,6 +2,18 @@ load("@rules_cc//cc:defs.bzl", "cc_library") @@ -39,3 +39,6 @@ index d04776c9..9f537def 100644 deps = [ ":str_format", "//absl/container:compressed_tuple", +-- +2.47.0 + diff --git a/recipe/patches/0019-add-absl_nullability-target.patch b/recipe/patches/0019-add-absl_nullability-target.patch index f094ab3cb..7094a8ab4 100644 --- a/recipe/patches/0019-add-absl_nullability-target.patch +++ b/recipe/patches/0019-add-absl_nullability-target.patch @@ -1,4 +1,4 @@ -From c1ab28a6ca9909f0310cac9008569a5df03ef4a1 Mon Sep 17 00:00:00 2001 +From b08b026ad3d5d9e33195762445d79d7bf4321d75 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 Subject: [PATCH 19/27] add absl_nullability target @@ -8,7 +8,7 @@ Subject: [PATCH 19/27] add absl_nullability target 1 file changed, 8 insertions(+) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index b3e42f4d..a423d5f7 100644 +index b3e42f4dd8b..a423d5f70da 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -25,6 +25,14 @@ cc_library( @@ -26,3 +26,6 @@ index b3e42f4d..a423d5f7 100644 cc_library( name = "raw_logging_internal", linkopts = [ +-- +2.47.0 + diff --git a/recipe/patches/0020-add-absl_prefetch-target.patch b/recipe/patches/0020-add-absl_prefetch-target.patch index 32b944163..1ab4d6b69 100644 --- a/recipe/patches/0020-add-absl_prefetch-target.patch +++ b/recipe/patches/0020-add-absl_prefetch-target.patch @@ -1,4 +1,4 @@ -From 16b223f630d00a46d1c90ad129924afb6f7143e4 Mon Sep 17 00:00:00 2001 +From 5b46fd32f42af1a470a0fa28acb97d6bd70516f7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 Subject: [PATCH 20/27] add absl_prefetch target @@ -8,7 +8,7 @@ Subject: [PATCH 20/27] add absl_prefetch target 1 file changed, 8 insertions(+) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index a423d5f7..b31592d3 100644 +index a423d5f70da..b31592d31a3 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -116,6 +116,14 @@ cc_library( @@ -26,3 +26,6 @@ index a423d5f7..b31592d3 100644 cc_library( name = "strerror", linkopts = ["-labsl_strerror"], +-- +2.47.0 + diff --git a/recipe/patches/0021-add-absl_die_if_null-target.patch b/recipe/patches/0021-add-absl_die_if_null-target.patch index 43e54b7df..5bfda9c77 100644 --- a/recipe/patches/0021-add-absl_die_if_null-target.patch +++ b/recipe/patches/0021-add-absl_die_if_null-target.patch @@ -1,4 +1,4 @@ -From cf4e36f47e874278b60c2fdab575bfb33fe803ac Mon Sep 17 00:00:00 2001 +From c339cdc530d4631ca013414868b4aa69088f8df4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:46:04 +1100 Subject: [PATCH 21/27] add absl_die_if_null target @@ -8,7 +8,7 @@ Subject: [PATCH 21/27] add absl_die_if_null target 1 file changed, 11 insertions(+) diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD -index 1fe1e342..6606aaa5 100644 +index 1fe1e342594..6606aaa5dd0 100644 --- a/third_party/absl/system.absl.log.BUILD +++ b/third_party/absl/system.absl.log.BUILD @@ -2,6 +2,17 @@ load("@rules_cc//cc:defs.bzl", "cc_library") @@ -29,3 +29,6 @@ index 1fe1e342..6606aaa5 100644 cc_library( name = "log", linkopts = [ +-- +2.47.0 + diff --git a/recipe/patches/0022-add-absl_crc32c-targets.patch b/recipe/patches/0022-add-absl_crc32c-targets.patch index 5cfc12292..1ecf8f67a 100644 --- a/recipe/patches/0022-add-absl_crc32c-targets.patch +++ b/recipe/patches/0022-add-absl_crc32c-targets.patch @@ -1,4 +1,4 @@ -From 3d268a099e1a3f62922c913f049f503fb77ad613 Mon Sep 17 00:00:00 2001 +From 031dcf3b8f7dbc3e74926a4e9039b395baccf733 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:41:09 +1100 Subject: [PATCH 22/27] add absl_crc32c targets @@ -11,7 +11,7 @@ Subject: [PATCH 22/27] add absl_crc32c targets diff --git a/third_party/absl/system.absl.crc.BUILD b/third_party/absl/system.absl.crc.BUILD new file mode 100644 -index 00000000..487c36ff +index 00000000000..487c36ff45b --- /dev/null +++ b/third_party/absl/system.absl.crc.BUILD @@ -0,0 +1,70 @@ @@ -86,7 +86,7 @@ index 00000000..487c36ff + ], +) diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl -index c54df3cf..94ee77bb 100644 +index addb2410abd..e71aa167260 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -14,6 +14,7 @@ def repo(): @@ -97,3 +97,6 @@ index c54df3cf..94ee77bb 100644 "cleanup", "container", "debugging", +-- +2.47.0 + diff --git a/recipe/patches/0023-add-kernel_timeout_internal-target.patch b/recipe/patches/0023-add-kernel_timeout_internal-target.patch index e83dca615..036799961 100644 --- a/recipe/patches/0023-add-kernel_timeout_internal-target.patch +++ b/recipe/patches/0023-add-kernel_timeout_internal-target.patch @@ -1,4 +1,4 @@ -From 63e72374d50094425d0675059c2b11e3c95d3135 Mon Sep 17 00:00:00 2001 +From ce9fc32bd156da77ef41b81184a05a23df69ff54 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 23:36:48 +1100 Subject: [PATCH 23/27] add kernel_timeout_internal target @@ -8,7 +8,7 @@ Subject: [PATCH 23/27] add kernel_timeout_internal target 1 file changed, 15 insertions(+) diff --git a/third_party/absl/system.absl.synchronization.BUILD b/third_party/absl/system.absl.synchronization.BUILD -index c0fa37aa..b47309de 100644 +index c0fa37aacd7..b47309deb39 100644 --- a/third_party/absl/system.absl.synchronization.BUILD +++ b/third_party/absl/system.absl.synchronization.BUILD @@ -16,14 +16,29 @@ cc_library( @@ -41,3 +41,6 @@ index c0fa37aa..b47309de 100644 "//absl/base", "//absl/base:atomic_hook", "//absl/base:dynamic_annotations", +-- +2.47.0 + diff --git a/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch b/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch index 55b7c7ed4..ccb44ed86 100644 --- a/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch +++ b/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch @@ -1,4 +1,4 @@ -From a89bade09f737a1cd5f7e2ee7ec26b38dfb771dd Mon Sep 17 00:00:00 2001 +From 9a5c033c6bf8e697e714e30f81c58a0e82d969a8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 19 May 2024 20:52:35 +1100 Subject: [PATCH 24/27] work around for warning that clang falsely treats as @@ -10,10 +10,10 @@ see https://github.com/llvm/llvm-project/issues/92630 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc -index fb80a081..01668b2c 100644 +index f48811d13d2..0d1c0305d97 100644 --- a/.bazelrc +++ b/.bazelrc -@@ -313,7 +313,7 @@ build:ios --noenable_platform_specific_config +@@ -310,7 +310,7 @@ build:ios --noenable_platform_specific_config build:android --copt=-w build:ios --copt=-w build:linux --host_copt=-w @@ -22,3 +22,6 @@ index fb80a081..01668b2c 100644 build:windows --copt=/W0 build:windows --host_copt=/W0 +-- +2.47.0 + diff --git a/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch b/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch index c4796ac8e..dc8862c35 100644 --- a/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch +++ b/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch @@ -1,4 +1,4 @@ -From ed916a2d3c5399dbf6c71b1f6f7f07b8b1ddb8fc Mon Sep 17 00:00:00 2001 +From 5163ec6309cb06f2ebe37f846b72aa629a627301 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 12 Jul 2024 12:52:38 +0000 Subject: [PATCH 25/27] Hardcode BUILD_PREFIX in build_pip_package @@ -8,10 +8,10 @@ Subject: [PATCH 25/27] Hardcode BUILD_PREFIX in build_pip_package 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tensorflow/tools/pip_package/build_pip_package.py b/tensorflow/tools/pip_package/build_pip_package.py -index 9588fc19..2d0718af 100644 +index d882db09a10..091db3f4691 100644 --- a/tensorflow/tools/pip_package/build_pip_package.py +++ b/tensorflow/tools/pip_package/build_pip_package.py -@@ -240,12 +240,12 @@ def patch_so(srcs_dir: str) -> None: +@@ -285,12 +285,12 @@ def patch_so(srcs_dir: str) -> None: } for file, path in to_patch.items(): rpath = subprocess.check_output( @@ -27,3 +27,6 @@ index 9588fc19..2d0718af 100644 "{}/{}".format(srcs_dir, file)], check=True) +-- +2.47.0 + diff --git a/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch b/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch index 82feb5d33..db95fffc2 100644 --- a/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch +++ b/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch @@ -1,4 +1,4 @@ -From c3205a7e020e1e9ee30581b2b869ed83746136b7 Mon Sep 17 00:00:00 2001 +From c3760aad2e91c9754dfa6f994bfe197aed17e422 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 16 Jul 2024 17:18:23 +0200 Subject: [PATCH 26/27] Only link to sparse_core_layout_proto_cc headers @@ -8,10 +8,10 @@ Subject: [PATCH 26/27] Only link to sparse_core_layout_proto_cc headers 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/core/tpu/kernels/BUILD b/tensorflow/core/tpu/kernels/BUILD -index 7d55de7b..c409c1b0 100644 +index 5c1dc5da889..4d467227ba2 100644 --- a/tensorflow/core/tpu/kernels/BUILD +++ b/tensorflow/core/tpu/kernels/BUILD -@@ -1487,7 +1487,7 @@ cc_library( +@@ -1483,7 +1483,7 @@ cc_library( hdrs = ["sparse_core_layout.h"], visibility = ["//tensorflow/python/tpu:__pkg__"], # ONLY for `_pywrap_sparse_core_layout`. deps = [ @@ -20,3 +20,6 @@ index 7d55de7b..c409c1b0 100644 "//tensorflow/core/platform:stringpiece", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", +-- +2.47.0 + diff --git a/recipe/patches/0027-Protobuf-5-compatability.patch b/recipe/patches/0027-Protobuf-5-compatability.patch index 9783d1379..ddaaf0415 100644 --- a/recipe/patches/0027-Protobuf-5-compatability.patch +++ b/recipe/patches/0027-Protobuf-5-compatability.patch @@ -1,4 +1,4 @@ -From d98ec2c4eb0a0b58f0003d3b9d7ba7aeb413fe78 Mon Sep 17 00:00:00 2001 +From e9f37f6b8bbca5fb72728a3d6765dcec68a0c247 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 10 Oct 2024 19:59:31 +0200 Subject: [PATCH 27/27] Protobuf 5 compatability @@ -10,7 +10,7 @@ Subject: [PATCH 27/27] Protobuf 5 compatability .../core/ir/importexport/parse_text_proto.cc | 2 +- .../profiler/convert/hlo_to_tools_data.cc | 4 ++ .../convert/xplane_to_memory_profile.cc | 4 ++ - .../profiler/convert/xplane_to_tools_data.cc | 8 +++ + .../profiler/convert/xplane_to_tools_data.cc | 12 ++++- tensorflow/core/util/proto/proto_utils.cc | 10 ++-- tensorflow/core/util/proto/proto_utils.h | 4 +- .../proto_text/gen_proto_text_functions.cc | 4 +- @@ -18,25 +18,25 @@ Subject: [PATCH 27/27] Protobuf 5 compatability ...Migrate-from-AddError-to-RecordError.patch | 33 ++++++++++++ ...y-with-protobuf-v26-migrate-from-dep.patch | 52 +++++++++++++++++++ .../platform/default/human_readable_json.cc | 4 ++ - 14 files changed, 125 insertions(+), 12 deletions(-) + 14 files changed, 127 insertions(+), 14 deletions(-) create mode 100644 third_party/0001-Migrate-from-AddError-to-RecordError.patch create mode 100644 third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch diff --git a/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc b/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc -index ed968b54..71e16db6 100644 +index eba1ebc48ce..fe7b021b64c 100644 --- a/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc +++ b/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc @@ -57,7 +57,7 @@ namespace { // Error collector that simply ignores errors reported. - class NoOpErrorCollector : public protobuf::io::ErrorCollector { + class NoOpErrorCollector : public tsl::protobuf::io::ErrorCollector { public: - void AddError(int line, int column, const std::string& message) override {} -+ void RecordError(int line, int column, const absl::string_view message) override {} ++ void RecordError(int line, int column, const std::string& message) override {} }; bool LoadHloProto(const std::string& contents, xla::HloProto* hlo_proto) { diff --git a/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc b/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc -index 906a058d..0c673310 100644 +index 906a058d04e..9938a0b4c29 100644 --- a/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc +++ b/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc @@ -30,7 +30,7 @@ namespace { @@ -44,12 +44,12 @@ index 906a058d..0c673310 100644 class NoOpErrorCollector : public protobuf::io::ErrorCollector { public: - void AddError(int line, int column, const std::string& message) override {} -+ void RecordError(int line, int column, absl::string_view message) override {} ++ void RecordError(int line, int column, const std::string& message) override {} }; } // namespace diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc -index 0e4e11d8..912970b7 100644 +index 0e4e11d81e9..912970b7d82 100644 --- a/tensorflow/core/debug/debug_io_utils.cc +++ b/tensorflow/core/debug/debug_io_utils.cc @@ -94,7 +94,11 @@ Event PrepareChunkEventProto(const DebugNodeKey& debug_node_key, @@ -65,7 +65,7 @@ index 0e4e11d8..912970b7 100644 metadata, &json_output, json_options); if (status.ok()) { diff --git a/tensorflow/core/ir/importexport/parse_text_proto.cc b/tensorflow/core/ir/importexport/parse_text_proto.cc -index c631785c..3ab6e17c 100644 +index c631785cefc..cd3e2ec7747 100644 --- a/tensorflow/core/ir/importexport/parse_text_proto.cc +++ b/tensorflow/core/ir/importexport/parse_text_proto.cc @@ -35,7 +35,7 @@ namespace { @@ -73,12 +73,12 @@ index c631785c..3ab6e17c 100644 class NoOpErrorCollector : public tensorflow::protobuf::io::ErrorCollector { public: - void AddError(int line, int column, const std::string& message) override {} -+ void RecordError(int line, int column, const absl::string_view message) override {} ++ void RecordError(int line, int column, const std::string& message) override {} }; } // namespace diff --git a/tensorflow/core/profiler/convert/hlo_to_tools_data.cc b/tensorflow/core/profiler/convert/hlo_to_tools_data.cc -index 7fbcd397..d17f3402 100644 +index 7fbcd397906..e6b11658d5b 100644 --- a/tensorflow/core/profiler/convert/hlo_to_tools_data.cc +++ b/tensorflow/core/profiler/convert/hlo_to_tools_data.cc @@ -62,7 +62,11 @@ absl::StatusOr ConvertHloProtoToMemoryViewer( @@ -87,14 +87,14 @@ index 7fbcd397..d17f3402 100644 tensorflow::protobuf::util::JsonPrintOptions options; +#if GOOGLE_PROTOBUF_VERSION < 5026000 options.always_print_primitive_fields = true; -+#else ++# else + options.always_print_fields_with_no_presence = true; +#endif auto encoded_status = tensorflow::protobuf::util::MessageToJsonString( result_or.value(), &json_output, options); if (!encoded_status.ok()) { diff --git a/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc b/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc -index b289f54b..38e89170 100644 +index b289f54baa6..38e89170f42 100644 --- a/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc +++ b/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc @@ -529,7 +529,11 @@ void ProcessMemoryProfileProto(int64_t max_num_snapshots, @@ -110,15 +110,16 @@ index b289f54b..38e89170 100644 json_options); if (!status.ok()) { diff --git a/tensorflow/core/profiler/convert/xplane_to_tools_data.cc b/tensorflow/core/profiler/convert/xplane_to_tools_data.cc -index b623c6a9..624f2c04 100644 +index dcc7cea45f7..b974a3a1b82 100644 --- a/tensorflow/core/profiler/convert/xplane_to_tools_data.cc +++ b/tensorflow/core/profiler/convert/xplane_to_tools_data.cc @@ -218,7 +218,11 @@ absl::StatusOr ConvertMultiXSpacesToPodViewer( std::string json_output; protobuf::util::JsonPrintOptions opts; +- opts.always_print_primitive_fields = true; +#if GOOGLE_PROTOBUF_VERSION < 5026000 - opts.always_print_primitive_fields = true; ++ opts.always_print_primitive_fields = true; +#else + opts.always_print_fields_with_no_presence = true; +#endif @@ -129,8 +130,9 @@ index b623c6a9..624f2c04 100644 profile); std::string json_output; protobuf::util::JsonPrintOptions opts; +- opts.always_print_primitive_fields = true; +#if GOOGLE_PROTOBUF_VERSION < 5026000 - opts.always_print_primitive_fields = true; ++ opts.always_print_primitive_fields = true; +#else + opts.always_print_fields_with_no_presence = true; +#endif @@ -138,7 +140,7 @@ index b623c6a9..624f2c04 100644 auto encode_status = protobuf::util::MessageToJsonString(profile, &json_output, opts); diff --git a/tensorflow/core/util/proto/proto_utils.cc b/tensorflow/core/util/proto/proto_utils.cc -index 282be94a..7cfed84d 100644 +index 282be94a774..7cfed84d2a8 100644 --- a/tensorflow/core/util/proto/proto_utils.cc +++ b/tensorflow/core/util/proto/proto_utils.cc @@ -101,17 +101,17 @@ StringErrorCollector::StringErrorCollector(string* error_text, @@ -165,7 +167,7 @@ index 282be94a..7cfed84d 100644 } // namespace proto_utils diff --git a/tensorflow/core/util/proto/proto_utils.h b/tensorflow/core/util/proto/proto_utils.h -index f0347a84..c8b2a4b9 100644 +index f0347a84cbe..c8b2a4b936a 100644 --- a/tensorflow/core/util/proto/proto_utils.h +++ b/tensorflow/core/util/proto/proto_utils.h @@ -53,10 +53,10 @@ class StringErrorCollector : public protobuf::io::ErrorCollector { @@ -182,7 +184,7 @@ index f0347a84..c8b2a4b9 100644 private: string* const error_text_; diff --git a/tensorflow/tools/proto_text/gen_proto_text_functions.cc b/tensorflow/tools/proto_text/gen_proto_text_functions.cc -index 406e6641..d97eae73 100644 +index 406e6641178..d97eae7346b 100644 --- a/tensorflow/tools/proto_text/gen_proto_text_functions.cc +++ b/tensorflow/tools/proto_text/gen_proto_text_functions.cc @@ -31,8 +31,8 @@ class CrashOnErrorCollector @@ -197,10 +199,10 @@ index 406e6641..d97eae73 100644 << column << " - " << message; } diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl -index dc78011d..a4faad8f 100644 +index 5320aa187fd..32f0a39c91c 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl -@@ -870,6 +870,10 @@ def _tf_repositories(): +@@ -878,6 +878,10 @@ def _tf_repositories(): name = "riegeli", sha256 = "1d216d5c97fa60632143d209a1bb48c2a83788efdb876902e7bbc06396d5ee1f", strip_prefix = "riegeli-5d75119232cd4f6db8dfa69a1503289f050e9643", @@ -213,7 +215,7 @@ index dc78011d..a4faad8f 100644 diff --git a/third_party/0001-Migrate-from-AddError-to-RecordError.patch b/third_party/0001-Migrate-from-AddError-to-RecordError.patch new file mode 100644 -index 00000000..0ed75ee8 +index 00000000000..0ed75ee8019 --- /dev/null +++ b/third_party/0001-Migrate-from-AddError-to-RecordError.patch @@ -0,0 +1,33 @@ @@ -252,7 +254,7 @@ index 00000000..0ed75ee8 + diff --git a/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch b/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch new file mode 100644 -index 00000000..b5af8d2d +index 00000000000..b5af8d2dff5 --- /dev/null +++ b/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch @@ -0,0 +1,52 @@ @@ -309,7 +311,7 @@ index 00000000..b5af8d2d +2.34.1 + diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc b/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc -index 4f70c155..ae746f33 100644 +index 167cdd2b891..dc1ebdd10e6 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc +++ b/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc @@ -33,7 +33,11 @@ absl::StatusOr ProtoToHumanReadableJson( @@ -324,3 +326,6 @@ index 4f70c155..ae746f33 100644 auto status = protobuf::util::MessageToJsonString(proto, &result, json_options); if (!status.ok()) { +-- +2.47.0 + From 10d77551cb6220c383c46f434515368567479b76 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 19 Nov 2024 02:09:16 -0500 Subject: [PATCH 07/64] noaws --- recipe/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 409215a23..7c7d41e1f 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -191,7 +191,6 @@ build --logging=6 build --verbose_failures build --define=PREFIX=${PREFIX} build --define=PROTOBUF_INCLUDE_PATH=${PREFIX}/include -build --config=noaws build --cpu=${TARGET_CPU} build --local_cpu_resources=${CPU_COUNT} EOF From 70fb4d982aad7a459597240c25a7f2e1195544e1 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 19 Nov 2024 02:29:41 -0500 Subject: [PATCH 08/64] uwe's patches --- recipe/patches/0001-loosen-requirements.patch | 33 +++++++++--- ...absl_synchronization-linkage-to-gRPC.patch | 7 +-- .../0003-Fix-missing-abseil-linkages.patch | 7 +-- ...4-Fix-protobuf_python-for-systemlibs.patch | 11 ++-- .../patches/0005-Add-absl_log-systemlib.patch | 9 ++-- ...layout_proto_cc-if-protobuf-linkage-.patch | 7 +-- .../0007-Fix-further-abseil-linkage.patch | 7 +-- ...Add-constraint-to-pybind11-systemlib.patch | 7 +-- ...-file-ending-for-flatbuffers-LICENSE.patch | 7 +-- .../0010-Use-correct-hermetic-python.patch | 9 ++-- ...n_types_py_pb2-to-protobuf-systemlib.patch | 7 +-- .../patches/0012-Add-protobuf-toolchain.patch | 7 +-- recipe/patches/0013-fix-genproto.patch | 7 +-- ...ome-usage-of-absl-str_format-in-CUDA.patch | 11 ++-- ...5-Adjust-relative-path-for-libdevice.patch | 7 +-- ...absl_log_flags-instead-of-absl_flags.patch | 9 ++-- ...Definition-for-libabsl_vlog_config_i.patch | 7 +-- .../0018-add-absl_string_view-target.patch | 7 +-- .../0019-add-absl_nullability-target.patch | 7 +-- .../0020-add-absl_prefetch-target.patch | 7 +-- .../0021-add-absl_die_if_null-target.patch | 18 ++++--- .../0022-add-absl_crc32c-targets.patch | 9 ++-- ...3-add-kernel_timeout_internal-target.patch | 7 +-- ...warning-that-clang-falsely-treats-as.patch | 7 +-- ...de-BUILD_PREFIX-in-build_pip_package.patch | 7 +-- ...-sparse_core_layout_proto_cc-headers.patch | 7 +-- .../0027-Protobuf-5-compatability.patch | 51 +++++++++---------- 27 files changed, 114 insertions(+), 172 deletions(-) diff --git a/recipe/patches/0001-loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch index bd2e2e61a..2d84ef88e 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,22 +1,32 @@ -From 8f4944fbf9840b311ce90ec3645f13a83e0bfb15 Mon Sep 17 00:00:00 2001 +From e38b64198fe3f683895817c3685f9da939aadfd3 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 Subject: [PATCH 01/27] loosen requirements +* Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem +* unpin numpy Co-authored-by: Mark Harfouche Co-authored-by: ngam Co-authored-by: Uwe L. Korn --- - tensorflow/tools/pip_package/setup.py | 2 -- - 1 file changed, 2 deletions(-) + tensorflow/tools/pip_package/setup.py | 6 ------ + 1 file changed, 6 deletions(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 746adba6911..a08ea45d5a2 100644 +index fb37ef9b..61f6ce1f 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py -@@ -94,8 +94,6 @@ REQUIRED_PACKAGES = [ +@@ -81,7 +81,6 @@ REQUIRED_PACKAGES = [ + 'flatbuffers >= 24.3.25', + 'gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2', + 'google_pasta >= 0.1.1', +- 'libclang >= 13.0.0', + 'opt_einsum >= 2.3.2', + 'packaging', + # pylint:disable=line-too-long +@@ -94,8 +93,6 @@ REQUIRED_PACKAGES = [ 'termcolor >= 1.1.0', 'typing_extensions >= 3.6.6', 'wrapt >= 1.11.0', @@ -25,6 +35,13 @@ index 746adba6911..a08ea45d5a2 100644 # grpcio does not build correctly on big-endian machines due to lack of # BoringSSL support. # See https://github.com/tensorflow/tensorflow/issues/17882. --- -2.47.0 - +@@ -111,9 +108,6 @@ REQUIRED_PACKAGES = [ + # 'keras >= 2.14.0rc0, < 2.15' on the release branch after the branch cut. + 'tensorboard >= 2.18, < 2.19', + 'keras >= 3.5.0', +- # TODO(b/367877753): Update the upper bound to <2.2.0 once the compatibility +- # issues with numpy 2.1.0 is fixed. +- 'numpy >= 1.26.0, < 2.1.0', + 'h5py >= 3.11.0', + 'ml_dtypes >= 0.4.0, < 0.5.0', + ] diff --git a/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch b/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch index 261261cc0..16408324f 100644 --- a/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch +++ b/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch @@ -1,4 +1,4 @@ -From 104660cc81f2f4ef382b564670d26e098a2498cf Mon Sep 17 00:00:00 2001 +From f80db539ec99bf062c5e7b935d0e2391225627fc Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 Subject: [PATCH 02/27] Add additional absl_synchronization linkage to gRPC @@ -8,7 +8,7 @@ Subject: [PATCH 02/27] Add additional absl_synchronization linkage to gRPC 1 file changed, 3 insertions(+) diff --git a/third_party/systemlibs/grpc.BUILD b/third_party/systemlibs/grpc.BUILD -index 8b703f11556..417baf5d342 100644 +index 8b703f11..417baf5d 100644 --- a/third_party/systemlibs/grpc.BUILD +++ b/third_party/systemlibs/grpc.BUILD @@ -10,6 +10,7 @@ cc_library( @@ -35,6 +35,3 @@ index 8b703f11556..417baf5d342 100644 ], visibility = ["//visibility:public"], ) --- -2.47.0 - diff --git a/recipe/patches/0003-Fix-missing-abseil-linkages.patch b/recipe/patches/0003-Fix-missing-abseil-linkages.patch index 04c0e80fc..fd4a2e761 100644 --- a/recipe/patches/0003-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0003-Fix-missing-abseil-linkages.patch @@ -1,4 +1,4 @@ -From 9662c813ce22d5899a06f4c59e9eb8d5eaf3b54a Mon Sep 17 00:00:00 2001 +From 9452e8ed5d2f79b06a205807687c492e3524ade5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 Subject: [PATCH 03/27] Fix missing abseil linkages @@ -8,7 +8,7 @@ Subject: [PATCH 03/27] Fix missing abseil linkages 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD -index fa9a7a84f67..d04776c98bf 100644 +index fa9a7a84..d04776c9 100644 --- a/third_party/absl/system.absl.strings.BUILD +++ b/third_party/absl/system.absl.strings.BUILD @@ -26,7 +26,7 @@ cc_library( @@ -20,6 +20,3 @@ index fa9a7a84f67..d04776c98bf 100644 deps = [ ":str_format", "//absl/container:compressed_tuple", --- -2.47.0 - diff --git a/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch index 95d8ca456..de5739c79 100644 --- a/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch @@ -1,4 +1,4 @@ -From 5f5c511cf6f269856e1c97fd8388764b6033da61 Mon Sep 17 00:00:00 2001 +From 53fce719a6f0c64954b48d4b59b3be046b709493 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 Subject: [PATCH 04/27] Fix protobuf_python for systemlibs @@ -12,7 +12,7 @@ Subject: [PATCH 04/27] Fix protobuf_python for systemlibs create mode 100644 third_party/systemlibs/protobuf_python.bzl diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl -index be83c971749..5320aa187fd 100644 +index be83c971..5320aa18 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -390,6 +390,7 @@ def _tf_repositories(): @@ -40,7 +40,7 @@ index be83c971749..5320aa187fd 100644 tf_http_archive( diff --git a/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch b/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch new file mode 100644 -index 00000000000..18a1ddf84f3 +index 00000000..18a1ddf8 --- /dev/null +++ b/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch @@ -0,0 +1,26 @@ @@ -72,7 +72,7 @@ index 00000000000..18a1ddf84f3 + diff --git a/third_party/systemlibs/protobuf_python.bzl b/third_party/systemlibs/protobuf_python.bzl new file mode 100644 -index 00000000000..982617a765c +index 00000000..982617a7 --- /dev/null +++ b/third_party/systemlibs/protobuf_python.bzl @@ -0,0 +1,5 @@ @@ -81,6 +81,3 @@ index 00000000000..982617a765c + # hdrs = ["google/protobuf/proto_api.h"], + visibility = ["//visibility:public"], +) --- -2.47.0 - diff --git a/recipe/patches/0005-Add-absl_log-systemlib.patch b/recipe/patches/0005-Add-absl_log-systemlib.patch index 70c3fb7e9..2a9da9138 100644 --- a/recipe/patches/0005-Add-absl_log-systemlib.patch +++ b/recipe/patches/0005-Add-absl_log-systemlib.patch @@ -1,4 +1,4 @@ -From bdf51237e8fa9db086f9cfcc1a9badec3df86461 Mon Sep 17 00:00:00 2001 +From bb623beeb54b94c22a2b019a935e684cc1dff2c8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 Subject: [PATCH 05/27] Add absl_log systemlib @@ -11,7 +11,7 @@ Subject: [PATCH 05/27] Add absl_log systemlib diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD new file mode 100644 -index 00000000000..0248bda0f52 +index 00000000..0248bda0 --- /dev/null +++ b/third_party/absl/system.absl.log.BUILD @@ -0,0 +1,22 @@ @@ -38,7 +38,7 @@ index 00000000000..0248bda0f52 + ], +) diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl -index 9565a82c331..addb2410abd 100644 +index 9565a82c..addb2410 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -20,6 +20,7 @@ def repo(): @@ -49,6 +49,3 @@ index 9565a82c331..addb2410abd 100644 "memory", "meta", "numeric", --- -2.47.0 - diff --git a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 0ad7d31d0..3db49c7b3 100644 --- a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,4 +1,4 @@ -From be37f93d76fea61793f3d4e4e133a1c2e74662db Mon Sep 17 00:00:00 2001 +From a33625860c147ebd81b99a06830dfc3f70a27e98 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 Subject: [PATCH 06/27] Omit linking to layout_proto_cc if protobuf linkage is @@ -9,7 +9,7 @@ Subject: [PATCH 06/27] Omit linking to layout_proto_cc if protobuf linkage is 1 file changed, 1 deletion(-) diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD -index 0ad8e84b889..43843f32910 100644 +index 0ad8e84b..43843f32 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -1363,7 +1363,6 @@ tf_python_pybind_extension( @@ -20,6 +20,3 @@ index 0ad8e84b889..43843f32910 100644 "//tensorflow/python/lib/core:pybind11_lib", "//tensorflow/python/lib/core:pybind11_status_headers", "//third_party/python_runtime:headers", # buildcleaner: keep --- -2.47.0 - diff --git a/recipe/patches/0007-Fix-further-abseil-linkage.patch b/recipe/patches/0007-Fix-further-abseil-linkage.patch index 3e8778cff..2bc6fb46a 100644 --- a/recipe/patches/0007-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0007-Fix-further-abseil-linkage.patch @@ -1,4 +1,4 @@ -From be174a9eab78a07aac031a68de1355f51889f04e Mon Sep 17 00:00:00 2001 +From 206c175e081b4cedf15d2aa07c8fd2b21a5272ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 Subject: [PATCH 07/27] Fix further abseil linkage @@ -8,7 +8,7 @@ Subject: [PATCH 07/27] Fix further abseil linkage 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index d6bf8748dee..b3e42f4dd8b 100644 +index d6bf8748..b3e42f4d 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -17,12 +17,22 @@ package(default_visibility = ["//visibility:public"]) @@ -36,6 +36,3 @@ index d6bf8748dee..b3e42f4dd8b 100644 visibility = [ "//absl:__subpackages__", ], --- -2.47.0 - diff --git a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch index ffe60effe..9e4bc7c0a 100644 --- a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch @@ -1,4 +1,4 @@ -From e935cf3f557e99bcdb2f6cfa55a53e448d07c3f0 Mon Sep 17 00:00:00 2001 +From 6cc878513d44e08cd39b8f55f39f52b3c13893c8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 Subject: [PATCH 08/27] Add constraint to pybind11 systemlib @@ -8,7 +8,7 @@ Subject: [PATCH 08/27] Add constraint to pybind11 systemlib 1 file changed, 6 insertions(+) diff --git a/third_party/systemlibs/pybind11.BUILD b/third_party/systemlibs/pybind11.BUILD -index 44e7496fc25..21ec073b7a4 100644 +index 44e7496f..21ec073b 100644 --- a/third_party/systemlibs/pybind11.BUILD +++ b/third_party/systemlibs/pybind11.BUILD @@ -6,3 +6,9 @@ cc_library( @@ -21,6 +21,3 @@ index 44e7496fc25..21ec073b7a4 100644 + name = "osx", + constraint_values = ["@platforms//os:osx"], +) --- -2.47.0 - diff --git a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch index 1e4513d1e..784ae1c57 100644 --- a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,4 +1,4 @@ -From e06239813185b1575a21c7d8ce8b14bd720ae1c6 Mon Sep 17 00:00:00 2001 +From f7c3d89c2339cdf2517621e42666553d5ffd36da Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 Subject: [PATCH 09/27] Different file ending for flatbuffers LICENSE @@ -8,7 +8,7 @@ Subject: [PATCH 09/27] Different file ending for flatbuffers LICENSE 1 file changed, 5 insertions(+) diff --git a/third_party/flatbuffers/BUILD.system b/third_party/flatbuffers/BUILD.system -index 8fe4d7a5907..297f8baf0c0 100644 +index 8fe4d7a5..297f8baf 100644 --- a/third_party/flatbuffers/BUILD.system +++ b/third_party/flatbuffers/BUILD.system @@ -5,6 +5,11 @@ filegroup( @@ -23,6 +23,3 @@ index 8fe4d7a5907..297f8baf0c0 100644 # Public flatc library to compile flatbuffer files at runtime. cc_library( name = "flatbuffers", --- -2.47.0 - diff --git a/recipe/patches/0010-Use-correct-hermetic-python.patch b/recipe/patches/0010-Use-correct-hermetic-python.patch index f4ad61a63..5fc07b603 100644 --- a/recipe/patches/0010-Use-correct-hermetic-python.patch +++ b/recipe/patches/0010-Use-correct-hermetic-python.patch @@ -1,4 +1,4 @@ -From cf6cfb2ccb6f6449e88e84a4fa2d757b13f3ce86 Mon Sep 17 00:00:00 2001 +From 7b162495d8efdc0fd6e0aad8f598cdeed3774af4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 Subject: [PATCH 10/27] Use correct, hermetic python @@ -9,7 +9,7 @@ Subject: [PATCH 10/27] Use correct, hermetic python 2 files changed, 7 insertions(+) diff --git a/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py b/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py -index 8352b974996..7eed8b4e373 100644 +index 8352b974..7eed8b4e 100644 --- a/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py +++ b/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py @@ -14,6 +14,11 @@ @@ -25,7 +25,7 @@ index 8352b974996..7eed8b4e373 100644 import re import string diff --git a/tensorflow/python/tools/api/generator/create_python_api.py b/tensorflow/python/tools/api/generator/create_python_api.py -index cd76ae73f77..c12533c9b57 100644 +index cd76ae73..c12533c9 100644 --- a/tensorflow/python/tools/api/generator/create_python_api.py +++ b/tensorflow/python/tools/api/generator/create_python_api.py @@ -18,6 +18,8 @@ import collections @@ -37,6 +37,3 @@ index cd76ae73f77..c12533c9b57 100644 from tensorflow.python.tools.api.generator import doc_srcs from tensorflow.python.util import tf_decorator --- -2.47.0 - diff --git a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index 450ba5d66..7cf96f885 100644 --- a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,4 +1,4 @@ -From 57f1c15968f28b4f0eaeaf731a50045693b984da Mon Sep 17 00:00:00 2001 +From 1e33a03dfdaac70dbee540b901a1fee950b814a6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 Subject: [PATCH 11/27] Add well_known_types_py_pb2 to protobuf systemlib @@ -8,7 +8,7 @@ Subject: [PATCH 11/27] Add well_known_types_py_pb2 to protobuf systemlib 1 file changed, 7 insertions(+) diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD -index c7d940605f9..504bc81af0d 100644 +index c7d94060..504bc81a 100644 --- a/third_party/systemlibs/protobuf.BUILD +++ b/third_party/systemlibs/protobuf.BUILD @@ -111,3 +111,10 @@ py_library( @@ -22,6 +22,3 @@ index c7d940605f9..504bc81af0d 100644 + srcs = [proto[1][0] for proto in WELL_KNOWN_PROTO_MAP.items()], + visibility = ["//visibility:public"], +) --- -2.47.0 - diff --git a/recipe/patches/0012-Add-protobuf-toolchain.patch b/recipe/patches/0012-Add-protobuf-toolchain.patch index 12bd1c6df..58fbd9162 100644 --- a/recipe/patches/0012-Add-protobuf-toolchain.patch +++ b/recipe/patches/0012-Add-protobuf-toolchain.patch @@ -1,4 +1,4 @@ -From 36b3f8835ad3cd1bb3b6cd3ea42be59b0f830921 Mon Sep 17 00:00:00 2001 +From 70bda39b9de02070156308d9e4070c9d0e651c38 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 Subject: [PATCH 12/27] Add protobuf toolchain @@ -8,7 +8,7 @@ Subject: [PATCH 12/27] Add protobuf toolchain 1 file changed, 14 insertions(+) diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD -index 504bc81af0d..4f105d33f84 100644 +index 504bc81a..4f105d33 100644 --- a/third_party/systemlibs/protobuf.BUILD +++ b/third_party/systemlibs/protobuf.BUILD @@ -65,12 +65,26 @@ cc_library( @@ -38,6 +38,3 @@ index 504bc81af0d..4f105d33f84 100644 cc_library( name = "protoc_lib", linkopts = ["-lprotoc"], --- -2.47.0 - diff --git a/recipe/patches/0013-fix-genproto.patch b/recipe/patches/0013-fix-genproto.patch index 658a426b2..d4966c43e 100644 --- a/recipe/patches/0013-fix-genproto.patch +++ b/recipe/patches/0013-fix-genproto.patch @@ -1,4 +1,4 @@ -From 929da4b59e8119551d5b1c2c558a48f1ce4c54e6 Mon Sep 17 00:00:00 2001 +From a6a1ee1af7e7829adc68a8f05b2ad8a9273982fb Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 Subject: [PATCH 13/27] fix genproto @@ -8,7 +8,7 @@ Subject: [PATCH 13/27] fix genproto 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl b/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl -index 726f54634c5..62837c84837 100644 +index 726f5463..62837c84 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl +++ b/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl @@ -400,10 +400,7 @@ def py_proto_library( @@ -23,6 +23,3 @@ index 726f54634c5..62837c84837 100644 proto_gen( name = name + "_genproto", --- -2.47.0 - diff --git a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch index c4bad18ac..de9a6a8de 100644 --- a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,4 +1,4 @@ -From c88ca31929abb6fa46bbd7baadd2ee2055e18c3b Mon Sep 17 00:00:00 2001 +From 0472aaf3932e1ea815cfd45582c001e159fc1052 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 Subject: [PATCH 14/27] Remove some usage of absl::str_format in CUDA @@ -13,7 +13,7 @@ yield the same results without the usage of absl. 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tensorflow/core/framework/resource_base.h b/tensorflow/core/framework/resource_base.h -index 46a76ea094c..2f8d0a21878 100644 +index 46a76ea0..2f8d0a21 100644 --- a/tensorflow/core/framework/resource_base.h +++ b/tensorflow/core/framework/resource_base.h @@ -18,8 +18,9 @@ limitations under the License. @@ -42,7 +42,7 @@ index 46a76ea094c..2f8d0a21878 100644 // Returns memory used by this resource. diff --git a/tensorflow/core/framework/resource_var.cc b/tensorflow/core/framework/resource_var.cc -index c441a8e2648..7e1f1fdf0ea 100644 +index c441a8e2..7e1f1fdf 100644 --- a/tensorflow/core/framework/resource_var.cc +++ b/tensorflow/core/framework/resource_var.cc @@ -18,6 +18,8 @@ limitations under the License. @@ -55,7 +55,7 @@ index c441a8e2648..7e1f1fdf0ea 100644 Status Var::AsGraphDef(GraphDefBuilder* builder, Node** out) const { diff --git a/tensorflow/core/kernels/conv_ops_gpu.h b/tensorflow/core/kernels/conv_ops_gpu.h -index 627450ef2d6..d0c97527284 100644 +index 627450ef..d0c97527 100644 --- a/tensorflow/core/kernels/conv_ops_gpu.h +++ b/tensorflow/core/kernels/conv_ops_gpu.h @@ -22,7 +22,7 @@ limitations under the License. @@ -67,6 +67,3 @@ index 627450ef2d6..d0c97527284 100644 #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/kernels/gpu_utils.h" #include "tensorflow/core/lib/gtl/inlined_vector.h" --- -2.47.0 - diff --git a/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch index e7bc3e5d5..f465fab54 100644 --- a/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch @@ -1,4 +1,4 @@ -From 89df91e9b6489afbfafff439eb00642754a63261 Mon Sep 17 00:00:00 2001 +From f44de9a6a74b949da5681b31eb51b7bc601110fb Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 Subject: [PATCH 15/27] Adjust relative path for libdevice @@ -8,7 +8,7 @@ Subject: [PATCH 15/27] Adjust relative path for libdevice 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc b/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc -index ac0a804b4df..fe8305fd893 100644 +index ac0a804b..fe8305fd 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc +++ b/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc @@ -69,7 +69,7 @@ std::vector CandidateCudaRoots() { @@ -20,6 +20,3 @@ index ac0a804b4df..fe8305fd893 100644 roots.emplace_back(io::JoinPath(dir, path)); // Also add the path to the copy of libdevice.10.bc that we include within --- -2.47.0 - diff --git a/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch index 5c630378f..76429170d 100644 --- a/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,4 +1,4 @@ -From 3884869677ce35c67842a530099fd9eaf595ecf9 Mon Sep 17 00:00:00 2001 +From 786e194933fc0aedf991ed6159868e4a06b72ea3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 Subject: [PATCH 16/27] Link to absl_log_flags instead of absl_flags @@ -9,7 +9,7 @@ Subject: [PATCH 16/27] Link to absl_log_flags instead of absl_flags 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/absl/system.absl.flags.BUILD b/third_party/absl/system.absl.flags.BUILD -index aff653c7e5b..ee2e1bfe5e3 100644 +index aff653c7..ee2e1bfe 100644 --- a/third_party/absl/system.absl.flags.BUILD +++ b/third_party/absl/system.absl.flags.BUILD @@ -97,7 +97,7 @@ cc_library( @@ -22,7 +22,7 @@ index aff653c7e5b..ee2e1bfe5e3 100644 ":config", ":flag_internal", diff --git a/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD b/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD -index aff653c7e5b..ee2e1bfe5e3 100644 +index aff653c7..ee2e1bfe 100644 --- a/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD +++ b/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD @@ -97,7 +97,7 @@ cc_library( @@ -34,6 +34,3 @@ index aff653c7e5b..ee2e1bfe5e3 100644 deps = [ ":config", ":flag_internal", --- -2.47.0 - diff --git a/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index b58ae2c16..4b71c8bac 100644 --- a/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,4 +1,4 @@ -From 66af77db668f925c4bdc1b5886aa754f54a014fd Mon Sep 17 00:00:00 2001 +From b911e2b40323f89503fa8475abf017d3a42516f6 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 Subject: [PATCH 17/27] Update ABSL Log Definition for @@ -9,7 +9,7 @@ Subject: [PATCH 17/27] Update ABSL Log Definition for 1 file changed, 2 insertions(+) diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD -index 0248bda0f52..1fe1e342594 100644 +index 0248bda0..1fe1e342 100644 --- a/third_party/absl/system.absl.log.BUILD +++ b/third_party/absl/system.absl.log.BUILD @@ -5,6 +5,7 @@ package(default_visibility = ["//visibility:public"]) @@ -28,6 +28,3 @@ index 0248bda0f52..1fe1e342594 100644 "-labsl_log_internal_check_op", "-labsl_log_internal_message", "-labsl_log_internal_nullguard", --- -2.47.0 - diff --git a/recipe/patches/0018-add-absl_string_view-target.patch b/recipe/patches/0018-add-absl_string_view-target.patch index d818f837d..3f0b175df 100644 --- a/recipe/patches/0018-add-absl_string_view-target.patch +++ b/recipe/patches/0018-add-absl_string_view-target.patch @@ -1,4 +1,4 @@ -From 134f011001350c88b2cda80242ce81a8276d1098 Mon Sep 17 00:00:00 2001 +From 918451e9f02087c2891d58d4969216a3a702c2ac Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 Subject: [PATCH 18/27] add absl_string_view target @@ -8,7 +8,7 @@ Subject: [PATCH 18/27] add absl_string_view target 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD -index d04776c98bf..9f537def3d7 100644 +index d04776c9..9f537def 100644 --- a/third_party/absl/system.absl.strings.BUILD +++ b/third_party/absl/system.absl.strings.BUILD @@ -2,6 +2,18 @@ load("@rules_cc//cc:defs.bzl", "cc_library") @@ -39,6 +39,3 @@ index d04776c98bf..9f537def3d7 100644 deps = [ ":str_format", "//absl/container:compressed_tuple", --- -2.47.0 - diff --git a/recipe/patches/0019-add-absl_nullability-target.patch b/recipe/patches/0019-add-absl_nullability-target.patch index 7094a8ab4..dd4899ecc 100644 --- a/recipe/patches/0019-add-absl_nullability-target.patch +++ b/recipe/patches/0019-add-absl_nullability-target.patch @@ -1,4 +1,4 @@ -From b08b026ad3d5d9e33195762445d79d7bf4321d75 Mon Sep 17 00:00:00 2001 +From 938c10d189c2bc47d891ce46ca9ff92d197aa226 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 Subject: [PATCH 19/27] add absl_nullability target @@ -8,7 +8,7 @@ Subject: [PATCH 19/27] add absl_nullability target 1 file changed, 8 insertions(+) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index b3e42f4dd8b..a423d5f70da 100644 +index b3e42f4d..a423d5f7 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -25,6 +25,14 @@ cc_library( @@ -26,6 +26,3 @@ index b3e42f4dd8b..a423d5f70da 100644 cc_library( name = "raw_logging_internal", linkopts = [ --- -2.47.0 - diff --git a/recipe/patches/0020-add-absl_prefetch-target.patch b/recipe/patches/0020-add-absl_prefetch-target.patch index 1ab4d6b69..0740450db 100644 --- a/recipe/patches/0020-add-absl_prefetch-target.patch +++ b/recipe/patches/0020-add-absl_prefetch-target.patch @@ -1,4 +1,4 @@ -From 5b46fd32f42af1a470a0fa28acb97d6bd70516f7 Mon Sep 17 00:00:00 2001 +From ec3fcb3a2bb1139ed3a7dee824edf0c7170e349d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 Subject: [PATCH 20/27] add absl_prefetch target @@ -8,7 +8,7 @@ Subject: [PATCH 20/27] add absl_prefetch target 1 file changed, 8 insertions(+) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index a423d5f70da..b31592d31a3 100644 +index a423d5f7..b31592d3 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -116,6 +116,14 @@ cc_library( @@ -26,6 +26,3 @@ index a423d5f70da..b31592d31a3 100644 cc_library( name = "strerror", linkopts = ["-labsl_strerror"], --- -2.47.0 - diff --git a/recipe/patches/0021-add-absl_die_if_null-target.patch b/recipe/patches/0021-add-absl_die_if_null-target.patch index 5bfda9c77..f231c2d87 100644 --- a/recipe/patches/0021-add-absl_die_if_null-target.patch +++ b/recipe/patches/0021-add-absl_die_if_null-target.patch @@ -1,17 +1,17 @@ -From c339cdc530d4631ca013414868b4aa69088f8df4 Mon Sep 17 00:00:00 2001 +From 027858614ecf06428e284eb7f32699eda84ae07f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:46:04 +1100 Subject: [PATCH 21/27] add absl_die_if_null target --- - third_party/absl/system.absl.log.BUILD | 11 +++++++++++ - 1 file changed, 11 insertions(+) + third_party/absl/system.absl.log.BUILD | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD -index 1fe1e342594..6606aaa5dd0 100644 +index 1fe1e342..141bb319 100644 --- a/third_party/absl/system.absl.log.BUILD +++ b/third_party/absl/system.absl.log.BUILD -@@ -2,6 +2,17 @@ load("@rules_cc//cc:defs.bzl", "cc_library") +@@ -2,6 +2,22 @@ load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -25,10 +25,12 @@ index 1fe1e342594..6606aaa5dd0 100644 + "//absl/strings", + ], +) ++ ++alias( ++ name = "absl_log", ++ actual = ":log", ++) + cc_library( name = "log", linkopts = [ --- -2.47.0 - diff --git a/recipe/patches/0022-add-absl_crc32c-targets.patch b/recipe/patches/0022-add-absl_crc32c-targets.patch index 1ecf8f67a..8a421c048 100644 --- a/recipe/patches/0022-add-absl_crc32c-targets.patch +++ b/recipe/patches/0022-add-absl_crc32c-targets.patch @@ -1,4 +1,4 @@ -From 031dcf3b8f7dbc3e74926a4e9039b395baccf733 Mon Sep 17 00:00:00 2001 +From 4d7b4e4c13759923bbf033c4b7c5e71fa33e22dd Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:41:09 +1100 Subject: [PATCH 22/27] add absl_crc32c targets @@ -11,7 +11,7 @@ Subject: [PATCH 22/27] add absl_crc32c targets diff --git a/third_party/absl/system.absl.crc.BUILD b/third_party/absl/system.absl.crc.BUILD new file mode 100644 -index 00000000000..487c36ff45b +index 00000000..487c36ff --- /dev/null +++ b/third_party/absl/system.absl.crc.BUILD @@ -0,0 +1,70 @@ @@ -86,7 +86,7 @@ index 00000000000..487c36ff45b + ], +) diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl -index addb2410abd..e71aa167260 100644 +index addb2410..e71aa167 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -14,6 +14,7 @@ def repo(): @@ -97,6 +97,3 @@ index addb2410abd..e71aa167260 100644 "cleanup", "container", "debugging", --- -2.47.0 - diff --git a/recipe/patches/0023-add-kernel_timeout_internal-target.patch b/recipe/patches/0023-add-kernel_timeout_internal-target.patch index 036799961..f5a157266 100644 --- a/recipe/patches/0023-add-kernel_timeout_internal-target.patch +++ b/recipe/patches/0023-add-kernel_timeout_internal-target.patch @@ -1,4 +1,4 @@ -From ce9fc32bd156da77ef41b81184a05a23df69ff54 Mon Sep 17 00:00:00 2001 +From f98ad31ffbb83ba849a8a97592c8c6f78e6f7fd0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 23:36:48 +1100 Subject: [PATCH 23/27] add kernel_timeout_internal target @@ -8,7 +8,7 @@ Subject: [PATCH 23/27] add kernel_timeout_internal target 1 file changed, 15 insertions(+) diff --git a/third_party/absl/system.absl.synchronization.BUILD b/third_party/absl/system.absl.synchronization.BUILD -index c0fa37aacd7..b47309deb39 100644 +index c0fa37aa..b47309de 100644 --- a/third_party/absl/system.absl.synchronization.BUILD +++ b/third_party/absl/system.absl.synchronization.BUILD @@ -16,14 +16,29 @@ cc_library( @@ -41,6 +41,3 @@ index c0fa37aacd7..b47309deb39 100644 "//absl/base", "//absl/base:atomic_hook", "//absl/base:dynamic_annotations", --- -2.47.0 - diff --git a/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch b/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch index ccb44ed86..188230f3e 100644 --- a/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch +++ b/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch @@ -1,4 +1,4 @@ -From 9a5c033c6bf8e697e714e30f81c58a0e82d969a8 Mon Sep 17 00:00:00 2001 +From 24eeae23f9140fddfbfe2568e49f9d3359f2a71d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 19 May 2024 20:52:35 +1100 Subject: [PATCH 24/27] work around for warning that clang falsely treats as @@ -10,7 +10,7 @@ see https://github.com/llvm/llvm-project/issues/92630 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc -index f48811d13d2..0d1c0305d97 100644 +index f48811d1..0d1c0305 100644 --- a/.bazelrc +++ b/.bazelrc @@ -310,7 +310,7 @@ build:ios --noenable_platform_specific_config @@ -22,6 +22,3 @@ index f48811d13d2..0d1c0305d97 100644 build:windows --copt=/W0 build:windows --host_copt=/W0 --- -2.47.0 - diff --git a/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch b/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch index dc8862c35..86a3ad5e2 100644 --- a/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch +++ b/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch @@ -1,4 +1,4 @@ -From 5163ec6309cb06f2ebe37f846b72aa629a627301 Mon Sep 17 00:00:00 2001 +From 7985aee1f8f9efc8832c7ec8b4e13485928a669c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 12 Jul 2024 12:52:38 +0000 Subject: [PATCH 25/27] Hardcode BUILD_PREFIX in build_pip_package @@ -8,7 +8,7 @@ Subject: [PATCH 25/27] Hardcode BUILD_PREFIX in build_pip_package 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tensorflow/tools/pip_package/build_pip_package.py b/tensorflow/tools/pip_package/build_pip_package.py -index d882db09a10..091db3f4691 100644 +index d882db09..091db3f4 100644 --- a/tensorflow/tools/pip_package/build_pip_package.py +++ b/tensorflow/tools/pip_package/build_pip_package.py @@ -285,12 +285,12 @@ def patch_so(srcs_dir: str) -> None: @@ -27,6 +27,3 @@ index d882db09a10..091db3f4691 100644 "{}/{}".format(srcs_dir, file)], check=True) --- -2.47.0 - diff --git a/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch b/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch index db95fffc2..ccca83cdc 100644 --- a/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch +++ b/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch @@ -1,4 +1,4 @@ -From c3760aad2e91c9754dfa6f994bfe197aed17e422 Mon Sep 17 00:00:00 2001 +From 4b271291f3811779838efcbb90448b3b06c45922 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 16 Jul 2024 17:18:23 +0200 Subject: [PATCH 26/27] Only link to sparse_core_layout_proto_cc headers @@ -8,7 +8,7 @@ Subject: [PATCH 26/27] Only link to sparse_core_layout_proto_cc headers 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/core/tpu/kernels/BUILD b/tensorflow/core/tpu/kernels/BUILD -index 5c1dc5da889..4d467227ba2 100644 +index 5c1dc5da..4d467227 100644 --- a/tensorflow/core/tpu/kernels/BUILD +++ b/tensorflow/core/tpu/kernels/BUILD @@ -1483,7 +1483,7 @@ cc_library( @@ -20,6 +20,3 @@ index 5c1dc5da889..4d467227ba2 100644 "//tensorflow/core/platform:stringpiece", "@com_google_absl//absl/log", "@com_google_absl//absl/log:check", --- -2.47.0 - diff --git a/recipe/patches/0027-Protobuf-5-compatability.patch b/recipe/patches/0027-Protobuf-5-compatability.patch index ddaaf0415..78b14d049 100644 --- a/recipe/patches/0027-Protobuf-5-compatability.patch +++ b/recipe/patches/0027-Protobuf-5-compatability.patch @@ -1,4 +1,4 @@ -From e9f37f6b8bbca5fb72728a3d6765dcec68a0c247 Mon Sep 17 00:00:00 2001 +From 61c8a1306bb7bbc8919a237602e6dd158c80ff23 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 10 Oct 2024 19:59:31 +0200 Subject: [PATCH 27/27] Protobuf 5 compatability @@ -10,7 +10,7 @@ Subject: [PATCH 27/27] Protobuf 5 compatability .../core/ir/importexport/parse_text_proto.cc | 2 +- .../profiler/convert/hlo_to_tools_data.cc | 4 ++ .../convert/xplane_to_memory_profile.cc | 4 ++ - .../profiler/convert/xplane_to_tools_data.cc | 12 ++++- + .../profiler/convert/xplane_to_tools_data.cc | 8 +++ tensorflow/core/util/proto/proto_utils.cc | 10 ++-- tensorflow/core/util/proto/proto_utils.h | 4 +- .../proto_text/gen_proto_text_functions.cc | 4 +- @@ -18,12 +18,12 @@ Subject: [PATCH 27/27] Protobuf 5 compatability ...Migrate-from-AddError-to-RecordError.patch | 33 ++++++++++++ ...y-with-protobuf-v26-migrate-from-dep.patch | 52 +++++++++++++++++++ .../platform/default/human_readable_json.cc | 4 ++ - 14 files changed, 127 insertions(+), 14 deletions(-) + 14 files changed, 125 insertions(+), 12 deletions(-) create mode 100644 third_party/0001-Migrate-from-AddError-to-RecordError.patch create mode 100644 third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch diff --git a/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc b/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc -index eba1ebc48ce..fe7b021b64c 100644 +index eba1ebc4..dc9f7b81 100644 --- a/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc +++ b/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc @@ -57,7 +57,7 @@ namespace { @@ -31,12 +31,12 @@ index eba1ebc48ce..fe7b021b64c 100644 class NoOpErrorCollector : public tsl::protobuf::io::ErrorCollector { public: - void AddError(int line, int column, const std::string& message) override {} -+ void RecordError(int line, int column, const std::string& message) override {} ++ void RecordError(int line, int column, const absl::string_view message) override {} }; bool LoadHloProto(const std::string& contents, xla::HloProto* hlo_proto) { diff --git a/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc b/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc -index 906a058d04e..9938a0b4c29 100644 +index 906a058d..0c673310 100644 --- a/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc +++ b/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc @@ -30,7 +30,7 @@ namespace { @@ -44,12 +44,12 @@ index 906a058d04e..9938a0b4c29 100644 class NoOpErrorCollector : public protobuf::io::ErrorCollector { public: - void AddError(int line, int column, const std::string& message) override {} -+ void RecordError(int line, int column, const std::string& message) override {} ++ void RecordError(int line, int column, absl::string_view message) override {} }; } // namespace diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc -index 0e4e11d81e9..912970b7d82 100644 +index 0e4e11d8..912970b7 100644 --- a/tensorflow/core/debug/debug_io_utils.cc +++ b/tensorflow/core/debug/debug_io_utils.cc @@ -94,7 +94,11 @@ Event PrepareChunkEventProto(const DebugNodeKey& debug_node_key, @@ -65,7 +65,7 @@ index 0e4e11d81e9..912970b7d82 100644 metadata, &json_output, json_options); if (status.ok()) { diff --git a/tensorflow/core/ir/importexport/parse_text_proto.cc b/tensorflow/core/ir/importexport/parse_text_proto.cc -index c631785cefc..cd3e2ec7747 100644 +index c631785c..3ab6e17c 100644 --- a/tensorflow/core/ir/importexport/parse_text_proto.cc +++ b/tensorflow/core/ir/importexport/parse_text_proto.cc @@ -35,7 +35,7 @@ namespace { @@ -73,12 +73,12 @@ index c631785cefc..cd3e2ec7747 100644 class NoOpErrorCollector : public tensorflow::protobuf::io::ErrorCollector { public: - void AddError(int line, int column, const std::string& message) override {} -+ void RecordError(int line, int column, const std::string& message) override {} ++ void RecordError(int line, int column, const absl::string_view message) override {} }; } // namespace diff --git a/tensorflow/core/profiler/convert/hlo_to_tools_data.cc b/tensorflow/core/profiler/convert/hlo_to_tools_data.cc -index 7fbcd397906..e6b11658d5b 100644 +index 7fbcd397..d17f3402 100644 --- a/tensorflow/core/profiler/convert/hlo_to_tools_data.cc +++ b/tensorflow/core/profiler/convert/hlo_to_tools_data.cc @@ -62,7 +62,11 @@ absl::StatusOr ConvertHloProtoToMemoryViewer( @@ -87,14 +87,14 @@ index 7fbcd397906..e6b11658d5b 100644 tensorflow::protobuf::util::JsonPrintOptions options; +#if GOOGLE_PROTOBUF_VERSION < 5026000 options.always_print_primitive_fields = true; -+# else ++#else + options.always_print_fields_with_no_presence = true; +#endif auto encoded_status = tensorflow::protobuf::util::MessageToJsonString( result_or.value(), &json_output, options); if (!encoded_status.ok()) { diff --git a/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc b/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc -index b289f54baa6..38e89170f42 100644 +index b289f54b..38e89170 100644 --- a/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc +++ b/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc @@ -529,7 +529,11 @@ void ProcessMemoryProfileProto(int64_t max_num_snapshots, @@ -110,16 +110,15 @@ index b289f54baa6..38e89170f42 100644 json_options); if (!status.ok()) { diff --git a/tensorflow/core/profiler/convert/xplane_to_tools_data.cc b/tensorflow/core/profiler/convert/xplane_to_tools_data.cc -index dcc7cea45f7..b974a3a1b82 100644 +index dcc7cea4..a995db64 100644 --- a/tensorflow/core/profiler/convert/xplane_to_tools_data.cc +++ b/tensorflow/core/profiler/convert/xplane_to_tools_data.cc @@ -218,7 +218,11 @@ absl::StatusOr ConvertMultiXSpacesToPodViewer( std::string json_output; protobuf::util::JsonPrintOptions opts; -- opts.always_print_primitive_fields = true; +#if GOOGLE_PROTOBUF_VERSION < 5026000 -+ opts.always_print_primitive_fields = true; + opts.always_print_primitive_fields = true; +#else + opts.always_print_fields_with_no_presence = true; +#endif @@ -130,9 +129,8 @@ index dcc7cea45f7..b974a3a1b82 100644 profile); std::string json_output; protobuf::util::JsonPrintOptions opts; -- opts.always_print_primitive_fields = true; +#if GOOGLE_PROTOBUF_VERSION < 5026000 -+ opts.always_print_primitive_fields = true; + opts.always_print_primitive_fields = true; +#else + opts.always_print_fields_with_no_presence = true; +#endif @@ -140,7 +138,7 @@ index dcc7cea45f7..b974a3a1b82 100644 auto encode_status = protobuf::util::MessageToJsonString(profile, &json_output, opts); diff --git a/tensorflow/core/util/proto/proto_utils.cc b/tensorflow/core/util/proto/proto_utils.cc -index 282be94a774..7cfed84d2a8 100644 +index 282be94a..7cfed84d 100644 --- a/tensorflow/core/util/proto/proto_utils.cc +++ b/tensorflow/core/util/proto/proto_utils.cc @@ -101,17 +101,17 @@ StringErrorCollector::StringErrorCollector(string* error_text, @@ -167,7 +165,7 @@ index 282be94a774..7cfed84d2a8 100644 } // namespace proto_utils diff --git a/tensorflow/core/util/proto/proto_utils.h b/tensorflow/core/util/proto/proto_utils.h -index f0347a84cbe..c8b2a4b936a 100644 +index f0347a84..c8b2a4b9 100644 --- a/tensorflow/core/util/proto/proto_utils.h +++ b/tensorflow/core/util/proto/proto_utils.h @@ -53,10 +53,10 @@ class StringErrorCollector : public protobuf::io::ErrorCollector { @@ -184,7 +182,7 @@ index f0347a84cbe..c8b2a4b936a 100644 private: string* const error_text_; diff --git a/tensorflow/tools/proto_text/gen_proto_text_functions.cc b/tensorflow/tools/proto_text/gen_proto_text_functions.cc -index 406e6641178..d97eae7346b 100644 +index 406e6641..d97eae73 100644 --- a/tensorflow/tools/proto_text/gen_proto_text_functions.cc +++ b/tensorflow/tools/proto_text/gen_proto_text_functions.cc @@ -31,8 +31,8 @@ class CrashOnErrorCollector @@ -199,7 +197,7 @@ index 406e6641178..d97eae7346b 100644 << column << " - " << message; } diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl -index 5320aa187fd..32f0a39c91c 100644 +index 5320aa18..32f0a39c 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -878,6 +878,10 @@ def _tf_repositories(): @@ -215,7 +213,7 @@ index 5320aa187fd..32f0a39c91c 100644 diff --git a/third_party/0001-Migrate-from-AddError-to-RecordError.patch b/third_party/0001-Migrate-from-AddError-to-RecordError.patch new file mode 100644 -index 00000000000..0ed75ee8019 +index 00000000..0ed75ee8 --- /dev/null +++ b/third_party/0001-Migrate-from-AddError-to-RecordError.patch @@ -0,0 +1,33 @@ @@ -254,7 +252,7 @@ index 00000000000..0ed75ee8019 + diff --git a/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch b/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch new file mode 100644 -index 00000000000..b5af8d2dff5 +index 00000000..b5af8d2d --- /dev/null +++ b/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch @@ -0,0 +1,52 @@ @@ -311,7 +309,7 @@ index 00000000000..b5af8d2dff5 +2.34.1 + diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc b/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc -index 167cdd2b891..dc1ebdd10e6 100644 +index 167cdd2b..dc1ebdd1 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc +++ b/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc @@ -33,7 +33,11 @@ absl::StatusOr ProtoToHumanReadableJson( @@ -326,6 +324,3 @@ index 167cdd2b891..dc1ebdd10e6 100644 auto status = protobuf::util::MessageToJsonString(proto, &result, json_options); if (!status.ok()) { --- -2.47.0 - From db1e3704fef81f771ba0b169519d28f28703d34a Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 19 Nov 2024 02:32:08 -0500 Subject: [PATCH 09/64] Update ml_dtypes --- recipe/meta.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 68ff17688..e95acbbda 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,11 +8,8 @@ {% set build = build + 200 %} {% endif %} -# 2.17.0.rc1 uses unreleased commit -# https://github.com/jax-ml/ml_dtypes/commit/24084d9ed2c3d45bf83b7a9bff833aa185bf9172 -# see -# https://github.com/tensorflow/tensorflow/blob/v2.17.0-rc1/third_party/py/ml_dtypes/workspace.bzl -{% set ml_dtypes_version = "0.4.0" %} +# https://github.com/tensorflow/tensorflow/blob/v2.18.0/third_party/py/ml_dtypes/workspace.bzl +{% set ml_dtypes_version = "0.5.0" %} package: name: tensorflow-split @@ -145,6 +142,7 @@ requirements: - sqlite - snappy - zlib + - ml_dtypes >={{ ml_dtypes_version }},<0.5 outputs: # 2021/12/29: hmaarrfk From a44af1e0df856c6085cb53fdac057e805c8661f0 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 19 Nov 2024 13:11:01 +0530 Subject: [PATCH 10/64] ml dtypes update again --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e95acbbda..1aaba8548 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -142,7 +142,7 @@ requirements: - sqlite - snappy - zlib - - ml_dtypes >={{ ml_dtypes_version }},<0.5 + - ml_dtypes >={{ ml_dtypes_version }},<0.6 outputs: # 2021/12/29: hmaarrfk @@ -223,7 +223,7 @@ outputs: - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - h5py >=3.10 - - ml_dtypes >={{ ml_dtypes_version }},<0.5 + - ml_dtypes >={{ ml_dtypes_version }},<0.6 - numpy - opt_einsum >=2.3.2 # simplified compared to upstream due to constraints arising through libprotobuf @@ -246,7 +246,7 @@ outputs: - google-pasta >=0.1.1 - grpcio {{ libgrpc }}.* - h5py >=3.10 - - ml_dtypes >={{ ml_dtypes_version }},<0.5 + - ml_dtypes >={{ ml_dtypes_version }},<0.6 - opt_einsum >=2.3.2 - protobuf >=5.26,<6 - python-flatbuffers >=24.3.25 @@ -441,7 +441,7 @@ outputs: - sqlite - zlib run: - - libml_dtypes-headers >={{ ml_dtypes_version }},<0.5 + - libml_dtypes-headers >={{ ml_dtypes_version }},<0.6 # avoid that people without GPUs needlessly download ~200-300MB - __cuda # [cuda_compiler_version != "None"] test: From bef6c2b79251a484f5e9762f6cdf25091d5d8836 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 28 Nov 2024 20:55:52 +0100 Subject: [PATCH 11/64] MNT: Re-rendered with conda-build 24.11.1, conda-smithy 3.44.8, and conda-forge-pinning 2024.11.28.16.32.05 --- ...iler_version12python3.10.____cpython.yaml} | 10 +-- ...iler_version12python3.11.____cpython.yaml} | 10 +-- ...iler_version12python3.12.____cpython.yaml} | 10 +-- ...piler_version12python3.9.____cpython.yaml} | 10 +-- ...piler_version13python3.10.____cpython.yaml | 8 +- ...piler_version13python3.11.____cpython.yaml | 8 +- ...piler_version13python3.12.____cpython.yaml | 8 +- ...mpiler_version13python3.9.____cpython.yaml | 8 +- .ci_support/migrations/cuda120.yaml | 90 ------------------- .../osx_64_python3.10.____cpython.yaml | 7 +- .../osx_64_python3.11.____cpython.yaml | 7 +- .../osx_64_python3.12.____cpython.yaml | 7 +- .ci_support/osx_64_python3.9.____cpython.yaml | 7 +- .../osx_arm64_python3.10.____cpython.yaml | 7 +- .../osx_arm64_python3.11.____cpython.yaml | 7 +- .../osx_arm64_python3.12.____cpython.yaml | 7 +- .../osx_arm64_python3.9.____cpython.yaml | 7 +- .github/workflows/conda-build.yml | 32 +++---- README.md | 46 +++++----- build-locally.py | 7 ++ 20 files changed, 109 insertions(+), 194 deletions(-) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml} (90%) delete mode 100644 .ci_support/migrations/cuda120.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml index 54e7e9ac0..4a4c4c00d 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.0' +- '12.6' cudnn: - '9' cxx_compiler: @@ -23,15 +23,13 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.3.25 giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +46,8 @@ libprotobuf: - 5.27.5 nccl: - '2' +numpy: +- '2.0' openssl: - '3' perl: @@ -71,11 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml index 2a2b8b896..a88f69a9a 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.0' +- '12.6' cudnn: - '9' cxx_compiler: @@ -23,15 +23,13 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.3.25 giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +46,8 @@ libprotobuf: - 5.27.5 nccl: - '2' +numpy: +- '2.0' openssl: - '3' perl: @@ -71,11 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml index 6062425f3..abda2d35a 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.0' +- '12.6' cudnn: - '9' cxx_compiler: @@ -23,15 +23,13 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.3.25 giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +46,8 @@ libprotobuf: - 5.27.5 nccl: - '2' +numpy: +- '2.0' openssl: - '3' perl: @@ -71,11 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml index c591d7a6d..8b053fbb4 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml @@ -15,7 +15,7 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.0' +- '12.6' cudnn: - '9' cxx_compiler: @@ -23,15 +23,13 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.3.25 giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +46,8 @@ libprotobuf: - 5.27.5 nccl: - '2' +numpy: +- '2.0' openssl: - '3' perl: @@ -71,11 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index edaa18295..ee2ccc7c1 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -23,15 +23,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.3.25 giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +46,8 @@ libprotobuf: - 5.27.5 nccl: - '2' +numpy: +- '2.0' openssl: - '3' perl: @@ -71,11 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index aa5df3759..260784f11 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -23,15 +23,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.3.25 giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +46,8 @@ libprotobuf: - 5.27.5 nccl: - '2' +numpy: +- '2.0' openssl: - '3' perl: @@ -71,11 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index 119fad61f..c08f182fb 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -23,15 +23,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.3.25 giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +46,8 @@ libprotobuf: - 5.27.5 nccl: - '2' +numpy: +- '2.0' openssl: - '3' perl: @@ -71,11 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index d88ec2be6..426898b92 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -23,15 +23,13 @@ cxx_compiler: cxx_compiler_version: - '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.3.25 giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +46,8 @@ libprotobuf: - 5.27.5 nccl: - '2' +numpy: +- '2.0' openssl: - '3' perl: @@ -71,11 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version - - c_stdlib_version - cuda_compiler - cuda_compiler_version - docker_image - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml deleted file mode 100644 index abfb9cb82..000000000 --- a/.ci_support/migrations/cuda120.yaml +++ /dev/null @@ -1,90 +0,0 @@ -migrator_ts: 1682985063 -__migrator: - kind: - version - migration_number: - 3 - build_number: - 1 - paused: false - override_cbc_keys: - - cuda_compiler_stub - operation: key_add - check_solvable: false - primary_key: cuda_compiler_version - ordering: - cxx_compiler_version: - - 9 - - 8 - - 7 - c_compiler_version: - - 9 - - 8 - - 7 - fortran_compiler_version: - - 9 - - 8 - - 7 - docker_image: - - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"] - - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.2 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.2 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: non-CUDA builds - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - cuda_compiler_version: - - None - - 10.2 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - commit_message: | - Rebuild for CUDA 12 w/arch + Windows support - - The transition to CUDA 12 SDK includes new packages for all CUDA libraries and - build tools. Notably, the cudatoolkit package no longer exists, and packages - should depend directly on the specific CUDA libraries (libcublas, libcusolver, - etc) as needed. For an in-depth overview of the changes and to report problems - [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ). - Please feel free to raise any issues encountered there. Thank you! :pray: - -cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cdt_name: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 3211e8e2d..89f0839e4 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -18,8 +18,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -30,8 +28,6 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +44,8 @@ libprotobuf: - 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '2.0' openssl: - '3' pin_run_as_build: @@ -70,6 +68,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 7e2a477a1..cc1b72f6f 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -18,8 +18,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -30,8 +28,6 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +44,8 @@ libprotobuf: - 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '2.0' openssl: - '3' pin_run_as_build: @@ -70,6 +68,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 416306b40..334f91008 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -18,8 +18,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -30,8 +28,6 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +44,8 @@ libprotobuf: - 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '2.0' openssl: - '3' pin_run_as_build: @@ -70,6 +68,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 150a7e151..5d9b9b3d4 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -18,8 +18,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -30,8 +28,6 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +44,8 @@ libprotobuf: - 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '2.0' openssl: - '3' pin_run_as_build: @@ -70,6 +68,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 3443213bd..0b7c08424 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -18,8 +18,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -30,8 +28,6 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +44,8 @@ libprotobuf: - 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '2.0' openssl: - '3' pin_run_as_build: @@ -70,6 +68,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index f57f589b6..0c22c0942 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -18,8 +18,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -30,8 +28,6 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +44,8 @@ libprotobuf: - 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '2.0' openssl: - '3' pin_run_as_build: @@ -70,6 +68,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index fab04db7c..6bde9bf0f 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -18,8 +18,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -30,8 +28,6 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +44,8 @@ libprotobuf: - 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '2.0' openssl: - '3' pin_run_as_build: @@ -70,6 +68,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python + - numpy - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index d859f4053..d3d3aa011 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -18,8 +18,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - clangxx cxx_compiler_version: @@ -30,8 +28,6 @@ giflib: - '5.2' github_actions_labels: - cirun-openstack-cpu-xlarge -grpc_cpp: -- '1.52' icu: - '75' libabseil: @@ -48,6 +44,8 @@ libprotobuf: - 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 +numpy: +- '2.0' openssl: - '3' pin_run_as_build: @@ -70,6 +68,7 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python + - numpy - python_impl zlib: - '1' diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 493b8af7a..67ed2cf02 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,46 +21,46 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h91fe0f008d', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h9bec57d5dc', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_hed7027e077', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h7e1b4662c4', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h11ed5249c8', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_hdf3f9bfbcc', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h625cfcfe2e', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h6bc6036033', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h1a635e5433', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h70857f1454', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h2dff17f9f4', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hbe4b9baad6', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 steps: - name: Checkout code diff --git a/README.md b/README.md index 14db7d1bd..31e945345 100644 --- a/README.md +++ b/README.md @@ -37,31 +37,31 @@ Current build status - + - + - + - + @@ -161,7 +161,13 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--split-green.svg)](https://anaconda.org/conda-forge/tensorflow-split) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-split.svg)](https://anaconda.org/conda-forge/tensorflow-split) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-split.svg)](https://anaconda.org/conda-forge/tensorflow-split) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-split.svg)](https://anaconda.org/conda-forge/tensorflow-split) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libtensorflow-green.svg)](https://anaconda.org/conda-forge/libtensorflow) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libtensorflow.svg)](https://anaconda.org/conda-forge/libtensorflow) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libtensorflow.svg)](https://anaconda.org/conda-forge/libtensorflow) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libtensorflow.svg)](https://anaconda.org/conda-forge/libtensorflow) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libtensorflow_cc-green.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libtensorflow_cc.svg)](https://anaconda.org/conda-forge/libtensorflow_cc) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow-green.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow.svg)](https://anaconda.org/conda-forge/tensorflow) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--base-green.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--cpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--estimator-green.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--gpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | Installing tensorflow ===================== @@ -173,41 +179,41 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `tensorflow-split` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator, tensorflow-gpu` can be installed with `conda`: ``` -conda install tensorflow-split +conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu ``` or with `mamba`: ``` -mamba install tensorflow-split +mamba install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu ``` -It is possible to list all of the versions of `tensorflow-split` available on your platform with `conda`: +It is possible to list all of the versions of `libtensorflow` available on your platform with `conda`: ``` -conda search tensorflow-split --channel conda-forge +conda search libtensorflow --channel conda-forge ``` or with `mamba`: ``` -mamba search tensorflow-split --channel conda-forge +mamba search libtensorflow --channel conda-forge ``` Alternatively, `mamba repoquery` may provide more information: ``` # Search all versions available on your platform: -mamba repoquery search tensorflow-split --channel conda-forge +mamba repoquery search libtensorflow --channel conda-forge -# List packages depending on `tensorflow-split`: -mamba repoquery whoneeds tensorflow-split --channel conda-forge +# List packages depending on `libtensorflow`: +mamba repoquery whoneeds libtensorflow --channel conda-forge -# List dependencies of `tensorflow-split`: -mamba repoquery depends tensorflow-split --channel conda-forge +# List dependencies of `libtensorflow`: +mamba repoquery depends libtensorflow --channel conda-forge ``` diff --git a/build-locally.py b/build-locally.py index 6788aea66..c4a56c667 100755 --- a/build-locally.py +++ b/build-locally.py @@ -26,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" From b10302a1b6412502ee02eea43b52a1da2446743e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 29 Nov 2024 10:27:28 +0100 Subject: [PATCH 12/64] Update version pins --- recipe/cp_libtensorflow.sh | 2 -- recipe/meta.yaml | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/recipe/cp_libtensorflow.sh b/recipe/cp_libtensorflow.sh index 80848cd7f..303f84ea4 100644 --- a/recipe/cp_libtensorflow.sh +++ b/recipe/cp_libtensorflow.sh @@ -1,7 +1,5 @@ # https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/lib_package/README.md tar -C ${PREFIX} -xzf $SRC_DIR/libtensorflow.tar.gz -mv $PREFIX/include/external/local_tsl/tsl $PREFIX/include - # Make writable so patchelf can do its magic chmod u+w $PREFIX/lib/libtensorflow* diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1aaba8548..f2169da9c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -222,7 +222,7 @@ outputs: - astunparse >=1.6.0 - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - - h5py >=3.10 + - h5py >=3.11 - ml_dtypes >={{ ml_dtypes_version }},<0.6 - numpy - opt_einsum >=2.3.2 @@ -235,7 +235,7 @@ outputs: - typing_extensions >=3.6.6 - wrapt >=1.11.0 # TF-API needs to move in sync - - tensorboard >=2.17,<2.18 + - tensorboard >=2.18,<2.19 - keras >=3.0 run: - python @@ -245,7 +245,7 @@ outputs: - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - grpcio {{ libgrpc }}.* - - h5py >=3.10 + - h5py >=3.11 - ml_dtypes >={{ ml_dtypes_version }},<0.6 - opt_einsum >=2.3.2 - protobuf >=5.26,<6 @@ -256,7 +256,7 @@ outputs: - typing_extensions >=3.6.6 - wrapt >=1.11.0 # TF-API needs to move in sync - - tensorboard >=2.17,<2.18 + - tensorboard >=2.18,<2.19 - keras >=3.0 # avoid that people without GPUs needlessly download ~0.5-1GB - __cuda # [cuda_compiler_version != "None"] From d77bdcf1e216b710fa848c10e7fc525a1c5acbde Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 29 Nov 2024 10:27:39 +0100 Subject: [PATCH 13/64] Stick to clang17 --- recipe/conda_build_config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 84b5a2fba..60e2f261f 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,6 @@ github_actions_labels: - cirun-openstack-cpu-xlarge +c_compiler_version: # [osx] + - '17' # [osx] +cxx_compiler_version: # [osx] + - '17' # [osx] From 2a4c2e2fe99be11cec37fea9f91a1e294a030267 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 29 Nov 2024 10:29:44 +0100 Subject: [PATCH 14/64] MNT: Re-rendered with conda-build 24.11.1, conda-smithy 3.44.8, and conda-forge-pinning 2024.11.28.20.27.28 --- .ci_support/osx_64_python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_python3.9.____cpython.yaml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 89f0839e4..297cc5be5 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '17' flatbuffers: - 24.3.25 giflib: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index cc1b72f6f..b14623cce 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '17' flatbuffers: - 24.3.25 giflib: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 334f91008..7e91aecab 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '17' flatbuffers: - 24.3.25 giflib: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 5d9b9b3d4..e16b75587 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '17' flatbuffers: - 24.3.25 giflib: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 0b7c08424..049f14f8d 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '17' flatbuffers: - 24.3.25 giflib: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 0c22c0942..72e439267 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '17' flatbuffers: - 24.3.25 giflib: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 6bde9bf0f..c0c89084f 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '17' flatbuffers: - 24.3.25 giflib: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index d3d3aa011..2bd64b21a 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '18' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '17' flatbuffers: - 24.3.25 giflib: From 8e1670f454b25588fc30bcf32971a55fe62eb500 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 29 Nov 2024 16:37:02 +0100 Subject: [PATCH 15/64] Fix ml_dtypes dependencies --- recipe/meta.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f2169da9c..5469e811d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,8 +8,10 @@ {% set build = build + 200 %} {% endif %} +# Quite often libml_dtypes-headers and ml_dtypes diverge. # https://github.com/tensorflow/tensorflow/blob/v2.18.0/third_party/py/ml_dtypes/workspace.bzl -{% set ml_dtypes_version = "0.5.0" %} +{% set libml_dtypes_version = "0.5.0" %} +{% set ml_dtypes_version = "0.4.0" %} package: name: tensorflow-split @@ -142,7 +144,7 @@ requirements: - sqlite - snappy - zlib - - ml_dtypes >={{ ml_dtypes_version }},<0.6 + - ml_dtypes >={{ ml_dtypes_version }},<0.5 outputs: # 2021/12/29: hmaarrfk @@ -223,7 +225,7 @@ outputs: - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - h5py >=3.11 - - ml_dtypes >={{ ml_dtypes_version }},<0.6 + - ml_dtypes >={{ ml_dtypes_version }},<0.5 - numpy - opt_einsum >=2.3.2 # simplified compared to upstream due to constraints arising through libprotobuf @@ -246,7 +248,7 @@ outputs: - google-pasta >=0.1.1 - grpcio {{ libgrpc }}.* - h5py >=3.11 - - ml_dtypes >={{ ml_dtypes_version }},<0.6 + - ml_dtypes >={{ ml_dtypes_version }},<0.5 - opt_einsum >=2.3.2 - protobuf >=5.26,<6 - python-flatbuffers >=24.3.25 @@ -441,7 +443,7 @@ outputs: - sqlite - zlib run: - - libml_dtypes-headers >={{ ml_dtypes_version }},<0.6 + - libml_dtypes-headers >={{ libml_dtypes_version }},<0.6 # avoid that people without GPUs needlessly download ~200-300MB - __cuda # [cuda_compiler_version != "None"] test: From d55b271645ad16e3e7283a1fb6fe8bf448a6e495 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 29 Nov 2024 21:19:49 +0100 Subject: [PATCH 16/64] Fix ResolvePadding --- recipe/meta.yaml | 1 + ...ng-to-be-consistent-in-the-size-of-t.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5469e811d..9115fb89c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,6 +48,7 @@ source: - patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch - patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch - patches/0027-Protobuf-5-compatability.patch + - patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530 folder: tensorflow-estimator diff --git a/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch b/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch new file mode 100644 index 000000000..002610a8b --- /dev/null +++ b/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch @@ -0,0 +1,38 @@ +From b3804de29e8b40b1cb18b940656307e24cd7a457 Mon Sep 17 00:00:00 2001 +From: "A. Unique TensorFlower" +Date: Thu, 14 Nov 2024 15:25:44 -0800 +Subject: [PATCH 28/28] Fix ResolvePadding to be consistent in the size of the + small vector + +PiperOrigin-RevId: 696670235 +--- + .../transforms/legalize_hlo_conversions/op_util_common.cc | 2 +- + .../transforms/legalize_hlo_conversions/op_util_common.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc +index 3d67bbfd..df67b39d 100644 +--- a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc ++++ b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc +@@ -68,7 +68,7 @@ llvm::SmallVector ResolveStridesOrDilations( + return llvm::SmallVector(attr.getValues()); + } + +-llvm::SmallVector ResolvePadding( ++llvm::SmallVector ResolvePadding( + int64_t rank, std::optional opt_padding) { + llvm::SmallVector res; + if (!opt_padding.has_value()) { +diff --git a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h +index 3c2c8ae5..b522b41c 100644 +--- a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h ++++ b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h +@@ -127,7 +127,7 @@ llvm::SmallVector ResolveStridesOrDilations( + + // Resolves optional paddings attributes. If not present, will return + // trivial [0, 0] paddings on each dim. +-llvm::SmallVector ResolvePadding( ++llvm::SmallVector ResolvePadding( + int64_t rank, std::optional opt_padding); + + // Does the padding correspond to "SAME" on given dimension configuration. From cdc23a2bc5a8408c3867fa45bce02f686b9ea7ad Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 29 Nov 2024 20:20:42 +0000 Subject: [PATCH 17/64] Support hermetic CUDA --- recipe/build.sh | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 7c7d41e1f..5f89e17f4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -96,16 +96,18 @@ if [[ ${cuda_compiler_version} != "None" ]]; then export TF_NEED_CUDA=1 export TF_CUDA_VERSION="${cuda_compiler_version}" export TF_CUDNN_VERSION="${cudnn}" + export HERMETIC_CUDA_VERSION="${cuda_compiler_version}" + export HERMETIC_CUDNN_VERSION="${cudnn}" export TF_NCCL_VERSION=$(pkg-config nccl --modversion | grep -Po '\d+\.\d+') export LDFLAGS="${LDFLAGS//-Wl,-z,now/-Wl,-z,lazy}" export CC_OPT_FLAGS="-march=nocona -mtune=haswell" if [[ ${cuda_compiler_version} == 11.8 ]]; then - export TF_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,sm_87,sm_89,sm_90,compute_90 + export HERMETIC_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,sm_87,sm_89,sm_90,compute_90 export TF_CUDA_PATHS="${PREFIX},${CUDA_HOME}" elif [[ "${cuda_compiler_version}" == 12* ]]; then - export TF_CUDA_COMPUTE_CAPABILITIES=sm_60,sm_70,sm_75,sm_80,sm_86,sm_89,sm_90,compute_90 + export HERMETIC_CUDA_COMPUTE_CAPABILITIES=sm_60,sm_70,sm_75,sm_80,sm_86,sm_89,sm_90,compute_90 export CUDNN_INSTALL_PATH=$PREFIX export NCCL_INSTALL_PATH=$PREFIX export CUDA_HOME="${BUILD_PREFIX}/targets/x86_64-linux" @@ -113,12 +115,31 @@ if [[ ${cuda_compiler_version} != "None" ]]; then # XLA can only cope with a single cuda header include directory, merge both rsync -a ${PREFIX}/targets/x86_64-linux/include/ ${BUILD_PREFIX}/targets/x86_64-linux/include/ + # Although XLA supports a non-hermetic build, it still tries to find headers in the hermetic locations. + # We do this in the BUILD_PREFIX to not have any impact on the resulting jaxlib package. + # Otherwise, these copied files would be included in the package. + rm -rf ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party + mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/extras/CUPTI + cp -r ${PREFIX}/targets/x86_64-linux/include ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/ + cp -r ${PREFIX}/targets/x86_64-linux/include ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/extras/CUPTI/ + mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cudnn + cp ${PREFIX}/include/cudnn*.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cudnn/ + mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl + cp ${PREFIX}/include/nccl.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl/ + + export LOCAL_CUDA_PATH="${BUILD_PREFIX}/targets/x86_64-linux" + export LOCAL_CUDNN_PATH="${PREFIX}/targets/x86_64-linux" + export LOCAL_NCCL_PATH="${PREFIX}/targets/x86_64-linux" + # hmaarrfk -- 2023/12/30 # This logic should be safe to keep in even when the underlying issue is resolved # xref: https://github.com/conda-forge/cuda-nvcc-impl-feedstock/issues/9 if [[ -x ${BUILD_PREFIX}/nvvm/bin/cicc ]]; then cp ${BUILD_PREFIX}/nvvm/bin/cicc ${BUILD_PREFIX}/bin/cicc fi + + # Needs GCC 13+ + echo "build --define=xnn_enable_avxvnniint8=false" >> .bazelrc else echo "unsupported cuda version." exit 1 @@ -187,6 +208,7 @@ fi cat >> .bazelrc < Date: Thu, 12 Dec 2024 09:54:03 +0000 Subject: [PATCH 18/64] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.44.9, and conda-forge-pinning 2024.12.12.09.21.41 --- .ci_support/migrations/cudnn9.yaml | 8 ---- ...bseil20240722_grpc165_libprotobuf5275.yaml | 18 --------- .ci_support/migrations/python312.yaml | 38 ------------------- .scripts/run_osx_build.sh | 5 ++- 4 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 .ci_support/migrations/cudnn9.yaml delete mode 100644 .ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml delete mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/cudnn9.yaml b/.ci_support/migrations/cudnn9.yaml deleted file mode 100644 index 30ba547e7..000000000 --- a/.ci_support/migrations/cudnn9.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for cudnn 9 - kind: version - migration_number: 1 -cudnn: -- '9' -migrator_ts: 1724175586.3831317 diff --git a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml deleted file mode 100644 index 85540a1ff..000000000 --- a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml +++ /dev/null @@ -1,18 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - - protobuf - - re2 -libabseil: -- 20240722 -libgrpc: -- "1.65" -libprotobuf: -- 5.27.5 -migrator_ts: 1727040240.8650293 diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml deleted file mode 100644 index 784a0a25d..000000000 --- a/.ci_support/migrations/python312.yaml +++ /dev/null @@ -1,38 +0,0 @@ -migrator_ts: 1695046563 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython - - 3.12.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 30 - max_solver_attempts: 6 # this will make the bot retry "not solvable" stuff 6 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.12.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.26 -python_impl: - - cpython diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 5c66aebd2..14bc5e47a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,8 +6,9 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} -MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" ( startgroup "Provisioning base env with micromamba" ) 2> /dev/null MICROMAMBA_VERSION="1.5.10-0" From 65d1268f334408a2553478eb75ddb9a21037d801 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sat, 14 Dec 2024 07:45:15 +0530 Subject: [PATCH 19/64] use cuda-compat --- recipe/build.sh | 4 ++++ recipe/meta.yaml | 1 + 2 files changed, 5 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 5f89e17f4..fbd802548 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -140,6 +140,9 @@ if [[ ${cuda_compiler_version} != "None" ]]; then # Needs GCC 13+ echo "build --define=xnn_enable_avxvnniint8=false" >> .bazelrc + + # cuda-compat is used for providing libcuda.so.1 temporarily + cp $PREFIX/cuda-compat/libcuda.so.1 $PREFIX/lib/libcuda.so.1 else echo "unsupported cuda version." exit 1 @@ -263,3 +266,4 @@ bazel clean # This was only needed for protobuf_python rm -rf $PREFIX/include/python +rm -f $PREFIX/lib/libcuda.so.1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9115fb89c..222230bbf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -106,6 +106,7 @@ requirements: - libcurand-dev # [(cuda_compiler_version or "").startswith("12")] - libcufft-dev # [(cuda_compiler_version or "").startswith("12")] - libcusparse-dev # [(cuda_compiler_version or "").startswith("12")] + - cuda-compat # [(cuda_compiler_version or "").startswith("12")] # conda build requirements - python - pip From bf8ff5283fd94cfe12b1b0d7b318259c60b68deb Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 14 Dec 2024 05:48:34 -0500 Subject: [PATCH 20/64] Update LOCAL_CUDNN_PATH and LOCAL_NCCL_PATH jaxlib may need the same fix. --- recipe/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index fbd802548..ff047de28 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -128,8 +128,8 @@ if [[ ${cuda_compiler_version} != "None" ]]; then cp ${PREFIX}/include/nccl.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl/ export LOCAL_CUDA_PATH="${BUILD_PREFIX}/targets/x86_64-linux" - export LOCAL_CUDNN_PATH="${PREFIX}/targets/x86_64-linux" - export LOCAL_NCCL_PATH="${PREFIX}/targets/x86_64-linux" + export LOCAL_CUDNN_PATH="${PREFIX}" + export LOCAL_NCCL_PATH="${PREFIX}" # hmaarrfk -- 2023/12/30 # This logic should be safe to keep in even when the underlying issue is resolved From 3107f0754504976e4af7e497f4e2398500984eaf Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sun, 15 Dec 2024 18:33:19 -0500 Subject: [PATCH 21/64] fix more CUDA issues --- recipe/build.sh | 4 ++++ recipe/meta.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index ff047de28..a51c94350 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -126,6 +126,10 @@ if [[ ${cuda_compiler_version} != "None" ]]; then cp ${PREFIX}/include/cudnn*.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cudnn/ mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl cp ${PREFIX}/include/nccl.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl/ + rsync -a ${PREFIX}/targets/x86_64-linux/lib/ ${BUILD_PREFIX}/targets/x86_64-linux/lib/ + ln -s ${BUILD_PREFIX}/bin/fatbinary ${BUILD_PREFIX}/targets/x86_64-linux/bin/fatbinary + ln -s ${BUILD_PREFIX}/bin/nvlink ${BUILD_PREFIX}/targets/x86_64-linux/bin/nvlink + ln -s ${BUILD_PREFIX}/bin/ptxas ${BUILD_PREFIX}/targets/x86_64-linux/bin/ptxas export LOCAL_CUDA_PATH="${BUILD_PREFIX}/targets/x86_64-linux" export LOCAL_CUDNN_PATH="${PREFIX}" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 222230bbf..3faa2c4e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -107,6 +107,7 @@ requirements: - libcufft-dev # [(cuda_compiler_version or "").startswith("12")] - libcusparse-dev # [(cuda_compiler_version or "").startswith("12")] - cuda-compat # [(cuda_compiler_version or "").startswith("12")] + - libnvjitlink-dev # [(cuda_compiler_version or "").startswith("12")] # conda build requirements - python - pip @@ -195,6 +196,7 @@ outputs: - libcurand-dev # [(cuda_compiler_version or "").startswith("12")] - libcufft-dev # [(cuda_compiler_version or "").startswith("12")] - libcusparse-dev # [(cuda_compiler_version or "").startswith("12")] + - libnvjitlink-dev # [(cuda_compiler_version or "").startswith("12")] # conda build requirements - python - pip From 8f7059fdd667abd17e78719e4213eaa3b0d06250 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 17 Dec 2024 01:00:24 -0500 Subject: [PATCH 22/64] use the GPU machine --- recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 60e2f261f..b54e72f14 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,5 +1,5 @@ github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge c_compiler_version: # [osx] - '17' # [osx] cxx_compiler_version: # [osx] From 9eb92098bb6e69fc8f6bdb272f3d121d24da052c Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 17 Dec 2024 01:05:00 -0500 Subject: [PATCH 23/64] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.0, and conda-forge-pinning 2024.12.16.21.51.05 --- ...piler_version12python3.10.____cpython.yaml | 2 +- ...piler_version12python3.11.____cpython.yaml | 2 +- ...piler_version12python3.12.____cpython.yaml | 2 +- ...mpiler_version12python3.9.____cpython.yaml | 2 +- ...piler_version13python3.10.____cpython.yaml | 2 +- ...piler_version13python3.11.____cpython.yaml | 2 +- ...piler_version13python3.12.____cpython.yaml | 2 +- ...mpiler_version13python3.9.____cpython.yaml | 2 +- .../osx_64_python3.10.____cpython.yaml | 2 +- .../osx_64_python3.11.____cpython.yaml | 2 +- .../osx_64_python3.12.____cpython.yaml | 2 +- .ci_support/osx_64_python3.9.____cpython.yaml | 2 +- .../osx_arm64_python3.10.____cpython.yaml | 2 +- .../osx_arm64_python3.11.____cpython.yaml | 2 +- .../osx_arm64_python3.12.____cpython.yaml | 2 +- .../osx_arm64_python3.9.____cpython.yaml | 2 +- .github/workflows/conda-build.yml | 24 ++++++++++++------- 17 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml index 4a4c4c00d..bdae2c04e 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml @@ -29,7 +29,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml index a88f69a9a..f2ddac7bc 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml @@ -29,7 +29,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml index abda2d35a..ffa9f2e80 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml @@ -29,7 +29,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml index 8b053fbb4..12bbb5ac0 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml @@ -29,7 +29,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml index ee2ccc7c1..81a48556d 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml @@ -29,7 +29,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml index 260784f11..e2c5fcad9 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml @@ -29,7 +29,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml index c08f182fb..e7cb96132 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml @@ -29,7 +29,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml index 426898b92..d77164363 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml @@ -29,7 +29,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 297cc5be5..87cf7fea7 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -27,7 +27,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index b14623cce..ebcd1df4d 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -27,7 +27,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 7e91aecab..b7205850e 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -27,7 +27,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index e16b75587..7d6272f6b 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -27,7 +27,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 049f14f8d..63730328d 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -27,7 +27,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 72e439267..5c4a691d7 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -27,7 +27,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index c0c89084f..7ba512745 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -27,7 +27,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 2bd64b21a..355e58a21 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -27,7 +27,7 @@ flatbuffers: giflib: - '5.2' github_actions_labels: -- cirun-openstack-cpu-xlarge +- cirun-openstack-gpu-xlarge icu: - '75' libabseil: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 67ed2cf02..54d334232 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -24,43 +24,51 @@ jobs: - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h9bec57d5dc', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h9bec57d5dc', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h7e1b4662c4', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h7e1b4662c4', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_hdf3f9bfbcc', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_hdf3f9bfbcc', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h6bc6036033', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h6bc6036033', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h1a635e5433', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h1a635e5433', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h70857f1454', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h70857f1454', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h2dff17f9f4', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h2dff17f9f4', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hbe4b9baad6', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hbe4b9baad6', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" steps: - name: Checkout code From 4e93d58e9b110f29072e2e3d26043098ce1a1532 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 11 Jan 2025 14:06:31 -0500 Subject: [PATCH 24/64] Whitespace in build.sh --- recipe/build.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index a51c94350..a8989991b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -108,42 +108,42 @@ if [[ ${cuda_compiler_version} != "None" ]]; then export TF_CUDA_PATHS="${PREFIX},${CUDA_HOME}" elif [[ "${cuda_compiler_version}" == 12* ]]; then export HERMETIC_CUDA_COMPUTE_CAPABILITIES=sm_60,sm_70,sm_75,sm_80,sm_86,sm_89,sm_90,compute_90 - export CUDNN_INSTALL_PATH=$PREFIX - export NCCL_INSTALL_PATH=$PREFIX - export CUDA_HOME="${BUILD_PREFIX}/targets/x86_64-linux" + export CUDNN_INSTALL_PATH=$PREFIX + export NCCL_INSTALL_PATH=$PREFIX + export CUDA_HOME="${BUILD_PREFIX}/targets/x86_64-linux" export TF_CUDA_PATHS="${BUILD_PREFIX}/targets/x86_64-linux,${PREFIX}/targets/x86_64-linux" - # XLA can only cope with a single cuda header include directory, merge both - rsync -a ${PREFIX}/targets/x86_64-linux/include/ ${BUILD_PREFIX}/targets/x86_64-linux/include/ + # XLA can only cope with a single cuda header include directory, merge both + rsync -a ${PREFIX}/targets/x86_64-linux/include/ ${BUILD_PREFIX}/targets/x86_64-linux/include/ - # Although XLA supports a non-hermetic build, it still tries to find headers in the hermetic locations. + # Although XLA supports a non-hermetic build, it still tries to find headers in the hermetic locations. # We do this in the BUILD_PREFIX to not have any impact on the resulting jaxlib package. # Otherwise, these copied files would be included in the package. - rm -rf ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party + rm -rf ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/extras/CUPTI cp -r ${PREFIX}/targets/x86_64-linux/include ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/ cp -r ${PREFIX}/targets/x86_64-linux/include ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cuda/extras/CUPTI/ mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cudnn - cp ${PREFIX}/include/cudnn*.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cudnn/ - mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl - cp ${PREFIX}/include/nccl.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl/ - rsync -a ${PREFIX}/targets/x86_64-linux/lib/ ${BUILD_PREFIX}/targets/x86_64-linux/lib/ - ln -s ${BUILD_PREFIX}/bin/fatbinary ${BUILD_PREFIX}/targets/x86_64-linux/bin/fatbinary - ln -s ${BUILD_PREFIX}/bin/nvlink ${BUILD_PREFIX}/targets/x86_64-linux/bin/nvlink - ln -s ${BUILD_PREFIX}/bin/ptxas ${BUILD_PREFIX}/targets/x86_64-linux/bin/ptxas - - export LOCAL_CUDA_PATH="${BUILD_PREFIX}/targets/x86_64-linux" + cp ${PREFIX}/include/cudnn*.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/gpus/cudnn/ + mkdir -p ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl + cp ${PREFIX}/include/nccl.h ${BUILD_PREFIX}/targets/x86_64-linux/include/third_party/nccl/ + rsync -a ${PREFIX}/targets/x86_64-linux/lib/ ${BUILD_PREFIX}/targets/x86_64-linux/lib/ + ln -s ${BUILD_PREFIX}/bin/fatbinary ${BUILD_PREFIX}/targets/x86_64-linux/bin/fatbinary + ln -s ${BUILD_PREFIX}/bin/nvlink ${BUILD_PREFIX}/targets/x86_64-linux/bin/nvlink + ln -s ${BUILD_PREFIX}/bin/ptxas ${BUILD_PREFIX}/targets/x86_64-linux/bin/ptxas + + export LOCAL_CUDA_PATH="${BUILD_PREFIX}/targets/x86_64-linux" export LOCAL_CUDNN_PATH="${PREFIX}" export LOCAL_NCCL_PATH="${PREFIX}" - # hmaarrfk -- 2023/12/30 + # hmaarrfk -- 2023/12/30 # This logic should be safe to keep in even when the underlying issue is resolved # xref: https://github.com/conda-forge/cuda-nvcc-impl-feedstock/issues/9 if [[ -x ${BUILD_PREFIX}/nvvm/bin/cicc ]]; then cp ${BUILD_PREFIX}/nvvm/bin/cicc ${BUILD_PREFIX}/bin/cicc fi - - # Needs GCC 13+ - echo "build --define=xnn_enable_avxvnniint8=false" >> .bazelrc + + # Needs GCC 13+ + echo "build --define=xnn_enable_avxvnniint8=false" >> .bazelrc # cuda-compat is used for providing libcuda.so.1 temporarily cp $PREFIX/cuda-compat/libcuda.so.1 $PREFIX/lib/libcuda.so.1 From 4a78d663d72bd213326327de00ea7d10d075dcda Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 11 Jan 2025 14:06:42 -0500 Subject: [PATCH 25/64] Try to address missing libcuda.so.1 --- recipe/build_pkg.sh | 10 ++++++++++ recipe/meta.yaml | 1 + 2 files changed, 11 insertions(+) diff --git a/recipe/build_pkg.sh b/recipe/build_pkg.sh index 22eb89296..dc40b3109 100644 --- a/recipe/build_pkg.sh +++ b/recipe/build_pkg.sh @@ -1,9 +1,19 @@ #! /bin/bash set -exuo pipefail +if [[ "${cuda_compiler_version}" == 12* ]]; then + # cuda-compat is used for providing libcuda.so.1 temporarily + cp $PREFIX/cuda-compat/libcuda.so.1 $PREFIX/lib/libcuda.so.1 +fi # install the whl making sure to use host pip/python if cross-compiling ${PYTHON} -m pip install --no-deps $SRC_DIR/tensorflow_pkg/*.whl # The tensorboard package has the proper entrypoint rm -f ${PREFIX}/bin/tensorboard + +if [[ "${cuda_compiler_version}" == 12* ]]; then + # This was needed to load in the cuda symbols correctly temporarily + # https://github.com/conda-forge/tensorflow-feedstock/pull/408#issuecomment-2585259178 + rm -f $PREFIX/lib/libcuda.so.1 +fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3faa2c4e0..c24f24c15 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -196,6 +196,7 @@ outputs: - libcurand-dev # [(cuda_compiler_version or "").startswith("12")] - libcufft-dev # [(cuda_compiler_version or "").startswith("12")] - libcusparse-dev # [(cuda_compiler_version or "").startswith("12")] + - cuda-compat # [(cuda_compiler_version or "").startswith("12")] - libnvjitlink-dev # [(cuda_compiler_version or "").startswith("12")] # conda build requirements - python From ab0b5327ffc61bde0ea67a90d036df7b7351cd11 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 12 Jan 2025 08:10:47 -0500 Subject: [PATCH 26/64] Add cuda-compat to estimator as well --- recipe/build_estimator.sh | 11 +++++++++++ recipe/meta.yaml | 1 + 2 files changed, 12 insertions(+) diff --git a/recipe/build_estimator.sh b/recipe/build_estimator.sh index ad6a70b58..9dc4b74d6 100644 --- a/recipe/build_estimator.sh +++ b/recipe/build_estimator.sh @@ -2,6 +2,11 @@ set -exuo pipefail +if [[ "${cuda_compiler_version}" == 12* ]]; then + # cuda-compat is used for providing libcuda.so.1 temporarily + cp $PREFIX/cuda-compat/libcuda.so.1 $PREFIX/lib/libcuda.so.1 +fi + pushd tensorflow-estimator WHEEL_DIR=${PWD}/wheel_dir @@ -14,3 +19,9 @@ bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package ${WHEEL_DIR} ${PYTHON} -m pip install --no-deps ${WHEEL_DIR}/*.whl bazel clean popd + +if [[ "${cuda_compiler_version}" == 12* ]]; then + # This was needed to load in the cuda symbols correctly temporarily + # https://github.com/conda-forge/tensorflow-feedstock/pull/408#issuecomment-2585259178 + rm -f $PREFIX/lib/libcuda.so.1 +fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c24f24c15..daacac65f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -344,6 +344,7 @@ outputs: - icu # [build_platform != target_platform] - {{ pin_subpackage('tensorflow-base') }} # [build_platform != target_platform] host: + - cuda-compat # [(cuda_compiler_version or "").startswith("12")] - python - pip - packaging From fac070f152a2735f0cbbcaa2fedbc56ce8b2b907 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 12 Jan 2025 13:41:36 -0500 Subject: [PATCH 27/64] Add flatbuffers --- .ci_support/migrations/flatbuffers241223.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .ci_support/migrations/flatbuffers241223.yaml diff --git a/.ci_support/migrations/flatbuffers241223.yaml b/.ci_support/migrations/flatbuffers241223.yaml new file mode 100644 index 000000000..90d5d5cf6 --- /dev/null +++ b/.ci_support/migrations/flatbuffers241223.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for flatbuffers 24.12.23 + kind: version + migration_number: 1 +flatbuffers: +- 24.12.23 +migrator_ts: 1736590646.156009 From aac4613dbb49c2b28f45dc49ad2f50bd6e7d3bd5 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 12 Jan 2025 14:45:35 -0500 Subject: [PATCH 28/64] also remove acceleration --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index a8989991b..035a1da96 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -230,6 +230,7 @@ flatc --cpp --gen-object-api schema.fbs popd rm -f tensorflow/lite/schema/conversion_metadata_generated.h rm -f tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h +rm -f tensorflow/lite/acceleration/configuration/configuration_generated.h sed -ie "s;BUILD_PREFIX;${BUILD_PREFIX};g" tensorflow/tools/pip_package/build_pip_package.py # build using bazel From 69e9674b3047d60515bba943eb07d4b79ec1385a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 Jan 2025 19:29:38 +1100 Subject: [PATCH 29/64] undo bot damage --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index daacac65f..f75c9536b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,3 @@ -{% set tensorflow_cpu_gpu = "tensorflow-gpu" %} # [cuda_compiler_version != "None"] -{% set tensorflow_cpu_gpu = "tensorflow-cpu" %} # [cuda_compiler_version == "None" or cuda_compiler_version is undefined] {% set version = "2.18.0" %} {% set estimator_version = "2.15.0" %} {% set build = 0 %} From d6f04395770fe6b02417bb3bdfb15414d0b363e3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 Jan 2025 19:31:40 +1100 Subject: [PATCH 30/64] remove obsolete skips --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f75c9536b..581a1c3d5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -54,8 +54,6 @@ source: build: number: {{ build }} skip: true # [win] - skip: true # [python_impl == 'pypy'] - skip: true # [py<39] # The following skip can be removed when the absl::StrFormat build issues are fixed. skip: true # [cuda_compiler_version == "11.8"] From 5e1b0d3360d6ede76a613d0cc4b934844569fa6b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 Jan 2025 19:32:16 +1100 Subject: [PATCH 31/64] Revert "Stick to clang17" This reverts commit d77bdcf1e216b710fa848c10e7fc525a1c5acbde. --- recipe/conda_build_config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index b54e72f14..122349f87 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,2 @@ github_actions_labels: - cirun-openstack-gpu-xlarge -c_compiler_version: # [osx] - - '17' # [osx] -cxx_compiler_version: # [osx] - - '17' # [osx] From 26685e55a4b8c63f9d1ba053b5394c0977ca33e8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 23 Jan 2025 09:06:13 +1100 Subject: [PATCH 32/64] use a bigger runner; non-CUDA builds on CPU agents --- 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 122349f87..376611483 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,3 @@ -github_actions_labels: -- cirun-openstack-gpu-xlarge +github_actions_labels: # [linux] +- cirun-openstack-gpu-2xlarge # [linux] +- cirun-openstack-cpu-2xlarge # [linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 581a1c3d5..04d151850 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,6 +56,10 @@ build: skip: true # [win] # The following skip can be removed when the absl::StrFormat build issues are fixed. skip: true # [cuda_compiler_version == "11.8"] + # CUDA builds on GPU agents, non-CUDA builds on CPU agents; these gymnastics would be avoidable with + # https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/6910, but that didn't find consensus + skip: true # [cuda_compiler_version == "None" and github_actions_labels == "cirun-openstack-gpu-2xlarge"] + skip: true # [cuda_compiler_version != "None" and github_actions_labels == "cirun-openstack-cpu-2xlarge"] requirements: build: From 52e4ee282017587b5fb1299e483f9ad08536e43d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 23 Jan 2025 09:12:51 +1100 Subject: [PATCH 33/64] MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.3, and conda-forge-pinning 2025.01.22.17.59.35 --- ...ck-cpu-2xlargepython3.10.____cpython.yaml} | 11 +-- ...ck-cpu-2xlargepython3.11.____cpython.yaml} | 11 +-- ...ck-cpu-2xlargepython3.12.____cpython.yaml} | 11 +-- ...ack-cpu-2xlargepython3.9.____cpython.yaml} | 11 +-- ...ack-gpu-2xlargepython3.10.____cpython.yaml | 78 ++++++++++++++++ ...ack-gpu-2xlargepython3.11.____cpython.yaml | 78 ++++++++++++++++ ...ack-gpu-2xlargepython3.12.____cpython.yaml | 78 ++++++++++++++++ ...tack-gpu-2xlargepython3.9.____cpython.yaml | 78 ++++++++++++++++ ...ck-cpu-2xlargepython3.10.____cpython.yaml} | 15 ++-- ...ck-cpu-2xlargepython3.11.____cpython.yaml} | 15 ++-- ...ck-cpu-2xlargepython3.12.____cpython.yaml} | 15 ++-- ...ack-cpu-2xlargepython3.9.____cpython.yaml} | 15 ++-- ...ack-gpu-2xlargepython3.10.____cpython.yaml | 78 ++++++++++++++++ ...ack-gpu-2xlargepython3.11.____cpython.yaml | 78 ++++++++++++++++ ...ack-gpu-2xlargepython3.12.____cpython.yaml | 78 ++++++++++++++++ ...tack-gpu-2xlargepython3.9.____cpython.yaml | 78 ++++++++++++++++ .../osx_64_python3.10.____cpython.yaml | 15 ++-- .../osx_64_python3.11.____cpython.yaml | 15 ++-- .../osx_64_python3.12.____cpython.yaml | 15 ++-- .ci_support/osx_64_python3.9.____cpython.yaml | 15 ++-- .../osx_arm64_python3.10.____cpython.yaml | 15 ++-- .../osx_arm64_python3.11.____cpython.yaml | 15 ++-- .../osx_arm64_python3.12.____cpython.yaml | 15 ++-- .../osx_arm64_python3.9.____cpython.yaml | 15 ++-- .github/workflows/conda-build.yml | 72 +++++++++++---- README.md | 88 +++++++++++++++---- 26 files changed, 832 insertions(+), 176 deletions(-) rename .ci_support/{linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml => linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml => linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml => linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml} (90%) rename .ci_support/{linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml => linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml} (90%) create mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml => linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml} (88%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml => linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml} (88%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml => linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml} (88%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml => linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml} (88%) create mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml create mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml index 81a48556d..aba9594b3 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml @@ -25,11 +25,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' github_actions_labels: -- cirun-openstack-gpu-xlarge +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 nccl: - '2' numpy: @@ -58,8 +58,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -76,6 +74,5 @@ zip_keys: - docker_image - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml index e2c5fcad9..ff9250874 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml @@ -25,11 +25,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' github_actions_labels: -- cirun-openstack-gpu-xlarge +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 nccl: - '2' numpy: @@ -58,8 +58,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -76,6 +74,5 @@ zip_keys: - docker_image - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml index e7cb96132..55d773bfa 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml @@ -25,11 +25,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' github_actions_labels: -- cirun-openstack-gpu-xlarge +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 nccl: - '2' numpy: @@ -58,8 +58,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -76,6 +74,5 @@ zip_keys: - docker_image - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml similarity index 90% rename from .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml index d77164363..62b9671fc 100644 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml @@ -25,11 +25,11 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' github_actions_labels: -- cirun-openstack-gpu-xlarge +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 nccl: - '2' numpy: @@ -58,8 +58,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -76,6 +74,5 @@ zip_keys: - docker_image - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml new file mode 100644 index 000000000..32ae2454c --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +flatbuffers: +- 24.12.23 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-gpu-2xlarge +icu: +- '75' +libabseil: +- '20240722' +libcurl: +- '8' +libgrpc: +- '1.67' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 5.28.3 +nccl: +- '2' +numpy: +- '2.0' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +snappy: +- '1.2' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.16' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml new file mode 100644 index 000000000..c96ac32b0 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +flatbuffers: +- 24.12.23 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-gpu-2xlarge +icu: +- '75' +libabseil: +- '20240722' +libcurl: +- '8' +libgrpc: +- '1.67' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 5.28.3 +nccl: +- '2' +numpy: +- '2.0' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +snappy: +- '1.2' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.16' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml new file mode 100644 index 000000000..c110d6154 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +flatbuffers: +- 24.12.23 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-gpu-2xlarge +icu: +- '75' +libabseil: +- '20240722' +libcurl: +- '8' +libgrpc: +- '1.67' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 5.28.3 +nccl: +- '2' +numpy: +- '2.0' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +snappy: +- '1.2' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.16' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml new file mode 100644 index 000000000..8b35242e0 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +flatbuffers: +- 24.12.23 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-gpu-2xlarge +icu: +- '75' +libabseil: +- '20240722' +libcurl: +- '8' +libgrpc: +- '1.67' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 5.28.3 +nccl: +- '2' +numpy: +- '2.0' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +snappy: +- '1.2' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.16' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml index bdae2c04e..c008a7a22 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -21,15 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' github_actions_labels: -- cirun-openstack-gpu-xlarge +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 nccl: - '2' numpy: @@ -58,8 +58,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -76,6 +74,5 @@ zip_keys: - docker_image - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml index f2ddac7bc..13854d416 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -21,15 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' github_actions_labels: -- cirun-openstack-gpu-xlarge +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 nccl: - '2' numpy: @@ -58,8 +58,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -76,6 +74,5 @@ zip_keys: - docker_image - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml index ffa9f2e80..2ed17df65 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -21,15 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' github_actions_labels: -- cirun-openstack-gpu-xlarge +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 nccl: - '2' numpy: @@ -58,8 +58,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -76,6 +74,5 @@ zip_keys: - docker_image - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml index 12bbb5ac0..b9d3f1cce 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -21,15 +21,15 @@ cudnn: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' github_actions_labels: -- cirun-openstack-gpu-xlarge +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: @@ -37,13 +37,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 nccl: - '2' numpy: @@ -58,8 +58,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -76,6 +74,5 @@ zip_keys: - docker_image - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml new file mode 100644 index 000000000..de0bb9730 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.6' +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +flatbuffers: +- 24.12.23 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-gpu-2xlarge +icu: +- '75' +libabseil: +- '20240722' +libcurl: +- '8' +libgrpc: +- '1.67' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 5.28.3 +nccl: +- '2' +numpy: +- '2.0' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +snappy: +- '1.2' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.16' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml new file mode 100644 index 000000000..5ab1e9d4c --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.6' +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +flatbuffers: +- 24.12.23 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-gpu-2xlarge +icu: +- '75' +libabseil: +- '20240722' +libcurl: +- '8' +libgrpc: +- '1.67' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 5.28.3 +nccl: +- '2' +numpy: +- '2.0' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +snappy: +- '1.2' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.16' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml new file mode 100644 index 000000000..58500d2dc --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.6' +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +flatbuffers: +- 24.12.23 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-gpu-2xlarge +icu: +- '75' +libabseil: +- '20240722' +libcurl: +- '8' +libgrpc: +- '1.67' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 5.28.3 +nccl: +- '2' +numpy: +- '2.0' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +snappy: +- '1.2' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.16' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml new file mode 100644 index 000000000..673a8cd3a --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml @@ -0,0 +1,78 @@ +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.6' +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +flatbuffers: +- 24.12.23 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-gpu-2xlarge +icu: +- '75' +libabseil: +- '20240722' +libcurl: +- '8' +libgrpc: +- '1.67' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 5.28.3 +nccl: +- '2' +numpy: +- '2.0' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +snappy: +- '1.2' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.16' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 87cf7fea7..719bdd1d2 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,13 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' -github_actions_labels: -- cirun-openstack-gpu-xlarge icu: - '75' libabseil: @@ -35,13 +33,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -54,8 +52,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -69,6 +65,5 @@ zip_keys: - cxx_compiler_version - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index ebcd1df4d..c9ccfe0d5 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,13 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' -github_actions_labels: -- cirun-openstack-gpu-xlarge icu: - '75' libabseil: @@ -35,13 +33,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -54,8 +52,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -69,6 +65,5 @@ zip_keys: - cxx_compiler_version - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index b7205850e..65049e696 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,13 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' -github_actions_labels: -- cirun-openstack-gpu-xlarge icu: - '75' libabseil: @@ -35,13 +33,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -54,8 +52,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -69,6 +65,5 @@ zip_keys: - cxx_compiler_version - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 7d6272f6b..ecb387103 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,13 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' -github_actions_labels: -- cirun-openstack-gpu-xlarge icu: - '75' libabseil: @@ -35,13 +33,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -54,8 +52,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -69,6 +65,5 @@ zip_keys: - cxx_compiler_version - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 63730328d..c5998c68e 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,13 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' -github_actions_labels: -- cirun-openstack-gpu-xlarge icu: - '75' libabseil: @@ -35,13 +33,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -54,8 +52,6 @@ pin_run_as_build: max_pin: x.x python: - 3.10.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -69,6 +65,5 @@ zip_keys: - cxx_compiler_version - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 5c4a691d7..a9a99aee3 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,13 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' -github_actions_labels: -- cirun-openstack-gpu-xlarge icu: - '75' libabseil: @@ -35,13 +33,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -54,8 +52,6 @@ pin_run_as_build: max_pin: x.x python: - 3.11.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -69,6 +65,5 @@ zip_keys: - cxx_compiler_version - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 7ba512745..9d3932304 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,13 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' -github_actions_labels: -- cirun-openstack-gpu-xlarge icu: - '75' libabseil: @@ -35,13 +33,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -54,8 +52,6 @@ pin_run_as_build: max_pin: x.x python: - 3.12.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -69,6 +65,5 @@ zip_keys: - cxx_compiler_version - - python - numpy - - python_impl zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 355e58a21..0a853b95a 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,13 +21,11 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' flatbuffers: -- 24.3.25 +- 24.12.23 giflib: - '5.2' -github_actions_labels: -- cirun-openstack-gpu-xlarge icu: - '75' libabseil: @@ -35,13 +33,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.65' +- '1.67' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 5.27.5 +- 5.28.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -54,8 +52,6 @@ pin_run_as_build: max_pin: x.x python: - 3.9.* *_cpython -python_impl: -- cpython snappy: - '1.2' sqlite: @@ -69,6 +65,5 @@ zip_keys: - cxx_compiler_version - - python - numpy - - python_impl zlib: - '1' diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 54d334232..a90b14943 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,52 +21,92 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython + - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h9bec57d5dc', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h12503d8612', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h92b00213a3', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h850a03f102', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h44fdbcfc65', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h8d978607a5', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython + - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h7e1b4662c4', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h9e60d2dc29', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython + - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_hdf3f9bfbcc', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hfd09bcd031', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython + - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h6bc6036033', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h29fbfd0e94', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpython + - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_he2cc3ae66e', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h3fb8a7119a', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hf1ded927e1', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h5150963578', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h1a635e5433', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hbcb2d56ac4', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpython + - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h70857f1454', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h52f7d18533', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpython + - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h2dff17f9f4', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h87b80391e1', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpython + - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-gpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hbe4b9baad6', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h524079c377', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" steps: diff --git a/README.md b/README.md index 31e945345..67620d669 100644 --- a/README.md +++ b/README.md @@ -37,59 +37,115 @@ Current build status
VariantStatus
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpython - variant + variant
- + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + From 866afcce68415176a3c612ea76124a266c4bd662 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 09:20:09 +1100 Subject: [PATCH 34/64] build osx on linux --- conda-forge.yml | 3 ++- recipe/conda_build_config.yaml | 4 ++-- recipe/meta.yaml | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 1518f6828..a60fe33d9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -4,7 +4,8 @@ azure: settings_osx: timeoutInMinutes: 1 build_platform: - osx_arm64: osx_64 + osx_64: linux_64 + osx_arm64: linux_64 conda_build: pkg_format: '2' conda_build_tool: conda-build+conda-libmamba-solver diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 376611483..a8be50340 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,3 @@ -github_actions_labels: # [linux] +github_actions_labels: - cirun-openstack-gpu-2xlarge # [linux] -- cirun-openstack-cpu-2xlarge # [linux] +- cirun-openstack-cpu-2xlarge # [osx] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 04d151850..581a1c3d5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,10 +56,6 @@ build: skip: true # [win] # The following skip can be removed when the absl::StrFormat build issues are fixed. skip: true # [cuda_compiler_version == "11.8"] - # CUDA builds on GPU agents, non-CUDA builds on CPU agents; these gymnastics would be avoidable with - # https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/6910, but that didn't find consensus - skip: true # [cuda_compiler_version == "None" and github_actions_labels == "cirun-openstack-gpu-2xlarge"] - skip: true # [cuda_compiler_version != "None" and github_actions_labels == "cirun-openstack-cpu-2xlarge"] requirements: build: From a4e2043d2c5d22102ea468cd245baf9b5217c773 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 10:02:55 +1100 Subject: [PATCH 35/64] DEBUG: build only osx on azure --- conda-forge.yml | 4 ---- recipe/meta.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index a60fe33d9..e25f63563 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,4 @@ azure: - settings_linux: - timeoutInMinutes: 1 settings_osx: timeoutInMinutes: 1 build_platform: @@ -19,6 +17,4 @@ github_actions: triggers: - push - pull_request -provider: - linux_64: github_actions test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 581a1c3d5..94c60a34d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -53,7 +53,7 @@ source: build: number: {{ build }} - skip: true # [win] + skip: true # [not osx] # The following skip can be removed when the absl::StrFormat build issues are fixed. skip: true # [cuda_compiler_version == "11.8"] From 1c9a6dc1cdfb4742b34279564ed615a5c88f51d8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 10:06:08 +1100 Subject: [PATCH 36/64] MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and conda-forge-pinning 2025.01.31.17.27.30 --- .azure-pipelines/azure-pipelines-linux.yml | 72 +++++++ .azure-pipelines/azure-pipelines-osx.yml | 58 ------ ...ack-cpu-2xlargepython3.10.____cpython.yaml | 78 -------- ...ack-cpu-2xlargepython3.11.____cpython.yaml | 78 -------- ...ack-cpu-2xlargepython3.12.____cpython.yaml | 78 -------- ...tack-cpu-2xlargepython3.9.____cpython.yaml | 78 -------- ...ack-gpu-2xlargepython3.10.____cpython.yaml | 78 -------- ...ack-gpu-2xlargepython3.11.____cpython.yaml | 78 -------- ...ack-gpu-2xlargepython3.12.____cpython.yaml | 78 -------- ...tack-gpu-2xlargepython3.9.____cpython.yaml | 78 -------- ...ack-cpu-2xlargepython3.10.____cpython.yaml | 78 -------- ...ack-cpu-2xlargepython3.11.____cpython.yaml | 78 -------- ...ack-cpu-2xlargepython3.12.____cpython.yaml | 78 -------- ...tack-cpu-2xlargepython3.9.____cpython.yaml | 78 -------- ...ack-gpu-2xlargepython3.10.____cpython.yaml | 78 -------- ...ack-gpu-2xlargepython3.11.____cpython.yaml | 78 -------- ...ack-gpu-2xlargepython3.12.____cpython.yaml | 78 -------- ...tack-gpu-2xlargepython3.9.____cpython.yaml | 78 -------- .../osx_64_python3.10.____cpython.yaml | 4 + .../osx_64_python3.11.____cpython.yaml | 4 + .../osx_64_python3.12.____cpython.yaml | 4 + .ci_support/osx_64_python3.9.____cpython.yaml | 4 + .../osx_arm64_python3.10.____cpython.yaml | 4 + .../osx_arm64_python3.11.____cpython.yaml | 4 + .../osx_arm64_python3.12.____cpython.yaml | 4 + .../osx_arm64_python3.9.____cpython.yaml | 4 + .github/workflows/conda-build.yml | 184 ------------------ .gitignore | 3 + .scripts/run_osx_build.sh | 120 ------------ README.md | 119 +---------- azure-pipelines.yml | 2 +- 31 files changed, 111 insertions(+), 1727 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-linux.yml delete mode 100755 .azure-pipelines/azure-pipelines-osx.yml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml delete mode 100644 .ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml delete mode 100644 .github/workflows/conda-build.yml delete mode 100755 .scripts/run_osx_build.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml new file mode 100755 index 000000000..95da4fe82 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -0,0 +1,72 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: linux + pool: + vmImage: ubuntu-latest + strategy: + matrix: + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + timeoutInMinutes: 360 + variables: {} + + steps: + # configure qemu binfmt-misc running. This allows us to run docker containers + # embedded qemu-static + - script: | + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + ls /proc/sys/fs/binfmt_misc/ + condition: not(startsWith(variables['CONFIG'], 'linux_64')) + displayName: Configure binfmt_misc + + - script: | + export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi + .scripts/run_docker_build.sh + displayName: Run docker build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml deleted file mode 100755 index 8868805c6..000000000 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ /dev/null @@ -1,58 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: osx - pool: - vmImage: macOS-13 - strategy: - matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.11.____cpython: - CONFIG: osx_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - 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 - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.11.____cpython: - CONFIG: osx_arm64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - 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: 1 - variables: {} - - steps: - # TODO: Fast finish on azure pipelines? - - script: | - export CI=azure - export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) - export remote_url=$(Build.Repository.Uri) - export sha=$(Build.SourceVersion) - export OSX_FORCE_SDK_DOWNLOAD="1" - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then - export IS_PR_BUILD="True" - else - export IS_PR_BUILD="False" - fi - ./.scripts/run_osx_build.sh - displayName: Run OSX build - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml deleted file mode 100644 index aba9594b3..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-cpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml deleted file mode 100644 index ff9250874..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-cpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml deleted file mode 100644 index 55d773bfa..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-cpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml deleted file mode 100644 index 62b9671fc..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-cpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml deleted file mode 100644 index 32ae2454c..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-gpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml deleted file mode 100644 index c96ac32b0..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-gpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml deleted file mode 100644 index c110d6154..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-gpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml deleted file mode 100644 index 8b35242e0..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-gpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml deleted file mode 100644 index c008a7a22..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-cpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml deleted file mode 100644 index 13854d416..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-cpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml deleted file mode 100644 index 2ed17df65..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-cpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml deleted file mode 100644 index b9d3f1cce..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-cpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml deleted file mode 100644 index de0bb9730..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-gpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml deleted file mode 100644 index 5ab1e9d4c..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-gpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml deleted file mode 100644 index 58500d2dc..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-gpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml deleted file mode 100644 index 673a8cd3a..000000000 --- a/.ci_support/linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython.yaml +++ /dev/null @@ -1,78 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -flatbuffers: -- 24.12.23 -giflib: -- '5.2' -github_actions_labels: -- cirun-openstack-gpu-2xlarge -icu: -- '75' -libabseil: -- '20240722' -libcurl: -- '8' -libgrpc: -- '1.67' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libprotobuf: -- 5.28.3 -nccl: -- '2' -numpy: -- '2.0' -openssl: -- '3' -perl: -- 5.32.1 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -snappy: -- '1.2' -sqlite: -- '3' -target_platform: -- linux-64 -tensorflow: -- '2.16' -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - python - - numpy -zlib: -- '1' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 719bdd1d2..d6689e621 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -22,10 +22,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '18' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.12.23 giflib: - '5.2' +github_actions_labels: +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index c9ccfe0d5..ddbe36bd0 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -22,10 +22,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '18' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.12.23 giflib: - '5.2' +github_actions_labels: +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index 65049e696..90ab20ddc 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -22,10 +22,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '18' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.12.23 giflib: - '5.2' +github_actions_labels: +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index ecb387103..6f72ea95d 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -22,10 +22,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '18' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.12.23 giflib: - '5.2' +github_actions_labels: +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index c5998c68e..5fb1556d6 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -22,10 +22,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '18' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.12.23 giflib: - '5.2' +github_actions_labels: +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index a9a99aee3..0b5a0c572 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -22,10 +22,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '18' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.12.23 giflib: - '5.2' +github_actions_labels: +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index 9d3932304..2d662ad75 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -22,10 +22,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '18' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.12.23 giflib: - '5.2' +github_actions_labels: +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 0a853b95a..28eac98d4 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -22,10 +22,14 @@ cxx_compiler: - clangxx cxx_compiler_version: - '18' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 flatbuffers: - 24.12.23 giflib: - '5.2' +github_actions_labels: +- cirun-openstack-cpu-2xlarge icu: - '75' libabseil: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml deleted file mode 100644 index a90b14943..000000000 --- a/.github/workflows/conda-build.yml +++ /dev/null @@ -1,184 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -name: Build conda package -on: - push: - - pull_request: - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} - cancel-in-progress: true - -jobs: - build: - name: ${{ matrix.CONFIG }} - runs-on: ${{ matrix.runs_on }} - timeout-minutes: 720 - strategy: - fail-fast: false - matrix: - include: - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h12503d8612', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h92b00213a3', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h850a03f102', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h44fdbcfc65', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h8d978607a5', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h9e60d2dc29', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hfd09bcd031', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h29fbfd0e94', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_he2cc3ae66e', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h3fb8a7119a', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hf1ded927e1', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-cpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h5150963578', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_hbcb2d56ac4', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h52f7d18533', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h87b80391e1', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_c_compiler_version13cuda_c_h524079c377', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - steps: - - - name: Checkout code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - - - name: Build on Linux - if: matrix.os == 'ubuntu' - env: - CONFIG: ${{ matrix.CONFIG }} - UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} - DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }} - CI: github_actions - CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}" - BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} - FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} - STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} - shell: bash - run: | - echo "::group::Configure binfmt_misc" - docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes - export flow_run_id="github_$GITHUB_RUN_ID" - export remote_url="https://github.com/$GITHUB_REPOSITORY" - export sha="$GITHUB_SHA" - export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export GIT_BRANCH="$(basename $GITHUB_REF)" - if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then - export IS_PR_BUILD="True" - else - export IS_PR_BUILD="False" - fi - echo "::endgroup::" - ./.scripts/run_docker_build.sh - - - name: Build on macOS - if: matrix.os == 'macos' - env: - CONFIG: ${{ matrix.CONFIG }} - UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} - CI: github_actions - BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} - FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} - STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} - shell: bash - run: | - export flow_run_id="github_$GITHUB_RUN_ID" - export remote_url="https://github.com/$GITHUB_REPOSITORY" - export sha="$GITHUB_SHA" - export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)" - export GIT_BRANCH="$(basename $GITHUB_REF)" - if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then - export IS_PR_BUILD="True" - else - export IS_PR_BUILD="False" - fi - ./.scripts/run_osx_build.sh - - - name: Build on windows - shell: cmd - run: | - set "flow_run_id=github_%GITHUB_RUN_ID%" - set "remote_url=https://github.com/%GITHUB_REPOSITORY%" - set "sha=%GITHUB_SHA%" - call ".scripts\run_win_build.bat" - env: - MINIFORGE_HOME: D:\Miniforge - PYTHONUNBUFFERED: 1 - CONFIG: ${{ matrix.CONFIG }} - CI: github_actions - UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }} - BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }} - FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }} - STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }} - if: matrix.os == 'windows' \ No newline at end of file diff --git a/.gitignore b/.gitignore index 179afe55e..bb3853666 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh deleted file mode 100755 index 14bc5e47a..000000000 --- a/.scripts/run_osx_build.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/env bash - -# -*- mode: jinja-shell -*- - -source .scripts/logging_utils.sh - -set -xe - -MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" -MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash -export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" - -( startgroup "Provisioning base env with micromamba" ) 2> /dev/null -MICROMAMBA_VERSION="1.5.10-0" -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-libmamba-solver 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 -echo "Activating environment" -source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" -conda activate base -export CONDA_SOLVER="libmamba" -export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - - - - - -echo -e "\n\nSetting up the condarc and mangling the compiler." -setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - -if [[ "${CI:-}" != "" ]]; then - mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -fi - -if [[ "${CI:-}" != "" ]]; then - echo -e "\n\nMangling homebrew in the CI to avoid conflicts." - /usr/bin/sudo mangle_homebrew - /usr/bin/sudo -k -else - echo -e "\n\nNot mangling homebrew as we are not running in CI" -fi - -if [[ "${sha:-}" == "" ]]; then - sha=$(git rev-parse HEAD) -fi - -echo -e "\n\nRunning the build setup script." -source run_conda_forge_build_setup - - - -( endgroup "Configuring conda" ) 2> /dev/null - -echo -e "\n\nMaking the build clobber file" -make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - -if [[ -f LICENSE.txt ]]; then - cp LICENSE.txt "recipe/recipe-scripts-license.txt" -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}" - fi - conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ - ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - # Drop into an interactive shell - /bin/bash -else - - if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" - fi - - CONDA_SOLVER=libmamba 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}" - - ( endgroup "Validating outputs" ) 2> /dev/null - - ( startgroup "Uploading packages" ) 2> /dev/null - - if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml - fi - - ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file diff --git a/README.md b/README.md index 67620d669..7c640e83d 100644 --- a/README.md +++ b/README.md @@ -37,118 +37,6 @@ Current build status
VariantStatus
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.10.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.11.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.12.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12python3.9.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython - variant + variant
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.10.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython - variant + variant
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.11.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython - variant + variant
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.12.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython - variant + variant
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13python3.9.____cpythonlinux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython - variant + variant + +
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython + + variant + +
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython + + variant + +
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython + + variant + +
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython + + variant + +
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython + + variant + +
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython + + variant + +
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython + + variant + +
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython + + variant
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.10.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.11.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.12.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-cpu-2xlargepython3.9.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.10.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.11.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.12.____cpython - - variant - -
linux_64_c_compiler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13github_actions_labelscirun-openstack-gpu-2xlargepython3.9.____cpython - - variant - -
osx_64_python3.10.____cpython @@ -223,7 +111,6 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--base-green.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-base.svg)](https://anaconda.org/conda-forge/tensorflow-base) | | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--cpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-cpu.svg)](https://anaconda.org/conda-forge/tensorflow-cpu) | | [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--estimator-green.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-estimator.svg)](https://anaconda.org/conda-forge/tensorflow-estimator) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-tensorflow--gpu-green.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/tensorflow-gpu.svg)](https://anaconda.org/conda-forge/tensorflow-gpu) | Installing tensorflow ===================== @@ -235,16 +122,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator, tensorflow-gpu` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libtensorflow, libtensorflow_cc, tensorflow, tensorflow-base, tensorflow-cpu, tensorflow-estimator` can be installed with `conda`: ``` -conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu +conda install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator ``` or with `mamba`: ``` -mamba install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator tensorflow-gpu +mamba install libtensorflow libtensorflow_cc tensorflow tensorflow-base tensorflow-cpu tensorflow-estimator ``` It is possible to list all of the versions of `libtensorflow` available on your platform with `conda`: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a13f0ae28..d309e84b2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,4 +28,4 @@ stages: condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) dependsOn: Check jobs: - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file From fb9687529e1446f4269aa84f617f4f5f6880f4b4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 10:23:14 +1100 Subject: [PATCH 37/64] set CONDA_OVERRIDE_OSX --- .scripts/build_steps.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6970424c7..a421602c0 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -50,6 +50,9 @@ 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" + if [[ "${BUILD_PLATFORM}" == linux-* ]]; then + export CONDA_OVERRIDE_OSX="11.0" + fi fi From ac5d57c35c3ab45e16e4a1d5c5b2c3681124cf24 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 11:19:10 +1100 Subject: [PATCH 38/64] DEBUG: inspect custom_toolchain before/after gen-bazel-toolchain.sh --- recipe/build.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 035a1da96..0684495c2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -155,7 +155,19 @@ else export TF_NEED_CUDA=0 fi +seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' +echo "before gen-bazel-toolchain.sh" +seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' +find ./custom_toolchain | xargs cat +seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' +echo "run gen-bazel-toolchain.sh" +seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' source ${RECIPE_DIR}/gen-bazel-toolchain.sh +seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' +echo "after gen-bazel-toolchain.sh" +seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' +find ./custom_toolchain | xargs cat +seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' if [[ "${target_platform}" == "osx-64" ]]; then # Tensorflow doesn't cope yet with an explicit architecture (darwin_x86_64) on osx-64 yet. From 44b592dbdfa6fbd9defb331d909e06c87ceacf9b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 11:47:10 +1100 Subject: [PATCH 39/64] hack on custom toolchain --- recipe/custom_toolchain/CROSSTOOL.template | 19 +++++++++---------- .../custom_toolchain/cc_toolchain_config.bzl | 14 +++++++------- recipe/meta.yaml | 1 + 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/recipe/custom_toolchain/CROSSTOOL.template b/recipe/custom_toolchain/CROSSTOOL.template index 840230023..10c2c1183 100644 --- a/recipe/custom_toolchain/CROSSTOOL.template +++ b/recipe/custom_toolchain/CROSSTOOL.template @@ -34,14 +34,13 @@ toolchain { linker_flag: "-undefined" linker_flag: "dynamic_lookup" linker_flag: "-force_load" - linker_flag: "${BUILD_PREFIX}/lib/libc++.a" + linker_flag: "${PREFIX}/lib/libc++.a" linker_flag: "-force_load" - linker_flag: "${BUILD_PREFIX}/lib/libc++abi.a" + linker_flag: "-lc++abi.a" linker_flag: "-nostdlib" linker_flag: "-lc" linker_flag: "-isysroot${CONDA_BUILD_SYSROOT}" cxx_builtin_include_directory: "${PREFIX}/include/c++/v1" - cxx_builtin_include_directory: "${PREFIX}/lib/clang/10.0.0/include" cxx_builtin_include_directory: "${CONDA_BUILD_SYSROOT}/usr/include" cxx_builtin_include_directory: "${CONDA_BUILD_SYSROOT}/System/Library/Frameworks" objcopy_embed_flag: "-I" @@ -60,16 +59,16 @@ toolchain { compiler_flag: "-fstack-protector-strong" compiler_flag: "-O2" compiler_flag: "-pipe" - tool_path {name: "ld" path: "${LD}" } - tool_path {name: "cpp" path: "/usr/bin/cpp" } + tool_path {name: "ld" path: "${BUILD_PREFIX}/bin/ld.lld" } + tool_path {name: "cpp" path: "${BUILD_PREFIX}/bin/clang-cpp" } tool_path {name: "dwp" path: "/usr/bin/dwp" } tool_path {name: "gcov" path: "/usr/bin/gcov" } - tool_path {name: "nm" path: "${NM}" } - tool_path {name: "objcopy" path: "/usr/bin/objcopy" } - tool_path {name: "objdump" path: "/usr/bin/objdump" } - tool_path {name: "strip" path: "${STRIP}" } + tool_path {name: "nm" path: "${BUILD_PREFIX}/bin/llvm-nm" } + tool_path {name: "objcopy" path: "${BUILD_PREFIX}/bin/llvm-objcopy" } + tool_path {name: "objdump" path: "${BUILD_PREFIX}/bin/llvm-objdump" } + tool_path {name: "strip" path: "${BUILD_PREFIX}/bin/llvm-strip" } tool_path {name: "gcc" path: "cc_wrapper.sh" } - tool_path {name: "ar" path: "${LIBTOOL}" } + tool_path {name: "ar" path: "${BUILD_PREFIX}/bin/llvm-ar" } compilation_mode_flags { mode: DBG diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index af32bf84c..4a5c8d957 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -22,11 +22,11 @@ def _impl(ctx): ), tool_path( name = "ld", - path = "${LD}", + path = "${BUILD_PREFIX}/bin/ld.lld", ), tool_path( name = "ar", - path = "${BUILD_PREFIX}/bin/${AR}", + path = "${BUILD_PREFIX}/bin/llvm-ar", ), tool_path( name = "patchelf", @@ -34,7 +34,7 @@ def _impl(ctx): ), tool_path( name = "cpp", - path = "/usr/bin/cpp", + path = "${BUILD_PREFIX}/bin/clang-cpp", ), tool_path( name = "gcov", @@ -42,15 +42,15 @@ def _impl(ctx): ), tool_path( name = "nm", - path = "${NM}", + path = "${BUILD_PREFIX}/bin/llvm-nm", ), tool_path( name = "objdump", - path = "/usr/bin/objdump", + path = "${BUILD_PREFIX}/bin/llvm-objdump", ), tool_path( name = "strip", - path = "${STRIP}", + path = "${BUILD_PREFIX}/bin/llvm-strip", ), ] @@ -289,7 +289,7 @@ def _impl(ctx): "${CONDA_BUILD_SYSROOT}/usr/include", "${BUILD_PREFIX}/lib/clang/${COMPILER_VERSION}/include", "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include", - "${BUILD_PREFIX}/include/c++/v1", + "${PREFIX}/include/c++/v1", "${PREFIX}/include", ] else: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 94c60a34d..41a3c0775 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -85,6 +85,7 @@ requirements: - patchelf - sed - rsync + - lld # [osx] # realpath is not available from the docker image for cuda <= 10.2 # so we install coreutils here - coreutils # [cuda_compiler_version != "None"] From 8c016687b850fd6fb48642454d5a60e8956ade1a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 12:01:05 +1100 Subject: [PATCH 40/64] disable debug --- recipe/build.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 0684495c2..4fa315a89 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -155,19 +155,14 @@ else export TF_NEED_CUDA=0 fi -seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' -echo "before gen-bazel-toolchain.sh" -seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' -find ./custom_toolchain | xargs cat -seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' echo "run gen-bazel-toolchain.sh" -seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' source ${RECIPE_DIR}/gen-bazel-toolchain.sh -seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' -echo "after gen-bazel-toolchain.sh" -seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' -find ./custom_toolchain | xargs cat -seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' + +#seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' +#echo "after gen-bazel-toolchain.sh" +#seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' +#find ./custom_toolchain | xargs cat +#seq 3 | xargs -I{} bash -c 'printf "=%.0s" {1..40}; echo' if [[ "${target_platform}" == "osx-64" ]]; then # Tensorflow doesn't cope yet with an explicit architecture (darwin_x86_64) on osx-64 yet. From 73c5584e41ff515ae87b90ccc7e8b99e3d79d128 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 12:25:54 +1100 Subject: [PATCH 41/64] set CPU type explicitly; use sigtool for codesigning on arm --- recipe/custom_toolchain/BUILD | 1 + recipe/custom_toolchain/cc_wrapper.sh.template | 2 +- recipe/meta.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/custom_toolchain/BUILD b/recipe/custom_toolchain/BUILD index c09094a24..26ec5e391 100644 --- a/recipe/custom_toolchain/BUILD +++ b/recipe/custom_toolchain/BUILD @@ -45,6 +45,7 @@ cc_toolchain( name = "cc-compiler-target", all_files = ":compiler_deps", compiler_files = ":compiler_deps", + cpu = "TARGET_CPU", toolchain_identifier = "local", toolchain_config = ":cc-compiler-target-config", dwp_files = ":empty", diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template index 947c1aa69..7fd9c9f15 100644 --- a/recipe/custom_toolchain/cc_wrapper.sh.template +++ b/recipe/custom_toolchain/cc_wrapper.sh.template @@ -108,5 +108,5 @@ for rpath in ${RPATHS}; do done if [[ "${target_platform}" == "osx-arm64" ]]; then - /usr/bin/codesign -s - -f ${OUTPUT} + ${BUILD_PREFIX}/bin/codesign -s - -f ${OUTPUT} fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 41a3c0775..7bef51ea2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -86,6 +86,7 @@ requirements: - sed - rsync - lld # [osx] + - sigtool # [osx] # realpath is not available from the docker image for cuda <= 10.2 # so we install coreutils here - coreutils # [cuda_compiler_version != "None"] From 20fccc1961df59642b38dcc03a32f96d00822f33 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 12:47:08 +1100 Subject: [PATCH 42/64] use --config like for osx-arm --- recipe/build.sh | 2 ++ recipe/custom_toolchain/BUILD | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 4fa315a89..50f739c0d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -181,6 +181,8 @@ if [[ "${target_platform}" == "osx-arm64" ]]; then echo "build --config=macos_arm64" >> .bazelrc # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" +elif [[ "${target_platform}" == "osx-64" ]]; then + echo "build --config=macos_x86_64" >> .bazelrc fi export TF_ENABLE_XLA=1 export BUILD_TARGET="//tensorflow/tools/pip_package:wheel //tensorflow/tools/lib_package:libtensorflow //tensorflow:libtensorflow_cc${SHLIB_EXT}" diff --git a/recipe/custom_toolchain/BUILD b/recipe/custom_toolchain/BUILD index 26ec5e391..c09094a24 100644 --- a/recipe/custom_toolchain/BUILD +++ b/recipe/custom_toolchain/BUILD @@ -45,7 +45,6 @@ cc_toolchain( name = "cc-compiler-target", all_files = ":compiler_deps", compiler_files = ":compiler_deps", - cpu = "TARGET_CPU", toolchain_identifier = "local", toolchain_config = ":cc-compiler-target-config", dwp_files = ":empty", From 1d40be0705fab5491db617a94bf6272daa4dbaca Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 12:57:39 +1100 Subject: [PATCH 43/64] use different --config value for osx-64 --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 50f739c0d..d683c677e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -182,7 +182,7 @@ if [[ "${target_platform}" == "osx-arm64" ]]; then # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" elif [[ "${target_platform}" == "osx-64" ]]; then - echo "build --config=macos_x86_64" >> .bazelrc + echo "build --config=darwin_x86_64" >> .bazelrc fi export TF_ENABLE_XLA=1 export BUILD_TARGET="//tensorflow/tools/pip_package:wheel //tensorflow/tools/lib_package:libtensorflow //tensorflow:libtensorflow_cc${SHLIB_EXT}" From 92f46d2816f6b1c2194085c913abea238f1da53f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 12:59:42 +1100 Subject: [PATCH 44/64] populate BUILD_PREFIX in cc_wrapper --- recipe/gen-bazel-toolchain.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/gen-bazel-toolchain.sh b/recipe/gen-bazel-toolchain.sh index 73208eae2..d58ad16f8 100755 --- a/recipe/gen-bazel-toolchain.sh +++ b/recipe/gen-bazel-toolchain.sh @@ -44,6 +44,7 @@ pushd custom_toolchain export BAZEL_TOOLCHAIN_COMPILER_VERSION=$($CC -v 2>&1 | head -n1 | cut -d' ' -f3) export SHORT_BAZEL_TOOLCHAIN_COMPILER_VERSION=$(echo ${BAZEL_TOOLCHAIN_COMPILER_VERSION} | cut -d. -f1) sed -e "s:\${CLANG}:${CLANG}:" \ + -e "s:\${BUILD_PREFIX}:${BUILD_PREFIX}:" \ -e "s:\${target_platform}:${target_platform}:" \ -e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL}:" \ -e "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" \ @@ -52,6 +53,7 @@ pushd custom_toolchain cc_wrapper.sh.template > cc_wrapper.sh chmod +x cc_wrapper.sh sed -e "s:\${CLANG}:${CC_FOR_BUILD}:" \ + -e "s:\${BUILD_PREFIX}:${BUILD_PREFIX}:" \ -e "s:\${target_platform}:${target_platform}:" \ -e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL//${HOST}/${BUILD}}:" \ -e "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" \ From b1567229f39cbd7c163943742aea4b81090ed9e8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 13:19:34 +1100 Subject: [PATCH 45/64] define explicit --configs --- recipe/build.sh | 2 +- recipe/custom_toolchain/BUILD | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index d683c677e..50f739c0d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -182,7 +182,7 @@ if [[ "${target_platform}" == "osx-arm64" ]]; then # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" elif [[ "${target_platform}" == "osx-64" ]]; then - echo "build --config=darwin_x86_64" >> .bazelrc + echo "build --config=macos_x86_64" >> .bazelrc fi export TF_ENABLE_XLA=1 export BUILD_TARGET="//tensorflow/tools/pip_package:wheel //tensorflow/tools/lib_package:libtensorflow //tensorflow:libtensorflow_cc${SHLIB_EXT}" diff --git a/recipe/custom_toolchain/BUILD b/recipe/custom_toolchain/BUILD index c09094a24..84a800dfc 100644 --- a/recipe/custom_toolchain/BUILD +++ b/recipe/custom_toolchain/BUILD @@ -41,6 +41,22 @@ cc_toolchain_suite( toolchains = toolchains, ) +config_setting( + name = "macos_arm64", + values = { + "apple_platform_type": "macos", + "cpu": "darwin_arm64", + }, +) + +config_setting( + name = "macos_x86_64", + values = { + "apple_platform_type": "macos", + "cpu": "darwin_x86_64", + }, +) + cc_toolchain( name = "cc-compiler-target", all_files = ":compiler_deps", From 2bc0485c191a109827944a583e8f031fd7824974 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 13:20:27 +1100 Subject: [PATCH 46/64] try passing -headerpad_max_install_names differently --- recipe/custom_toolchain/CROSSTOOL.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/custom_toolchain/CROSSTOOL.template b/recipe/custom_toolchain/CROSSTOOL.template index 10c2c1183..d9836c31a 100644 --- a/recipe/custom_toolchain/CROSSTOOL.template +++ b/recipe/custom_toolchain/CROSSTOOL.template @@ -29,7 +29,7 @@ toolchain { cxx_flag: "-std=c++17" cxx_flag: "-fmessage-length=0" linker_flag: "-Wl,-pie" - linker_flag: "-headerpad_max_install_names" + linker_flag: "-Wl,-headerpad_max_install_names" linker_flag: "-Wl,-dead_strip_dylibs" linker_flag: "-undefined" linker_flag: "dynamic_lookup" From 2d3fb169b076f9a5bab2c41e3148c0f23c009c66 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 13:37:44 +1100 Subject: [PATCH 47/64] match spelling of config to upstream .bazelrc see https://github.com/tensorflow/tensorflow/blob/v2.18.0/.bazelrc --- recipe/build.sh | 2 +- recipe/custom_toolchain/BUILD | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 50f739c0d..59d0a0458 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -182,7 +182,7 @@ if [[ "${target_platform}" == "osx-arm64" ]]; then # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" elif [[ "${target_platform}" == "osx-64" ]]; then - echo "build --config=macos_x86_64" >> .bazelrc + echo "build --config=macos" >> .bazelrc fi export TF_ENABLE_XLA=1 export BUILD_TARGET="//tensorflow/tools/pip_package:wheel //tensorflow/tools/lib_package:libtensorflow //tensorflow:libtensorflow_cc${SHLIB_EXT}" diff --git a/recipe/custom_toolchain/BUILD b/recipe/custom_toolchain/BUILD index 84a800dfc..c09094a24 100644 --- a/recipe/custom_toolchain/BUILD +++ b/recipe/custom_toolchain/BUILD @@ -41,22 +41,6 @@ cc_toolchain_suite( toolchains = toolchains, ) -config_setting( - name = "macos_arm64", - values = { - "apple_platform_type": "macos", - "cpu": "darwin_arm64", - }, -) - -config_setting( - name = "macos_x86_64", - values = { - "apple_platform_type": "macos", - "cpu": "darwin_x86_64", - }, -) - cc_toolchain( name = "cc-compiler-target", all_files = ":compiler_deps", From 24d61ae587ca5c310d24c7a6347697aecf7e7697 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 13:38:14 +1100 Subject: [PATCH 48/64] add c++ stdlib to host --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7bef51ea2..9951ff9c6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -91,6 +91,7 @@ requirements: # so we install coreutils here - coreutils # [cuda_compiler_version != "None"] host: + - libcxx-devel # [osx] # GPU requirements for CUDA - cudnn # [cuda_compiler_version != "None"] - nccl # [cuda_compiler_version != "None"] From d3221f3c33fad1de294e2da15a257cfe1ef9caea Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 13:46:37 +1100 Subject: [PATCH 49/64] use toolchain from cctools --- recipe/custom_toolchain/CROSSTOOL.template | 8 ++++---- recipe/custom_toolchain/cc_toolchain_config.bzl | 8 ++++---- recipe/meta.yaml | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/recipe/custom_toolchain/CROSSTOOL.template b/recipe/custom_toolchain/CROSSTOOL.template index d9836c31a..84da99173 100644 --- a/recipe/custom_toolchain/CROSSTOOL.template +++ b/recipe/custom_toolchain/CROSSTOOL.template @@ -59,16 +59,16 @@ toolchain { compiler_flag: "-fstack-protector-strong" compiler_flag: "-O2" compiler_flag: "-pipe" - tool_path {name: "ld" path: "${BUILD_PREFIX}/bin/ld.lld" } + tool_path {name: "ld" path: "${BUILD_PREFIX}/bin/${LD}" } tool_path {name: "cpp" path: "${BUILD_PREFIX}/bin/clang-cpp" } tool_path {name: "dwp" path: "/usr/bin/dwp" } tool_path {name: "gcov" path: "/usr/bin/gcov" } - tool_path {name: "nm" path: "${BUILD_PREFIX}/bin/llvm-nm" } + tool_path {name: "nm" path: "${BUILD_PREFIX}/bin/${NM}" } tool_path {name: "objcopy" path: "${BUILD_PREFIX}/bin/llvm-objcopy" } tool_path {name: "objdump" path: "${BUILD_PREFIX}/bin/llvm-objdump" } - tool_path {name: "strip" path: "${BUILD_PREFIX}/bin/llvm-strip" } + tool_path {name: "strip" path: "${BUILD_PREFIX}/bin/${STRIP}" } tool_path {name: "gcc" path: "cc_wrapper.sh" } - tool_path {name: "ar" path: "${BUILD_PREFIX}/bin/llvm-ar" } + tool_path {name: "ar" path: "${BUILD_PREFIX}/bin/${AR}" } compilation_mode_flags { mode: DBG diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index 4a5c8d957..7187c87cf 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -22,11 +22,11 @@ def _impl(ctx): ), tool_path( name = "ld", - path = "${BUILD_PREFIX}/bin/ld.lld", + path = "${BUILD_PREFIX}/bin/${LD}", ), tool_path( name = "ar", - path = "${BUILD_PREFIX}/bin/llvm-ar", + path = "${BUILD_PREFIX}/bin/${AR}", ), tool_path( name = "patchelf", @@ -42,7 +42,7 @@ def _impl(ctx): ), tool_path( name = "nm", - path = "${BUILD_PREFIX}/bin/llvm-nm", + path = "${BUILD_PREFIX}/bin/${NM}", ), tool_path( name = "objdump", @@ -50,7 +50,7 @@ def _impl(ctx): ), tool_path( name = "strip", - path = "${BUILD_PREFIX}/bin/llvm-strip", + path = "${BUILD_PREFIX}/bin/${STRIP}", ), ] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9951ff9c6..020ea8875 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -85,7 +85,6 @@ requirements: - patchelf - sed - rsync - - lld # [osx] - sigtool # [osx] # realpath is not available from the docker image for cuda <= 10.2 # so we install coreutils here From c0d0f85cf501cf89e9ddbb39571cf7b55046935f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 14:00:32 +1100 Subject: [PATCH 50/64] point to C++ stdlib --- recipe/custom_toolchain/cc_toolchain_config.bzl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index 7187c87cf..337409223 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -150,6 +150,8 @@ def _impl(ctx): toolchain_include_directories_flags = [ "-isystem", "${PREFIX}/include", + "-isystem", + "${PREFIX}/include/c++/v1", ] toolchain_include_directories_feature = feature( From 10e6dfec3838a36f6b1a5ecde7b1caf3f46d3f67 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 22:37:29 +1100 Subject: [PATCH 51/64] set the cpu type for macos target in upstream .bazelrc --- recipe/meta.yaml | 1 + recipe/patches/0001-loosen-requirements.patch | 6 ++-- ...absl_synchronization-linkage-to-gRPC.patch | 6 ++-- .../0003-Fix-missing-abseil-linkages.patch | 6 ++-- ...4-Fix-protobuf_python-for-systemlibs.patch | 10 +++--- .../patches/0005-Add-absl_log-systemlib.patch | 8 ++--- ...layout_proto_cc-if-protobuf-linkage-.patch | 6 ++-- .../0007-Fix-further-abseil-linkage.patch | 6 ++-- ...Add-constraint-to-pybind11-systemlib.patch | 6 ++-- ...-file-ending-for-flatbuffers-LICENSE.patch | 6 ++-- .../0010-Use-correct-hermetic-python.patch | 8 ++--- ...n_types_py_pb2-to-protobuf-systemlib.patch | 6 ++-- .../patches/0012-Add-protobuf-toolchain.patch | 6 ++-- recipe/patches/0013-fix-genproto.patch | 6 ++-- ...ome-usage-of-absl-str_format-in-CUDA.patch | 10 +++--- ...5-Adjust-relative-path-for-libdevice.patch | 6 ++-- ...absl_log_flags-instead-of-absl_flags.patch | 8 ++--- ...Definition-for-libabsl_vlog_config_i.patch | 6 ++-- .../0018-add-absl_string_view-target.patch | 6 ++-- .../0019-add-absl_nullability-target.patch | 6 ++-- .../0020-add-absl_prefetch-target.patch | 6 ++-- .../0021-add-absl_die_if_null-target.patch | 6 ++-- .../0022-add-absl_crc32c-targets.patch | 8 ++--- ...3-add-kernel_timeout_internal-target.patch | 6 ++-- ...warning-that-clang-falsely-treats-as.patch | 6 ++-- ...de-BUILD_PREFIX-in-build_pip_package.patch | 6 ++-- ...-sparse_core_layout_proto_cc-headers.patch | 6 ++-- .../0027-Protobuf-5-compatability.patch | 32 +++++++++---------- ...ng-to-be-consistent-in-the-size-of-t.patch | 8 ++--- ...29-set-the-cpu-type-for-macos-target.patch | 21 ++++++++++++ 30 files changed, 128 insertions(+), 106 deletions(-) create mode 100644 recipe/patches/0029-set-the-cpu-type-for-macos-target.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 020ea8875..ad883dfae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,6 +47,7 @@ source: - patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch - patches/0027-Protobuf-5-compatability.patch - patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch + - patches/0029-set-the-cpu-type-for-macos-target.patch - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530 folder: tensorflow-estimator diff --git a/recipe/patches/0001-loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch index 2d84ef88e..e06a14be0 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ -From e38b64198fe3f683895817c3685f9da939aadfd3 Mon Sep 17 00:00:00 2001 +From a95d80c7a5576ea26a6ed92cc46e47630aaafcb3 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/27] loosen requirements +Subject: [PATCH 01/29] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem @@ -15,7 +15,7 @@ Co-authored-by: Uwe L. Korn 1 file changed, 6 deletions(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index fb37ef9b..61f6ce1f 100644 +index 746adba6911..c04ce221255 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -81,7 +81,6 @@ REQUIRED_PACKAGES = [ diff --git a/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch b/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch index 16408324f..380e5d38c 100644 --- a/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch +++ b/recipe/patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch @@ -1,14 +1,14 @@ -From f80db539ec99bf062c5e7b935d0e2391225627fc Mon Sep 17 00:00:00 2001 +From bd12dfa052423307c28bc471c1675f070c91bf4c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/27] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/29] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/third_party/systemlibs/grpc.BUILD b/third_party/systemlibs/grpc.BUILD -index 8b703f11..417baf5d 100644 +index 8b703f11556..417baf5d342 100644 --- a/third_party/systemlibs/grpc.BUILD +++ b/third_party/systemlibs/grpc.BUILD @@ -10,6 +10,7 @@ cc_library( diff --git a/recipe/patches/0003-Fix-missing-abseil-linkages.patch b/recipe/patches/0003-Fix-missing-abseil-linkages.patch index fd4a2e761..517957962 100644 --- a/recipe/patches/0003-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0003-Fix-missing-abseil-linkages.patch @@ -1,14 +1,14 @@ -From 9452e8ed5d2f79b06a205807687c492e3524ade5 Mon Sep 17 00:00:00 2001 +From 49676c262c8e55e59edfcc5a5af570aff074478c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 03/27] Fix missing abseil linkages +Subject: [PATCH 03/29] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD -index fa9a7a84..d04776c9 100644 +index fa9a7a84f67..d04776c98bf 100644 --- a/third_party/absl/system.absl.strings.BUILD +++ b/third_party/absl/system.absl.strings.BUILD @@ -26,7 +26,7 @@ cc_library( diff --git a/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch index de5739c79..52e543826 100644 --- a/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0004-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ -From 53fce719a6f0c64954b48d4b59b3be046b709493 Mon Sep 17 00:00:00 2001 +From 5678ef4465522b829b2cf56ec5de64da439a032d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 04/27] Fix protobuf_python for systemlibs +Subject: [PATCH 04/29] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- @@ -12,7 +12,7 @@ Subject: [PATCH 04/27] Fix protobuf_python for systemlibs create mode 100644 third_party/systemlibs/protobuf_python.bzl diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl -index be83c971..5320aa18 100644 +index be83c971749..5320aa187fd 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -390,6 +390,7 @@ def _tf_repositories(): @@ -40,7 +40,7 @@ index be83c971..5320aa18 100644 tf_http_archive( diff --git a/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch b/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch new file mode 100644 -index 00000000..18a1ddf8 +index 00000000000..18a1ddf84f3 --- /dev/null +++ b/third_party/pybind11_protobuf/0001-Add-Python-include-path.patch @@ -0,0 +1,26 @@ @@ -72,7 +72,7 @@ index 00000000..18a1ddf8 + diff --git a/third_party/systemlibs/protobuf_python.bzl b/third_party/systemlibs/protobuf_python.bzl new file mode 100644 -index 00000000..982617a7 +index 00000000000..982617a765c --- /dev/null +++ b/third_party/systemlibs/protobuf_python.bzl @@ -0,0 +1,5 @@ diff --git a/recipe/patches/0005-Add-absl_log-systemlib.patch b/recipe/patches/0005-Add-absl_log-systemlib.patch index 2a9da9138..e421e423c 100644 --- a/recipe/patches/0005-Add-absl_log-systemlib.patch +++ b/recipe/patches/0005-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ -From bb623beeb54b94c22a2b019a935e684cc1dff2c8 Mon Sep 17 00:00:00 2001 +From f0fb9b8ac9f6e7d529b3c10ccb2a4f959ac73364 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 05/27] Add absl_log systemlib +Subject: [PATCH 05/29] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ @@ -11,7 +11,7 @@ Subject: [PATCH 05/27] Add absl_log systemlib diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD new file mode 100644 -index 00000000..0248bda0 +index 00000000000..0248bda0f52 --- /dev/null +++ b/third_party/absl/system.absl.log.BUILD @@ -0,0 +1,22 @@ @@ -38,7 +38,7 @@ index 00000000..0248bda0 + ], +) diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl -index 9565a82c..addb2410 100644 +index 9565a82c331..addb2410abd 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -20,6 +20,7 @@ def repo(): diff --git a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 3db49c7b3..ad635dfee 100644 --- a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ -From a33625860c147ebd81b99a06830dfc3f70a27e98 Mon Sep 17 00:00:00 2001 +From a84e4c7e3eee860b46c01dbae890f3e1c29f9796 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 06/27] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 06/29] Omit linking to layout_proto_cc if protobuf linkage is shared --- @@ -9,7 +9,7 @@ Subject: [PATCH 06/27] Omit linking to layout_proto_cc if protobuf linkage is 1 file changed, 1 deletion(-) diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD -index 0ad8e84b..43843f32 100644 +index 0ad8e84b889..43843f32910 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -1363,7 +1363,6 @@ tf_python_pybind_extension( diff --git a/recipe/patches/0007-Fix-further-abseil-linkage.patch b/recipe/patches/0007-Fix-further-abseil-linkage.patch index 2bc6fb46a..56b194196 100644 --- a/recipe/patches/0007-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0007-Fix-further-abseil-linkage.patch @@ -1,14 +1,14 @@ -From 206c175e081b4cedf15d2aa07c8fd2b21a5272ee Mon Sep 17 00:00:00 2001 +From 1f38410e6f0d5059851ec2507dabb82a43359cd8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 07/27] Fix further abseil linkage +Subject: [PATCH 07/29] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index d6bf8748..b3e42f4d 100644 +index d6bf8748dee..b3e42f4dd8b 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -17,12 +17,22 @@ package(default_visibility = ["//visibility:public"]) diff --git a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch index 9e4bc7c0a..7503fb8cb 100644 --- a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch @@ -1,14 +1,14 @@ -From 6cc878513d44e08cd39b8f55f39f52b3c13893c8 Mon Sep 17 00:00:00 2001 +From 36c3dce398b05a0700148f44d05e1ef478e6371b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 08/27] Add constraint to pybind11 systemlib +Subject: [PATCH 08/29] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/third_party/systemlibs/pybind11.BUILD b/third_party/systemlibs/pybind11.BUILD -index 44e7496f..21ec073b 100644 +index 44e7496fc25..21ec073b7a4 100644 --- a/third_party/systemlibs/pybind11.BUILD +++ b/third_party/systemlibs/pybind11.BUILD @@ -6,3 +6,9 @@ cc_library( diff --git a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch index 784ae1c57..60a603fdc 100644 --- a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,14 +1,14 @@ -From f7c3d89c2339cdf2517621e42666553d5ffd36da Mon Sep 17 00:00:00 2001 +From d01328340a5236bb822f866c0975a9380bcf27af Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 09/27] Different file ending for flatbuffers LICENSE +Subject: [PATCH 09/29] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/third_party/flatbuffers/BUILD.system b/third_party/flatbuffers/BUILD.system -index 8fe4d7a5..297f8baf 100644 +index 8fe4d7a5907..297f8baf0c0 100644 --- a/third_party/flatbuffers/BUILD.system +++ b/third_party/flatbuffers/BUILD.system @@ -5,6 +5,11 @@ filegroup( diff --git a/recipe/patches/0010-Use-correct-hermetic-python.patch b/recipe/patches/0010-Use-correct-hermetic-python.patch index 5fc07b603..b45e9b7ab 100644 --- a/recipe/patches/0010-Use-correct-hermetic-python.patch +++ b/recipe/patches/0010-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ -From 7b162495d8efdc0fd6e0aad8f598cdeed3774af4 Mon Sep 17 00:00:00 2001 +From a4f0bb2fd93ae32fac3f29762a2dd7e43b6e200e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 10/27] Use correct, hermetic python +Subject: [PATCH 10/29] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ @@ -9,7 +9,7 @@ Subject: [PATCH 10/27] Use correct, hermetic python 2 files changed, 7 insertions(+) diff --git a/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py b/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py -index 8352b974..7eed8b4e 100644 +index 8352b974996..7eed8b4e373 100644 --- a/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py +++ b/tensorflow/compiler/mlir/quantization/tensorflow/gen_quantized_function_library.py @@ -14,6 +14,11 @@ @@ -25,7 +25,7 @@ index 8352b974..7eed8b4e 100644 import re import string diff --git a/tensorflow/python/tools/api/generator/create_python_api.py b/tensorflow/python/tools/api/generator/create_python_api.py -index cd76ae73..c12533c9 100644 +index cd76ae73f77..c12533c9b57 100644 --- a/tensorflow/python/tools/api/generator/create_python_api.py +++ b/tensorflow/python/tools/api/generator/create_python_api.py @@ -18,6 +18,8 @@ import collections diff --git a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index 7cf96f885..d8ce09cba 100644 --- a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,14 +1,14 @@ -From 1e33a03dfdaac70dbee540b901a1fee950b814a6 Mon Sep 17 00:00:00 2001 +From 5dc74494a5ebe9a7cb22f3653979355bcdb4bef3 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 11/27] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 11/29] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD -index c7d94060..504bc81a 100644 +index c7d940605f9..504bc81af0d 100644 --- a/third_party/systemlibs/protobuf.BUILD +++ b/third_party/systemlibs/protobuf.BUILD @@ -111,3 +111,10 @@ py_library( diff --git a/recipe/patches/0012-Add-protobuf-toolchain.patch b/recipe/patches/0012-Add-protobuf-toolchain.patch index 58fbd9162..66e3ba680 100644 --- a/recipe/patches/0012-Add-protobuf-toolchain.patch +++ b/recipe/patches/0012-Add-protobuf-toolchain.patch @@ -1,14 +1,14 @@ -From 70bda39b9de02070156308d9e4070c9d0e651c38 Mon Sep 17 00:00:00 2001 +From 1ac99cf3d59dafde68d4f1a58a19f723d63653f0 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 12/27] Add protobuf toolchain +Subject: [PATCH 12/29] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/third_party/systemlibs/protobuf.BUILD b/third_party/systemlibs/protobuf.BUILD -index 504bc81a..4f105d33 100644 +index 504bc81af0d..4f105d33f84 100644 --- a/third_party/systemlibs/protobuf.BUILD +++ b/third_party/systemlibs/protobuf.BUILD @@ -65,12 +65,26 @@ cc_library( diff --git a/recipe/patches/0013-fix-genproto.patch b/recipe/patches/0013-fix-genproto.patch index d4966c43e..c35163dcf 100644 --- a/recipe/patches/0013-fix-genproto.patch +++ b/recipe/patches/0013-fix-genproto.patch @@ -1,14 +1,14 @@ -From a6a1ee1af7e7829adc68a8f05b2ad8a9273982fb Mon Sep 17 00:00:00 2001 +From d7e69912774696308bb6f61a98ed9381294a7f28 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 13/27] fix genproto +Subject: [PATCH 13/29] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl b/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl -index 726f5463..62837c84 100644 +index 726f54634c5..62837c84837 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl +++ b/third_party/xla/third_party/tsl/tsl/platform/default/build_config.bzl @@ -400,10 +400,7 @@ def py_proto_library( diff --git a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch index de9a6a8de..d2636abe3 100644 --- a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ -From 0472aaf3932e1ea815cfd45582c001e159fc1052 Mon Sep 17 00:00:00 2001 +From 4c3408a720c8127576dd0aecbe9dd28f02c123da Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 14/27] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 14/29] Remove some usage of absl::str_format in CUDA nvcc from CUDA 11 is unable to correctly handle the new C++ features used in this template. We use a different implementation that should @@ -13,7 +13,7 @@ yield the same results without the usage of absl. 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tensorflow/core/framework/resource_base.h b/tensorflow/core/framework/resource_base.h -index 46a76ea0..2f8d0a21 100644 +index 46a76ea094c..2f8d0a21878 100644 --- a/tensorflow/core/framework/resource_base.h +++ b/tensorflow/core/framework/resource_base.h @@ -18,8 +18,9 @@ limitations under the License. @@ -42,7 +42,7 @@ index 46a76ea0..2f8d0a21 100644 // Returns memory used by this resource. diff --git a/tensorflow/core/framework/resource_var.cc b/tensorflow/core/framework/resource_var.cc -index c441a8e2..7e1f1fdf 100644 +index c441a8e2648..7e1f1fdf0ea 100644 --- a/tensorflow/core/framework/resource_var.cc +++ b/tensorflow/core/framework/resource_var.cc @@ -18,6 +18,8 @@ limitations under the License. @@ -55,7 +55,7 @@ index c441a8e2..7e1f1fdf 100644 Status Var::AsGraphDef(GraphDefBuilder* builder, Node** out) const { diff --git a/tensorflow/core/kernels/conv_ops_gpu.h b/tensorflow/core/kernels/conv_ops_gpu.h -index 627450ef..d0c97527 100644 +index 627450ef2d6..d0c97527284 100644 --- a/tensorflow/core/kernels/conv_ops_gpu.h +++ b/tensorflow/core/kernels/conv_ops_gpu.h @@ -22,7 +22,7 @@ limitations under the License. diff --git a/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch index f465fab54..588106012 100644 --- a/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0015-Adjust-relative-path-for-libdevice.patch @@ -1,14 +1,14 @@ -From f44de9a6a74b949da5681b31eb51b7bc601110fb Mon Sep 17 00:00:00 2001 +From 9c6c561823988ae34c2af979486b06cace20ebee Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 15/27] Adjust relative path for libdevice +Subject: [PATCH 15/29] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc b/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc -index ac0a804b..fe8305fd 100644 +index ac0a804b4df..fe8305fd893 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc +++ b/third_party/xla/third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc @@ -69,7 +69,7 @@ std::vector CandidateCudaRoots() { diff --git a/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch index 76429170d..cba24e483 100644 --- a/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0016-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ -From 786e194933fc0aedf991ed6159868e4a06b72ea3 Mon Sep 17 00:00:00 2001 +From 172568f92566ab51e268b13125cb7647a7463d34 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 16/27] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 16/29] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH 16/27] Link to absl_log_flags instead of absl_flags 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/absl/system.absl.flags.BUILD b/third_party/absl/system.absl.flags.BUILD -index aff653c7..ee2e1bfe 100644 +index aff653c7e5b..ee2e1bfe5e3 100644 --- a/third_party/absl/system.absl.flags.BUILD +++ b/third_party/absl/system.absl.flags.BUILD @@ -97,7 +97,7 @@ cc_library( @@ -22,7 +22,7 @@ index aff653c7..ee2e1bfe 100644 ":config", ":flag_internal", diff --git a/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD b/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD -index aff653c7..ee2e1bfe 100644 +index aff653c7e5b..ee2e1bfe5e3 100644 --- a/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD +++ b/third_party/xla/third_party/tsl/third_party/absl/system.absl.flags.BUILD @@ -97,7 +97,7 @@ cc_library( diff --git a/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index 4b71c8bac..e17075e08 100644 --- a/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0017-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ -From b911e2b40323f89503fa8475abf017d3a42516f6 Mon Sep 17 00:00:00 2001 +From ee83172851b5edbf302918785a58af0bdb5d2782 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 17/27] Update ABSL Log Definition for +Subject: [PATCH 17/29] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- @@ -9,7 +9,7 @@ Subject: [PATCH 17/27] Update ABSL Log Definition for 1 file changed, 2 insertions(+) diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD -index 0248bda0..1fe1e342 100644 +index 0248bda0f52..1fe1e342594 100644 --- a/third_party/absl/system.absl.log.BUILD +++ b/third_party/absl/system.absl.log.BUILD @@ -5,6 +5,7 @@ package(default_visibility = ["//visibility:public"]) diff --git a/recipe/patches/0018-add-absl_string_view-target.patch b/recipe/patches/0018-add-absl_string_view-target.patch index 3f0b175df..6dfa50ebc 100644 --- a/recipe/patches/0018-add-absl_string_view-target.patch +++ b/recipe/patches/0018-add-absl_string_view-target.patch @@ -1,14 +1,14 @@ -From 918451e9f02087c2891d58d4969216a3a702c2ac Mon Sep 17 00:00:00 2001 +From 31d97aaad5483ed8135834530d4576f77856e475 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 -Subject: [PATCH 18/27] add absl_string_view target +Subject: [PATCH 18/29] add absl_string_view target --- third_party/absl/system.absl.strings.BUILD | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD -index d04776c9..9f537def 100644 +index d04776c98bf..9f537def3d7 100644 --- a/third_party/absl/system.absl.strings.BUILD +++ b/third_party/absl/system.absl.strings.BUILD @@ -2,6 +2,18 @@ load("@rules_cc//cc:defs.bzl", "cc_library") diff --git a/recipe/patches/0019-add-absl_nullability-target.patch b/recipe/patches/0019-add-absl_nullability-target.patch index dd4899ecc..3ede34c1e 100644 --- a/recipe/patches/0019-add-absl_nullability-target.patch +++ b/recipe/patches/0019-add-absl_nullability-target.patch @@ -1,14 +1,14 @@ -From 938c10d189c2bc47d891ce46ca9ff92d197aa226 Mon Sep 17 00:00:00 2001 +From 00230b46bc1df8951ce5917d7d3ddd700e611dba Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 -Subject: [PATCH 19/27] add absl_nullability target +Subject: [PATCH 19/29] add absl_nullability target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index b3e42f4d..a423d5f7 100644 +index b3e42f4dd8b..a423d5f70da 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -25,6 +25,14 @@ cc_library( diff --git a/recipe/patches/0020-add-absl_prefetch-target.patch b/recipe/patches/0020-add-absl_prefetch-target.patch index 0740450db..95d04dddb 100644 --- a/recipe/patches/0020-add-absl_prefetch-target.patch +++ b/recipe/patches/0020-add-absl_prefetch-target.patch @@ -1,14 +1,14 @@ -From ec3fcb3a2bb1139ed3a7dee824edf0c7170e349d Mon Sep 17 00:00:00 2001 +From 713e64e743e198245f61270629828397f92b55f0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 -Subject: [PATCH 20/27] add absl_prefetch target +Subject: [PATCH 20/29] add absl_prefetch target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD -index a423d5f7..b31592d3 100644 +index a423d5f70da..b31592d31a3 100644 --- a/third_party/absl/system.absl.base.BUILD +++ b/third_party/absl/system.absl.base.BUILD @@ -116,6 +116,14 @@ cc_library( diff --git a/recipe/patches/0021-add-absl_die_if_null-target.patch b/recipe/patches/0021-add-absl_die_if_null-target.patch index f231c2d87..7c84ae96a 100644 --- a/recipe/patches/0021-add-absl_die_if_null-target.patch +++ b/recipe/patches/0021-add-absl_die_if_null-target.patch @@ -1,14 +1,14 @@ -From 027858614ecf06428e284eb7f32699eda84ae07f Mon Sep 17 00:00:00 2001 +From b1f716e00675cb578b9cc9187136ab67b07aa261 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:46:04 +1100 -Subject: [PATCH 21/27] add absl_die_if_null target +Subject: [PATCH 21/29] add absl_die_if_null target --- third_party/absl/system.absl.log.BUILD | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD -index 1fe1e342..141bb319 100644 +index 1fe1e342594..141bb319489 100644 --- a/third_party/absl/system.absl.log.BUILD +++ b/third_party/absl/system.absl.log.BUILD @@ -2,6 +2,22 @@ load("@rules_cc//cc:defs.bzl", "cc_library") diff --git a/recipe/patches/0022-add-absl_crc32c-targets.patch b/recipe/patches/0022-add-absl_crc32c-targets.patch index 8a421c048..4e5dcbe2a 100644 --- a/recipe/patches/0022-add-absl_crc32c-targets.patch +++ b/recipe/patches/0022-add-absl_crc32c-targets.patch @@ -1,7 +1,7 @@ -From 4d7b4e4c13759923bbf033c4b7c5e71fa33e22dd Mon Sep 17 00:00:00 2001 +From 94ad23f0de536c9bced102cb7ae7495bc4279753 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:41:09 +1100 -Subject: [PATCH 22/27] add absl_crc32c targets +Subject: [PATCH 22/29] add absl_crc32c targets --- third_party/absl/system.absl.crc.BUILD | 70 ++++++++++++++++++++++++++ @@ -11,7 +11,7 @@ Subject: [PATCH 22/27] add absl_crc32c targets diff --git a/third_party/absl/system.absl.crc.BUILD b/third_party/absl/system.absl.crc.BUILD new file mode 100644 -index 00000000..487c36ff +index 00000000000..487c36ff45b --- /dev/null +++ b/third_party/absl/system.absl.crc.BUILD @@ -0,0 +1,70 @@ @@ -86,7 +86,7 @@ index 00000000..487c36ff + ], +) diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl -index addb2410..e71aa167 100644 +index addb2410abd..e71aa167260 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -14,6 +14,7 @@ def repo(): diff --git a/recipe/patches/0023-add-kernel_timeout_internal-target.patch b/recipe/patches/0023-add-kernel_timeout_internal-target.patch index f5a157266..4cb4f58cd 100644 --- a/recipe/patches/0023-add-kernel_timeout_internal-target.patch +++ b/recipe/patches/0023-add-kernel_timeout_internal-target.patch @@ -1,14 +1,14 @@ -From f98ad31ffbb83ba849a8a97592c8c6f78e6f7fd0 Mon Sep 17 00:00:00 2001 +From f62987a80c0f75dc4526d21a52a056124b4d5862 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 23:36:48 +1100 -Subject: [PATCH 23/27] add kernel_timeout_internal target +Subject: [PATCH 23/29] add kernel_timeout_internal target --- .../absl/system.absl.synchronization.BUILD | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/third_party/absl/system.absl.synchronization.BUILD b/third_party/absl/system.absl.synchronization.BUILD -index c0fa37aa..b47309de 100644 +index c0fa37aacd7..b47309deb39 100644 --- a/third_party/absl/system.absl.synchronization.BUILD +++ b/third_party/absl/system.absl.synchronization.BUILD @@ -16,14 +16,29 @@ cc_library( diff --git a/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch b/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch index 188230f3e..f9d779abe 100644 --- a/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch +++ b/recipe/patches/0024-work-around-for-warning-that-clang-falsely-treats-as.patch @@ -1,7 +1,7 @@ -From 24eeae23f9140fddfbfe2568e49f9d3359f2a71d Mon Sep 17 00:00:00 2001 +From 956d7230488a7f96625078a0766933178f31b523 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 19 May 2024 20:52:35 +1100 -Subject: [PATCH 24/27] work around for warning that clang falsely treats as +Subject: [PATCH 24/29] work around for warning that clang falsely treats as error see https://github.com/llvm/llvm-project/issues/92630 @@ -10,7 +10,7 @@ see https://github.com/llvm/llvm-project/issues/92630 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc -index f48811d1..0d1c0305 100644 +index f48811d13d2..0d1c0305d97 100644 --- a/.bazelrc +++ b/.bazelrc @@ -310,7 +310,7 @@ build:ios --noenable_platform_specific_config diff --git a/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch b/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch index 86a3ad5e2..11754e173 100644 --- a/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch +++ b/recipe/patches/0025-Hardcode-BUILD_PREFIX-in-build_pip_package.patch @@ -1,14 +1,14 @@ -From 7985aee1f8f9efc8832c7ec8b4e13485928a669c Mon Sep 17 00:00:00 2001 +From 667b9f768fffa9bee1c05a4a02a56db41898d427 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 12 Jul 2024 12:52:38 +0000 -Subject: [PATCH 25/27] Hardcode BUILD_PREFIX in build_pip_package +Subject: [PATCH 25/29] Hardcode BUILD_PREFIX in build_pip_package --- tensorflow/tools/pip_package/build_pip_package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tensorflow/tools/pip_package/build_pip_package.py b/tensorflow/tools/pip_package/build_pip_package.py -index d882db09..091db3f4 100644 +index d882db09a10..091db3f4691 100644 --- a/tensorflow/tools/pip_package/build_pip_package.py +++ b/tensorflow/tools/pip_package/build_pip_package.py @@ -285,12 +285,12 @@ def patch_so(srcs_dir: str) -> None: diff --git a/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch b/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch index ccca83cdc..dc31611a0 100644 --- a/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch +++ b/recipe/patches/0026-Only-link-to-sparse_core_layout_proto_cc-headers.patch @@ -1,14 +1,14 @@ -From 4b271291f3811779838efcbb90448b3b06c45922 Mon Sep 17 00:00:00 2001 +From 0bbb91fd9c2750876113839b9b74765426ec23c7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 16 Jul 2024 17:18:23 +0200 -Subject: [PATCH 26/27] Only link to sparse_core_layout_proto_cc headers +Subject: [PATCH 26/29] Only link to sparse_core_layout_proto_cc headers --- tensorflow/core/tpu/kernels/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/core/tpu/kernels/BUILD b/tensorflow/core/tpu/kernels/BUILD -index 5c1dc5da..4d467227 100644 +index 5c1dc5da889..4d467227ba2 100644 --- a/tensorflow/core/tpu/kernels/BUILD +++ b/tensorflow/core/tpu/kernels/BUILD @@ -1483,7 +1483,7 @@ cc_library( diff --git a/recipe/patches/0027-Protobuf-5-compatability.patch b/recipe/patches/0027-Protobuf-5-compatability.patch index 78b14d049..3ae7e9ab3 100644 --- a/recipe/patches/0027-Protobuf-5-compatability.patch +++ b/recipe/patches/0027-Protobuf-5-compatability.patch @@ -1,7 +1,7 @@ -From 61c8a1306bb7bbc8919a237602e6dd158c80ff23 Mon Sep 17 00:00:00 2001 +From 6b7eab274229f57e295940322452c3d920800c52 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 10 Oct 2024 19:59:31 +0200 -Subject: [PATCH 27/27] Protobuf 5 compatability +Subject: [PATCH 27/29] Protobuf 5 compatability --- .../mlir/lite/python/jax_to_tfl_flatbuffer.cc | 2 +- @@ -23,7 +23,7 @@ Subject: [PATCH 27/27] Protobuf 5 compatability create mode 100644 third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch diff --git a/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc b/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc -index eba1ebc4..dc9f7b81 100644 +index eba1ebc48ce..dc9f7b81af6 100644 --- a/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc +++ b/tensorflow/compiler/mlir/lite/python/jax_to_tfl_flatbuffer.cc @@ -57,7 +57,7 @@ namespace { @@ -36,7 +36,7 @@ index eba1ebc4..dc9f7b81 100644 bool LoadHloProto(const std::string& contents, xla::HloProto* hlo_proto) { diff --git a/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc b/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc -index 906a058d..0c673310 100644 +index 906a058d04e..0c67331094b 100644 --- a/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc +++ b/tensorflow/compiler/mlir/tensorflow/utils/parse_text_proto.cc @@ -30,7 +30,7 @@ namespace { @@ -49,7 +49,7 @@ index 906a058d..0c673310 100644 } // namespace diff --git a/tensorflow/core/debug/debug_io_utils.cc b/tensorflow/core/debug/debug_io_utils.cc -index 0e4e11d8..912970b7 100644 +index 0e4e11d81e9..912970b7d82 100644 --- a/tensorflow/core/debug/debug_io_utils.cc +++ b/tensorflow/core/debug/debug_io_utils.cc @@ -94,7 +94,11 @@ Event PrepareChunkEventProto(const DebugNodeKey& debug_node_key, @@ -65,7 +65,7 @@ index 0e4e11d8..912970b7 100644 metadata, &json_output, json_options); if (status.ok()) { diff --git a/tensorflow/core/ir/importexport/parse_text_proto.cc b/tensorflow/core/ir/importexport/parse_text_proto.cc -index c631785c..3ab6e17c 100644 +index c631785cefc..3ab6e17c3aa 100644 --- a/tensorflow/core/ir/importexport/parse_text_proto.cc +++ b/tensorflow/core/ir/importexport/parse_text_proto.cc @@ -35,7 +35,7 @@ namespace { @@ -78,7 +78,7 @@ index c631785c..3ab6e17c 100644 } // namespace diff --git a/tensorflow/core/profiler/convert/hlo_to_tools_data.cc b/tensorflow/core/profiler/convert/hlo_to_tools_data.cc -index 7fbcd397..d17f3402 100644 +index 7fbcd397906..d17f3402a3f 100644 --- a/tensorflow/core/profiler/convert/hlo_to_tools_data.cc +++ b/tensorflow/core/profiler/convert/hlo_to_tools_data.cc @@ -62,7 +62,11 @@ absl::StatusOr ConvertHloProtoToMemoryViewer( @@ -94,7 +94,7 @@ index 7fbcd397..d17f3402 100644 result_or.value(), &json_output, options); if (!encoded_status.ok()) { diff --git a/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc b/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc -index b289f54b..38e89170 100644 +index b289f54baa6..38e89170f42 100644 --- a/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc +++ b/tensorflow/core/profiler/convert/xplane_to_memory_profile.cc @@ -529,7 +529,11 @@ void ProcessMemoryProfileProto(int64_t max_num_snapshots, @@ -110,7 +110,7 @@ index b289f54b..38e89170 100644 json_options); if (!status.ok()) { diff --git a/tensorflow/core/profiler/convert/xplane_to_tools_data.cc b/tensorflow/core/profiler/convert/xplane_to_tools_data.cc -index dcc7cea4..a995db64 100644 +index dcc7cea45f7..a995db64d42 100644 --- a/tensorflow/core/profiler/convert/xplane_to_tools_data.cc +++ b/tensorflow/core/profiler/convert/xplane_to_tools_data.cc @@ -218,7 +218,11 @@ absl::StatusOr ConvertMultiXSpacesToPodViewer( @@ -138,7 +138,7 @@ index dcc7cea4..a995db64 100644 auto encode_status = protobuf::util::MessageToJsonString(profile, &json_output, opts); diff --git a/tensorflow/core/util/proto/proto_utils.cc b/tensorflow/core/util/proto/proto_utils.cc -index 282be94a..7cfed84d 100644 +index 282be94a774..7cfed84d2a8 100644 --- a/tensorflow/core/util/proto/proto_utils.cc +++ b/tensorflow/core/util/proto/proto_utils.cc @@ -101,17 +101,17 @@ StringErrorCollector::StringErrorCollector(string* error_text, @@ -165,7 +165,7 @@ index 282be94a..7cfed84d 100644 } // namespace proto_utils diff --git a/tensorflow/core/util/proto/proto_utils.h b/tensorflow/core/util/proto/proto_utils.h -index f0347a84..c8b2a4b9 100644 +index f0347a84cbe..c8b2a4b936a 100644 --- a/tensorflow/core/util/proto/proto_utils.h +++ b/tensorflow/core/util/proto/proto_utils.h @@ -53,10 +53,10 @@ class StringErrorCollector : public protobuf::io::ErrorCollector { @@ -182,7 +182,7 @@ index f0347a84..c8b2a4b9 100644 private: string* const error_text_; diff --git a/tensorflow/tools/proto_text/gen_proto_text_functions.cc b/tensorflow/tools/proto_text/gen_proto_text_functions.cc -index 406e6641..d97eae73 100644 +index 406e6641178..d97eae7346b 100644 --- a/tensorflow/tools/proto_text/gen_proto_text_functions.cc +++ b/tensorflow/tools/proto_text/gen_proto_text_functions.cc @@ -31,8 +31,8 @@ class CrashOnErrorCollector @@ -197,7 +197,7 @@ index 406e6641..d97eae73 100644 << column << " - " << message; } diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl -index 5320aa18..32f0a39c 100644 +index 5320aa187fd..32f0a39c91c 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -878,6 +878,10 @@ def _tf_repositories(): @@ -213,7 +213,7 @@ index 5320aa18..32f0a39c 100644 diff --git a/third_party/0001-Migrate-from-AddError-to-RecordError.patch b/third_party/0001-Migrate-from-AddError-to-RecordError.patch new file mode 100644 -index 00000000..0ed75ee8 +index 00000000000..0ed75ee8019 --- /dev/null +++ b/third_party/0001-Migrate-from-AddError-to-RecordError.patch @@ -0,0 +1,33 @@ @@ -252,7 +252,7 @@ index 00000000..0ed75ee8 + diff --git a/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch b/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch new file mode 100644 -index 00000000..b5af8d2d +index 00000000000..b5af8d2dff5 --- /dev/null +++ b/third_party/0002-Fix-compatibility-with-protobuf-v26-migrate-from-dep.patch @@ -0,0 +1,52 @@ @@ -309,7 +309,7 @@ index 00000000..b5af8d2d +2.34.1 + diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc b/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc -index 167cdd2b..dc1ebdd1 100644 +index 167cdd2b891..dc1ebdd10e6 100644 --- a/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc +++ b/third_party/xla/third_party/tsl/tsl/platform/default/human_readable_json.cc @@ -33,7 +33,11 @@ absl::StatusOr ProtoToHumanReadableJson( diff --git a/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch b/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch index 002610a8b..4ddfe019f 100644 --- a/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch +++ b/recipe/patches/0028-Fix-ResolvePadding-to-be-consistent-in-the-size-of-t.patch @@ -1,7 +1,7 @@ -From b3804de29e8b40b1cb18b940656307e24cd7a457 Mon Sep 17 00:00:00 2001 +From 4664eb999e860294cbe7f333344fc68af1486d0a Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Thu, 14 Nov 2024 15:25:44 -0800 -Subject: [PATCH 28/28] Fix ResolvePadding to be consistent in the size of the +Subject: [PATCH 28/29] Fix ResolvePadding to be consistent in the size of the small vector PiperOrigin-RevId: 696670235 @@ -11,7 +11,7 @@ PiperOrigin-RevId: 696670235 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc -index 3d67bbfd..df67b39d 100644 +index 3d67bbfd123..df67b39d3a6 100644 --- a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc +++ b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.cc @@ -68,7 +68,7 @@ llvm::SmallVector ResolveStridesOrDilations( @@ -24,7 +24,7 @@ index 3d67bbfd..df67b39d 100644 llvm::SmallVector res; if (!opt_padding.has_value()) { diff --git a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h -index 3c2c8ae5..b522b41c 100644 +index 3c2c8ae5ced..b522b41c11e 100644 --- a/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h +++ b/tensorflow/compiler/mlir/lite/stablehlo/transforms/legalize_hlo_conversions/op_util_common.h @@ -127,7 +127,7 @@ llvm::SmallVector ResolveStridesOrDilations( diff --git a/recipe/patches/0029-set-the-cpu-type-for-macos-target.patch b/recipe/patches/0029-set-the-cpu-type-for-macos-target.patch new file mode 100644 index 000000000..b6ec15fdd --- /dev/null +++ b/recipe/patches/0029-set-the-cpu-type-for-macos-target.patch @@ -0,0 +1,21 @@ +From 28f4ade46fa0a8fe3e4678d9e41a26be410e0448 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sat, 1 Feb 2025 22:36:18 +1100 +Subject: [PATCH 29/29] set the cpu type for macos target + +--- + .bazelrc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/.bazelrc b/.bazelrc +index 0d1c0305d97..c048c3e3e2f 100644 +--- a/.bazelrc ++++ b/.bazelrc +@@ -155,6 +155,7 @@ build:android --define=xnn_enable_avxvnniint8=false + + # Sets the default Apple platform to macOS. + build:macos --apple_platform_type=macos ++build:macos --cpu=darwin_x86_64 + + # gRPC on MacOS requires this #define + build:macos --copt=-DGRPC_BAZEL_BUILD From c2b7d4e9ffa61d27dd62b8fdb6d6df739a5dd148 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 22:54:00 +1100 Subject: [PATCH 52/64] use consistent cpu type for osx-64 --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 59d0a0458..a8c425d8a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -166,7 +166,7 @@ source ${RECIPE_DIR}/gen-bazel-toolchain.sh if [[ "${target_platform}" == "osx-64" ]]; then # Tensorflow doesn't cope yet with an explicit architecture (darwin_x86_64) on osx-64 yet. - TARGET_CPU=darwin + TARGET_CPU=darwin_x86_64 # See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" fi From 5a921b4b6f24f3a647393f8745c3c98e6558a768 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 1 Feb 2025 22:55:46 +1100 Subject: [PATCH 53/64] use allocating codesign --- recipe/custom_toolchain/cc_wrapper.sh.template | 2 +- recipe/meta.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template index 7fd9c9f15..ad76e2f6f 100644 --- a/recipe/custom_toolchain/cc_wrapper.sh.template +++ b/recipe/custom_toolchain/cc_wrapper.sh.template @@ -108,5 +108,5 @@ for rpath in ${RPATHS}; do done if [[ "${target_platform}" == "osx-arm64" ]]; then - ${BUILD_PREFIX}/bin/codesign -s - -f ${OUTPUT} + ${BUILD_PREFIX}/bin/codesign_allocate -s - -f ${OUTPUT} fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ad883dfae..d3fefecf0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -86,7 +86,6 @@ requirements: - patchelf - sed - rsync - - sigtool # [osx] # realpath is not available from the docker image for cuda <= 10.2 # so we install coreutils here - coreutils # [cuda_compiler_version != "None"] From e4e29f3eb73edafda88344a720bce8e0bb5629bb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 07:12:15 +1100 Subject: [PATCH 54/64] more toolchain includes --- recipe/custom_toolchain/cc_toolchain_config.bzl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index 337409223..a7a5e9d40 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -152,6 +152,12 @@ def _impl(ctx): "${PREFIX}/include", "-isystem", "${PREFIX}/include/c++/v1", + "-isystem", + "${CONDA_BUILD_SYSROOT}/usr/include", + "-isystem", + "${CONDA_BUILD_SYSROOT}/System/Library/Frameworks", + "-isystem", + "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include", ] toolchain_include_directories_feature = feature( From 6ab714a25d701bd542827e418f8b98540c721419 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 07:28:59 +1100 Subject: [PATCH 55/64] allow sysroot outside bazel's "execution root" --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index a8c425d8a..2df0769ca 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -84,6 +84,7 @@ export CC_OPT_FLAGS="-O2" # bazel query 'deps(//tensorflow/tools/lib_package:libtensorflow)' --output graph > graph.in if [[ "${target_platform}" == osx-* ]]; then export LDFLAGS="${LDFLAGS} -lz -framework CoreFoundation -Xlinker -undefined -Xlinker dynamic_lookup" + export BAZEL_OPTS="${BAZEL_OPTS} --override_repository=local_sdk=${CONDA_BUILD_SYSROOT}" else export LDFLAGS="${LDFLAGS} -lrt" fi From 40a9c1fe60031c590dcfa2c8e6132c270bdd56dd Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 07:35:33 +1100 Subject: [PATCH 56/64] use full path to target-specific codesign_allocate --- recipe/custom_toolchain/cc_wrapper.sh.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template index ad76e2f6f..640ec98ce 100644 --- a/recipe/custom_toolchain/cc_wrapper.sh.template +++ b/recipe/custom_toolchain/cc_wrapper.sh.template @@ -108,5 +108,5 @@ for rpath in ${RPATHS}; do done if [[ "${target_platform}" == "osx-arm64" ]]; then - ${BUILD_PREFIX}/bin/codesign_allocate -s - -f ${OUTPUT} + ${BUILD_PREFIX}/bin/arm64-apple-darwin20.0.0-codesign_allocate -s - -f ${OUTPUT} fi From 9f0c12da55230c7ac57b3a868225a701a0a6e91e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 08:01:47 +1100 Subject: [PATCH 57/64] try forcing cxx_builtin_include_directories --- recipe/build.sh | 1 - recipe/custom_toolchain/cc_toolchain_config.bzl | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 2df0769ca..a8c425d8a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -84,7 +84,6 @@ export CC_OPT_FLAGS="-O2" # bazel query 'deps(//tensorflow/tools/lib_package:libtensorflow)' --output graph > graph.in if [[ "${target_platform}" == osx-* ]]; then export LDFLAGS="${LDFLAGS} -lz -framework CoreFoundation -Xlinker -undefined -Xlinker dynamic_lookup" - export BAZEL_OPTS="${BAZEL_OPTS} --override_repository=local_sdk=${CONDA_BUILD_SYSROOT}" else export LDFLAGS="${LDFLAGS} -lrt" fi diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index a7a5e9d40..69faa8b5c 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -150,14 +150,6 @@ def _impl(ctx): toolchain_include_directories_flags = [ "-isystem", "${PREFIX}/include", - "-isystem", - "${PREFIX}/include/c++/v1", - "-isystem", - "${CONDA_BUILD_SYSROOT}/usr/include", - "-isystem", - "${CONDA_BUILD_SYSROOT}/System/Library/Frameworks", - "-isystem", - "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include", ] toolchain_include_directories_feature = feature( @@ -291,7 +283,7 @@ def _impl(ctx): ], ) - if "TARGET_PLATFORM".startswith("osx"): + if True: cxx_builtin_include_directories = [ "${CONDA_BUILD_SYSROOT}/System/Library/Frameworks", "${CONDA_BUILD_SYSROOT}/usr/include", From a91db6f8908fab244bc3559ac4e8a1d4dc4627b9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 08:29:09 +1100 Subject: [PATCH 58/64] ain't bazel fun --- recipe/build.sh | 3 +++ recipe/custom_toolchain/WORKSPACE | 5 +++++ recipe/custom_toolchain/cc_toolchain_config.bzl | 4 ++++ recipe/gen-bazel-toolchain.sh | 1 + 4 files changed, 13 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index a8c425d8a..d4aa513d5 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -84,6 +84,9 @@ export CC_OPT_FLAGS="-O2" # bazel query 'deps(//tensorflow/tools/lib_package:libtensorflow)' --output graph > graph.in if [[ "${target_platform}" == osx-* ]]; then export LDFLAGS="${LDFLAGS} -lz -framework CoreFoundation -Xlinker -undefined -Xlinker dynamic_lookup" + BZ_SDK_PATH=$(bazel info execution_root)/external/macos_sdk + export BAZEL_OPTS="${BAZEL_OPTS} --cxxopt=\"-isystem ${BZ_SDK_PATH}/System/Library/Frameworks\"" + export BAZEL_OPTS="${BAZEL_OPTS} --cxxopt=\"-isystem ${BZ_SDK_PATH}/usr/include\"" else export LDFLAGS="${LDFLAGS} -lrt" fi diff --git a/recipe/custom_toolchain/WORKSPACE b/recipe/custom_toolchain/WORKSPACE index 125586504..f9517e4e3 100644 --- a/recipe/custom_toolchain/WORKSPACE +++ b/recipe/custom_toolchain/WORKSPACE @@ -1 +1,6 @@ workspace(name = "local_config_cc") + +local_repository( + name = "macos_sdk", + path = "${CONDA_BUILD_SYSROOT}", +) diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index 69faa8b5c..c8ccb6b24 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -150,6 +150,10 @@ def _impl(ctx): toolchain_include_directories_flags = [ "-isystem", "${PREFIX}/include", + "-isystem", + "${PREFIX}/include/c++/v1", + "-isystem", + "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include", ] toolchain_include_directories_feature = feature( diff --git a/recipe/gen-bazel-toolchain.sh b/recipe/gen-bazel-toolchain.sh index d58ad16f8..84606d78d 100755 --- a/recipe/gen-bazel-toolchain.sh +++ b/recipe/gen-bazel-toolchain.sh @@ -131,6 +131,7 @@ pushd custom_toolchain cp cc_toolchain_config.bzl cc_toolchain_build_config.bzl apply_cc_template cc_toolchain_config.bzl apply_cc_template crosstool_wrapper_driver_is_not_gcc + apply_cc_template WORKSPACE ( if [[ "${build_platform}" != "${target_platform}" ]]; then if [[ "${target_platform}" == osx-* ]]; then From 93b89b2c67f1e068a1d766682674b4497458c004 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 08:41:08 +1100 Subject: [PATCH 59/64] try again with cxx_builtin_include_directories --- recipe/build.sh | 4 +--- recipe/custom_toolchain/cc_toolchain_config.bzl | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index d4aa513d5..0da33afe9 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -84,9 +84,7 @@ export CC_OPT_FLAGS="-O2" # bazel query 'deps(//tensorflow/tools/lib_package:libtensorflow)' --output graph > graph.in if [[ "${target_platform}" == osx-* ]]; then export LDFLAGS="${LDFLAGS} -lz -framework CoreFoundation -Xlinker -undefined -Xlinker dynamic_lookup" - BZ_SDK_PATH=$(bazel info execution_root)/external/macos_sdk - export BAZEL_OPTS="${BAZEL_OPTS} --cxxopt=\"-isystem ${BZ_SDK_PATH}/System/Library/Frameworks\"" - export BAZEL_OPTS="${BAZEL_OPTS} --cxxopt=\"-isystem ${BZ_SDK_PATH}/usr/include\"" + # BZ_SDK_PATH=$(bazel info execution_root)/external/macos_sdk else export LDFLAGS="${LDFLAGS} -lrt" fi diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index c8ccb6b24..338ac94f4 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -289,8 +289,8 @@ def _impl(ctx): if True: cxx_builtin_include_directories = [ - "${CONDA_BUILD_SYSROOT}/System/Library/Frameworks", - "${CONDA_BUILD_SYSROOT}/usr/include", + "@macos_sdk//System/Library/Frameworks", + "@macos_sdk//usr/include", "${BUILD_PREFIX}/lib/clang/${COMPILER_VERSION}/include", "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include", "${PREFIX}/include/c++/v1", From a2addd213614730a18f4b42246f8efd90baced47 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 09:43:12 +1100 Subject: [PATCH 60/64] a bigger hammer --- .../custom_toolchain/cc_toolchain_config.bzl | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index 338ac94f4..9623ea096 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -287,27 +287,14 @@ def _impl(ctx): ], ) - if True: - cxx_builtin_include_directories = [ - "@macos_sdk//System/Library/Frameworks", - "@macos_sdk//usr/include", - "${BUILD_PREFIX}/lib/clang/${COMPILER_VERSION}/include", - "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include", - "${PREFIX}/include/c++/v1", - "${PREFIX}/include", - ] - else: - cxx_builtin_include_directories = [ - "${CONDA_BUILD_SYSROOT}/usr/include", - "${BUILD_PREFIX}/lib/gcc/${HOST}/${COMPILER_VERSION}", - "${BUILD_PREFIX}/${HOST}/include/c++/${COMPILER_VERSION}", - "${PREFIX}/include", - ] - - if (len("${CUDA_HOME}")): - cxx_builtin_include_directories.append("${CUDA_HOME}/include") - cxx_builtin_include_directories.append("${CUDA_HOME}/targets/x86_64-linux/include/") - cxx_builtin_include_directories.append("${PREFIX}/targets/x86_64-linux/include") + cxx_builtin_include_directories = [ + "@macos_sdk//System/Library/Frameworks", + "@macos_sdk//usr/include", + "${BUILD_PREFIX}/lib/clang/${COMPILER_VERSION}/include", + "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include", + "${PREFIX}/include/c++/v1", + "${PREFIX}/include", + ] return cc_common.create_cc_toolchain_config_info( ctx = ctx, From b97075b71a11b09ab8bd72285b432022e0bc24de Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 10:02:09 +1100 Subject: [PATCH 61/64] set `builtin_sysroot=` in create_cc_toolchain_config_info --- recipe/custom_toolchain/cc_toolchain_config.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl index 9623ea096..9b4926c5d 100644 --- a/recipe/custom_toolchain/cc_toolchain_config.bzl +++ b/recipe/custom_toolchain/cc_toolchain_config.bzl @@ -308,6 +308,7 @@ def _impl(ctx): abi_version = "local", abi_libc_version = "local", tool_paths = tool_paths, + builtin_sysroot = "${CONDA_BUILD_SYSROOT}", cxx_builtin_include_directories = cxx_builtin_include_directories, features = [toolchain_include_directories_feature, compiler_flags, cxx_flags, supports_pic_feature, linker_flags, supports_dynamic_linker, link_libcpp_feature, objcpp_flags], ) From aa5f9c98370bad5a72f77fef451456beac8e582c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 10:02:20 +1100 Subject: [PATCH 62/64] remove flag not known by codesign_allocate --- recipe/custom_toolchain/cc_wrapper.sh.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template index 640ec98ce..06678fc65 100644 --- a/recipe/custom_toolchain/cc_wrapper.sh.template +++ b/recipe/custom_toolchain/cc_wrapper.sh.template @@ -108,5 +108,5 @@ for rpath in ${RPATHS}; do done if [[ "${target_platform}" == "osx-arm64" ]]; then - ${BUILD_PREFIX}/bin/arm64-apple-darwin20.0.0-codesign_allocate -s - -f ${OUTPUT} + ${BUILD_PREFIX}/bin/arm64-apple-darwin20.0.0-codesign_allocate - -f ${OUTPUT} fi From abdaa53fcdf8ba4e77f4ef1ba37d94742033e3c0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 10:25:03 +1100 Subject: [PATCH 63/64] remove yet another flag from codesign_allocate --- recipe/custom_toolchain/cc_wrapper.sh.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template index 06678fc65..b59571cbc 100644 --- a/recipe/custom_toolchain/cc_wrapper.sh.template +++ b/recipe/custom_toolchain/cc_wrapper.sh.template @@ -108,5 +108,5 @@ for rpath in ${RPATHS}; do done if [[ "${target_platform}" == "osx-arm64" ]]; then - ${BUILD_PREFIX}/bin/arm64-apple-darwin20.0.0-codesign_allocate - -f ${OUTPUT} + ${BUILD_PREFIX}/bin/arm64-apple-darwin20.0.0-codesign_allocate -f ${OUTPUT} fi From 7322f0b3853885ee07ff1d32a799c732ce2d4389 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Feb 2025 10:28:05 +1100 Subject: [PATCH 64/64] move SDK into prefix --- recipe/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 0da33afe9..91f5dc1bc 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -84,7 +84,9 @@ export CC_OPT_FLAGS="-O2" # bazel query 'deps(//tensorflow/tools/lib_package:libtensorflow)' --output graph > graph.in if [[ "${target_platform}" == osx-* ]]; then export LDFLAGS="${LDFLAGS} -lz -framework CoreFoundation -Xlinker -undefined -Xlinker dynamic_lookup" - # BZ_SDK_PATH=$(bazel info execution_root)/external/macos_sdk + mkdir ${PREFIX}/sdk + cp -R ${CONDA_BUILD_SYSROOT}/* ${PREFIX}/sdk + export CONDA_BUILD_SYSROOT=${PREFIX}/sdk else export LDFLAGS="${LDFLAGS} -lrt" fi