From a7f9daa01a315c4a8eddbd5a09fd6c3527af9498 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 24 Feb 2024 20:22:09 +0000 Subject: [PATCH 01/48] Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 --- ...il20240116_libgrpc161_libprotobuf4252.yaml | 22 +++++++++++++++++++ conda-forge.yml | 2 +- recipe/meta.yaml | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 .ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml new file mode 100644 index 00000000..08cd5a02 --- /dev/null +++ b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml @@ -0,0 +1,22 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + # this shouldn't attempt to modify the python feedstocks + - protobuf +libabseil: +- "20240116" +libgrpc: +- "1.61" +libprotobuf: +- 4.25.2 +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1705991934.9119136 diff --git a/conda-forge.yml b/conda-forge.yml index 479a19fc..79b8c029 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -7,9 +7,9 @@ build_platform: osx_arm64: osx_64 conda_build: pkg_format: '2' +conda_build_tool: conda-build+conda-libmamba-solver conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main test: native_and_emulated -conda_build_tool: "conda-build+conda-libmamba-solver" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index afcc3505..4de1f7be 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -43,7 +43,7 @@ source: sha256: b3a9970c3c6b169c41ac2fd4375f668d3fd1b492d48b912d89415fa1522a8f50 build: - number: 3 + number: 4 skip: true # [win] skip: true # [python_impl == 'pypy'] skip: true # [py<39] From 22fef6b7ac2af6dd855ba2cfb3baffd383e2859a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 24 Feb 2024 20:23:54 +0000 Subject: [PATCH 02/48] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.30.4, and conda-forge-pinning 2024.02.23.21.25.19 --- ...sion12numpy1.22python3.10.____cpython.yaml | 8 +- ...rsion12numpy1.22python3.9.____cpython.yaml | 8 +- ...sion12numpy1.23python3.11.____cpython.yaml | 8 +- ...sion12numpy1.22python3.10.____cpython.yaml | 8 +- ...rsion12numpy1.22python3.9.____cpython.yaml | 8 +- ...sion12numpy1.23python3.11.____cpython.yaml | 8 +- .ci_support/migrations/cuda118.yaml | 99 ------------------- .ci_support/migrations/icu73.yaml | 7 -- .../libgrpc159_libprotobuf4244.yaml | 16 --- .ci_support/migrations/libjpeg_turbo3.yaml | 7 -- ...sx_64_numpy1.22python3.10.____cpython.yaml | 8 +- ...osx_64_numpy1.22python3.9.____cpython.yaml | 8 +- ...sx_64_numpy1.23python3.11.____cpython.yaml | 8 +- ...arm64_numpy1.22python3.10.____cpython.yaml | 8 +- ..._arm64_numpy1.22python3.9.____cpython.yaml | 8 +- ...arm64_numpy1.23python3.11.____cpython.yaml | 8 +- 16 files changed, 48 insertions(+), 177 deletions(-) delete mode 100644 .ci_support/migrations/cuda118.yaml delete mode 100644 .ci_support/migrations/icu73.yaml delete mode 100644 .ci_support/migrations/libgrpc159_libprotobuf4244.yaml delete mode 100644 .ci_support/migrations/libjpeg_turbo3.yaml diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml index edab995b..6fe980aa 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -27,17 +27,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 nccl: - '2' numpy: @@ -61,7 +61,7 @@ sqlite: target_platform: - linux-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml index ed88c2b6..b0544c73 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -27,17 +27,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 nccl: - '2' numpy: @@ -61,7 +61,7 @@ sqlite: target_platform: - linux-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 0002fd87..cb994a9b 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -27,17 +27,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 nccl: - '2' numpy: @@ -61,7 +61,7 @@ sqlite: target_platform: - linux-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 1fa310b3..b497f6df 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -27,17 +27,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 nccl: - '2' numpy: @@ -61,7 +61,7 @@ sqlite: target_platform: - linux-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index c709f458..018cd627 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -27,17 +27,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 nccl: - '2' numpy: @@ -61,7 +61,7 @@ sqlite: target_platform: - linux-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index bcdaff56..7c76a960 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -27,17 +27,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 nccl: - '2' numpy: @@ -61,7 +61,7 @@ sqlite: target_platform: - linux-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/migrations/cuda118.yaml b/.ci_support/migrations/cuda118.yaml deleted file mode 100644 index fdd298b9..00000000 --- a/.ci_support/migrations/cuda118.yaml +++ /dev/null @@ -1,99 +0,0 @@ -migrator_ts: 1692828152 -__migrator: - kind: - version - migration_number: - 1 - 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: - # Native builds - - 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"] - - # Legacy CUDAs - - 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"] - - # CUDA 11.2 - - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # CUDA 11.2 arch: 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"] - # CUDA 11.2 arch: 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"] - - # CUDA 11.8 - - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # CUDA 11.8 arch: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # CUDA 11.8 arch: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - # Native CentOS 7 image - - 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 win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.2 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11.8 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.0 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - commit_message: | - Rebuild for CUDA 11.8 w/arch support - -cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 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"] - - 11.8 # [(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"] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -cxx_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - -fortran_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 11 # [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-cuda:11.8 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - # case: native compilation (build == target) - - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - # case: cross-compilation (build != target) - - quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"] - - quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] diff --git a/.ci_support/migrations/icu73.yaml b/.ci_support/migrations/icu73.yaml deleted file mode 100644 index 6d21a766..00000000 --- a/.ci_support/migrations/icu73.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -icu: -- '73' -migrator_ts: 1692912856.1389868 diff --git a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml deleted file mode 100644 index 8a51b6ed..00000000 --- a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml +++ /dev/null @@ -1,16 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - exclude: - # this shouldn't attempt to modify the python feedstocks - - protobuf -libgrpc: -- "1.59" -libprotobuf: -- 4.24.4 -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1698833751.21557 diff --git a/.ci_support/migrations/libjpeg_turbo3.yaml b/.ci_support/migrations/libjpeg_turbo3.yaml deleted file mode 100644 index b4e24688..00000000 --- a/.ci_support/migrations/libjpeg_turbo3.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libjpeg_turbo: -- '3' -migrator_ts: 1693842343.429878 diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 1de84314..40b0d704 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -23,17 +23,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -55,7 +55,7 @@ sqlite: target_platform: - osx-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 6c1c4ff0..282ce9d8 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -23,17 +23,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -55,7 +55,7 @@ sqlite: target_platform: - osx-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index a5fad320..930679b5 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -23,17 +23,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -55,7 +55,7 @@ sqlite: target_platform: - osx-64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 70756ebe..c8f3e2c7 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -21,17 +21,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -53,7 +53,7 @@ sqlite: target_platform: - osx-arm64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 97d4f496..f2a219f5 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -21,17 +21,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -53,7 +53,7 @@ sqlite: target_platform: - osx-arm64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index f6770333..d1fc28f0 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -21,17 +21,17 @@ giflib: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.61' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.2 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -53,7 +53,7 @@ sqlite: target_platform: - osx-arm64 tensorflow: -- '2.14' +- '2.15' zip_keys: - - c_compiler_version - cxx_compiler_version From cb5644664a9971deef905bee205904f2e9bfc340 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 14:31:05 -0500 Subject: [PATCH 03/48] Add patch for mssing abseil includes --- recipe/meta.yaml | 1 + ...udes-needed-for-Abseil-lts_2024_01_1.patch | 346 ++++++++++++++++++ 2 files changed, 347 insertions(+) create mode 100644 recipe/patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4de1f7be..4bb7dd5c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,6 +31,7 @@ source: - patches/0020-Adjust-relative-path-for-libdevice.patch # [(cuda_compiler_version or "").startswith("12")] # https://github.com/tensorflow/tensorflow/pull/62684 - patches/62684.patch + - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.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/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch b/recipe/patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch new file mode 100644 index 00000000..68fe98f8 --- /dev/null +++ b/recipe/patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch @@ -0,0 +1,346 @@ +From ec01c2c7842e7c2e91c1ad0b52d604929a6ec847 Mon Sep 17 00:00:00 2001 +From: David Majnemer +Date: Wed, 24 Jan 2024 03:58:26 -0800 +Subject: [PATCH] Fix missing includes needed for Abseil lts_2024_01_16 + +PiperOrigin-RevId: 601072928 +--- + tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD | 1 + + .../compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc | 1 + + tensorflow/core/graph/graph_debug_info_builder_test.cc | 1 + + tensorflow/core/tfrt/graph_executor/BUILD | 1 + + tensorflow/core/tfrt/graph_executor/config.h | 1 + + tensorflow/dtensor/mlir/function_renaming.cc | 1 + + tensorflow/lite/delegates/gpu/cl/BUILD | 1 + + tensorflow/lite/delegates/gpu/cl/cl_operation.h | 1 + + .../lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc | 1 + + .../delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc | 1 + + .../lite/delegates/utils/experimental/stable_delegate/BUILD | 1 + + .../utils/experimental/stable_delegate/delegate_loader.cc | 2 ++ + tensorflow/python/framework/BUILD | 1 + + tensorflow/python/framework/python_api_dispatcher_wrapper.cc | 1 + + tensorflow/python/util/BUILD | 1 + + tensorflow/python/util/function_parameter_canonicalizer.cc | 1 + + .../xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc | 3 +++ + third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD | 1 - + .../xla/third_party/tsl/tsl/profiler/utils/trace_utils.h | 1 + + third_party/xla/xla/backends/profiler/gpu/cupti_collector.h | 1 + + third_party/xla/xla/runtime/BUILD | 1 + + third_party/xla/xla/runtime/constraints.cc | 2 +- + third_party/xla/xla/service/cpu/runtime/BUILD | 1 + + third_party/xla/xla/service/cpu/runtime/rng.cc | 1 + + third_party/xla/xla/stream_executor/dnn.h | 3 +++ + 25 files changed, 29 insertions(+), 2 deletions(-) + +diff --git a/tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD b/tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD +index b065f29da4d..bc887cdfc96 100644 +--- a/tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD ++++ b/tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD +@@ -25,6 +25,7 @@ cc_library( + "@com_google_absl//absl/log", + "@com_google_absl//absl/log:check", + "@com_google_absl//absl/status:statusor", ++ "@com_google_absl//absl/strings", + "@llvm-project//llvm:Support", + "@llvm-project//mlir:FuncDialect", + "@llvm-project//mlir:IR", +diff --git a/tensorflow/compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc b/tensorflow/compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc +index 8c85f9f80ac..c0ef7c58c8b 100644 +--- a/tensorflow/compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc ++++ b/tensorflow/compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc +@@ -24,6 +24,7 @@ limitations under the License. + #include "absl/container/flat_hash_map.h" + #include "absl/log/check.h" + #include "absl/log/log.h" ++#include "absl/strings/str_cat.h" + #include "llvm/ADT/DenseMap.h" + #include "llvm/ADT/TypeSwitch.h" + #include "mlir/IR/Attributes.h" // from @llvm-project +diff --git a/tensorflow/core/graph/graph_debug_info_builder_test.cc b/tensorflow/core/graph/graph_debug_info_builder_test.cc +index 6c236de97d0..f7e5a6c01f6 100644 +--- a/tensorflow/core/graph/graph_debug_info_builder_test.cc ++++ b/tensorflow/core/graph/graph_debug_info_builder_test.cc +@@ -21,6 +21,7 @@ limitations under the License. + #include + + #include ++#include "absl/strings/str_cat.h" + #include "tensorflow/core/framework/graph_debug_info.pb.h" + #include "tensorflow/core/platform/test.h" + +diff --git a/tensorflow/core/tfrt/graph_executor/BUILD b/tensorflow/core/tfrt/graph_executor/BUILD +index 7cc355fa1b2..d34699c2028 100644 +--- a/tensorflow/core/tfrt/graph_executor/BUILD ++++ b/tensorflow/core/tfrt/graph_executor/BUILD +@@ -181,6 +181,7 @@ cc_library( + "@com_google_absl//absl/container:flat_hash_map", + "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", ++ "@com_google_absl//absl/strings", + "@com_google_protobuf//:protobuf", + ], + ) +diff --git a/tensorflow/core/tfrt/graph_executor/config.h b/tensorflow/core/tfrt/graph_executor/config.h +index 60e96701336..b0e3fbf12d6 100644 +--- a/tensorflow/core/tfrt/graph_executor/config.h ++++ b/tensorflow/core/tfrt/graph_executor/config.h +@@ -21,6 +21,7 @@ limitations under the License. + #include "absl/container/flat_hash_map.h" + #include "absl/status/status.h" + #include "absl/status/statusor.h" ++#include "absl/strings/str_cat.h" + #include "tensorflow/core/tfrt/graph_executor/config.pb.h" + + namespace tensorflow { +diff --git a/tensorflow/dtensor/mlir/function_renaming.cc b/tensorflow/dtensor/mlir/function_renaming.cc +index fe91943915b..0c485e91878 100644 +--- a/tensorflow/dtensor/mlir/function_renaming.cc ++++ b/tensorflow/dtensor/mlir/function_renaming.cc +@@ -16,6 +16,7 @@ limitations under the License. + #include + #include + ++#include "absl/strings/str_cat.h" + #include "mlir/Dialect/Func/IR/FuncOps.h" // from @llvm-project + #include "mlir/IR/Attributes.h" // from @llvm-project + #include "mlir/IR/Operation.h" // from @llvm-project +diff --git a/tensorflow/lite/delegates/gpu/cl/BUILD b/tensorflow/lite/delegates/gpu/cl/BUILD +index 760f401bdc6..81e77b603b3 100644 +--- a/tensorflow/lite/delegates/gpu/cl/BUILD ++++ b/tensorflow/lite/delegates/gpu/cl/BUILD +@@ -260,6 +260,7 @@ cc_library( + ":program_cache", + ":tensor", + "//tensorflow/lite/delegates/gpu/common/task:gpu_operation", ++ "@com_google_absl//absl/strings", + ], + ) + +diff --git a/tensorflow/lite/delegates/gpu/cl/cl_operation.h b/tensorflow/lite/delegates/gpu/cl/cl_operation.h +index c9192830a02..772269c003f 100644 +--- a/tensorflow/lite/delegates/gpu/cl/cl_operation.h ++++ b/tensorflow/lite/delegates/gpu/cl/cl_operation.h +@@ -22,6 +22,7 @@ limitations under the License. + #include + #include + ++#include "absl/strings/str_cat.h" + #include "tensorflow/lite/delegates/gpu/cl/cl_arguments.h" + #include "tensorflow/lite/delegates/gpu/cl/cl_command_queue.h" + #include "tensorflow/lite/delegates/gpu/cl/cl_context.h" +diff --git a/tensorflow/lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc b/tensorflow/lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc +index 03909221f99..ffcf1fb2cdf 100644 +--- a/tensorflow/lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc ++++ b/tensorflow/lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc +@@ -18,6 +18,7 @@ limitations under the License. + #include + #include + ++#include "absl/strings/str_cat.h" + #include "absl/strings/string_view.h" + + namespace tflite { +diff --git a/tensorflow/lite/delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc b/tensorflow/lite/delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc +index 03fd1292827..923aaf53efa 100644 +--- a/tensorflow/lite/delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc ++++ b/tensorflow/lite/delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc +@@ -24,6 +24,7 @@ limitations under the License. + #include + #include + ++#include "absl/strings/str_cat.h" + #include "absl/strings/str_replace.h" + #include "tensorflow/lite/delegates/gpu/common/flops_util.h" + #include "tensorflow/lite/delegates/gpu/common/model.h" +diff --git a/tensorflow/lite/delegates/utils/experimental/stable_delegate/BUILD b/tensorflow/lite/delegates/utils/experimental/stable_delegate/BUILD +index cadf44ecef9..f038e55723f 100644 +--- a/tensorflow/lite/delegates/utils/experimental/stable_delegate/BUILD ++++ b/tensorflow/lite/delegates/utils/experimental/stable_delegate/BUILD +@@ -34,6 +34,7 @@ cc_library_with_tflite( + deps = [ + "//tensorflow/lite/experimental/acceleration/compatibility:android_info", + "//tensorflow/lite/tools:logging", ++ "@com_google_absl//absl/strings", + ], + ) + +diff --git a/tensorflow/lite/delegates/utils/experimental/stable_delegate/delegate_loader.cc b/tensorflow/lite/delegates/utils/experimental/stable_delegate/delegate_loader.cc +index abf89f71b3f..3ed11550aae 100644 +--- a/tensorflow/lite/delegates/utils/experimental/stable_delegate/delegate_loader.cc ++++ b/tensorflow/lite/delegates/utils/experimental/stable_delegate/delegate_loader.cc +@@ -21,6 +21,8 @@ limitations under the License. + #include + #include + ++#include "absl/strings/numbers.h" ++#include "tensorflow/lite/acceleration/configuration/c/stable_delegate.h" + #include "tensorflow/lite/experimental/acceleration/compatibility/android_info.h" + #include "tensorflow/lite/tools/logging.h" + +diff --git a/tensorflow/python/framework/BUILD b/tensorflow/python/framework/BUILD +index 9bfb9d2d9dd..fb30987bfd8 100644 +--- a/tensorflow/python/framework/BUILD ++++ b/tensorflow/python/framework/BUILD +@@ -1094,6 +1094,7 @@ tf_python_pybind_extension( + "//tensorflow/python/util:function_parameter_canonicalizer_hdrs", + "//third_party/python_runtime:headers", # buildcleaner: keep + "@com_google_absl//absl/container:flat_hash_map", ++ "@com_google_absl//absl/strings", + "@pybind11", + ], + ) +diff --git a/tensorflow/python/framework/python_api_dispatcher_wrapper.cc b/tensorflow/python/framework/python_api_dispatcher_wrapper.cc +index d3f688578a7..f6ae3df3d23 100644 +--- a/tensorflow/python/framework/python_api_dispatcher_wrapper.cc ++++ b/tensorflow/python/framework/python_api_dispatcher_wrapper.cc +@@ -14,6 +14,7 @@ limitations under the License. + ==============================================================================*/ + // Python bindings for tensorflow/python/framework/python_api_dispatcher.h. + ++#include "absl/strings/str_cat.h" + #include "pybind11/pybind11.h" // from @pybind11 + #include "pybind11/pytypes.h" // from @pybind11 + #include "pybind11/stl.h" // from @pybind11 +diff --git a/tensorflow/python/util/BUILD b/tensorflow/python/util/BUILD +index d1e7d626a1d..ae257943ce7 100644 +--- a/tensorflow/python/util/BUILD ++++ b/tensorflow/python/util/BUILD +@@ -483,6 +483,7 @@ cc_library( + "//tensorflow/python/lib/core:safe_pyobject_ptr", + "//third_party/python_runtime:headers", # buildcleaner: keep + "@com_google_absl//absl/container:flat_hash_set", ++ "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:span", + ], + ) +diff --git a/tensorflow/python/util/function_parameter_canonicalizer.cc b/tensorflow/python/util/function_parameter_canonicalizer.cc +index 6afd6d79910..d9769242cff 100644 +--- a/tensorflow/python/util/function_parameter_canonicalizer.cc ++++ b/tensorflow/python/util/function_parameter_canonicalizer.cc +@@ -16,6 +16,7 @@ limitations under the License. + #include "tensorflow/python/util/function_parameter_canonicalizer.h" + + #include "absl/container/flat_hash_set.h" ++#include "absl/strings/str_cat.h" + #include "tensorflow/core/platform/logging.h" + #include "tensorflow/core/platform/macros.h" + #include "tensorflow/python/lib/core/py_util.h" +diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc b/third_party/xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc +index 2d67789d8a0..6eb431c97fc 100644 +--- a/third_party/xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc ++++ b/third_party/xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc +@@ -12,6 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ==============================================================================*/ ++#include "absl/status/status.h" ++#include "absl/status/statusor.h" ++#include "absl/strings/str_cat.h" + #include "tsl/platform/default/dso_loader.h" + #include "tsl/platform/errors.h" + #include "tsl/platform/logging.h" +diff --git a/third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD b/third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD +index 0c3e736a915..3b3cc94c865 100644 +--- a/third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD ++++ b/third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD +@@ -190,7 +190,6 @@ cc_library( + deps = [ + "//tsl/platform:types", + "@com_google_absl//absl/strings", +- "@com_google_absl//absl/types:optional", + ], + ) + +diff --git a/third_party/xla/third_party/tsl/tsl/profiler/utils/trace_utils.h b/third_party/xla/third_party/tsl/tsl/profiler/utils/trace_utils.h +index d2580982122..034a634a6f6 100644 +--- a/third_party/xla/third_party/tsl/tsl/profiler/utils/trace_utils.h ++++ b/third_party/xla/third_party/tsl/tsl/profiler/utils/trace_utils.h +@@ -18,6 +18,7 @@ limitations under the License. + + #include + ++#include "absl/strings/numbers.h" + #include "absl/strings/string_view.h" + #include "tsl/platform/types.h" + +diff --git a/third_party/xla/xla/backends/profiler/gpu/cupti_collector.h b/third_party/xla/xla/backends/profiler/gpu/cupti_collector.h +index 8af5927269d..ee788fd5fbd 100644 +--- a/third_party/xla/xla/backends/profiler/gpu/cupti_collector.h ++++ b/third_party/xla/xla/backends/profiler/gpu/cupti_collector.h +@@ -21,6 +21,7 @@ limitations under the License. + #include "absl/container/fixed_array.h" + #include "absl/container/flat_hash_map.h" + #include "absl/container/node_hash_set.h" ++#include "absl/strings/str_cat.h" + #include "absl/strings/string_view.h" + #include "tsl/platform/macros.h" + #include "tsl/platform/status.h" +diff --git a/third_party/xla/xla/runtime/BUILD b/third_party/xla/xla/runtime/BUILD +index 92a0319568e..959af04f52a 100644 +--- a/third_party/xla/xla/runtime/BUILD ++++ b/third_party/xla/xla/runtime/BUILD +@@ -83,6 +83,7 @@ cc_library( + deps = [ + "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", ++ "@com_google_absl//absl/strings", + "@llvm-project//llvm:Support", + ], + ) +diff --git a/third_party/xla/xla/runtime/constraints.cc b/third_party/xla/xla/runtime/constraints.cc +index 5086d25a31b..d93ee193585 100644 +--- a/third_party/xla/xla/runtime/constraints.cc ++++ b/third_party/xla/xla/runtime/constraints.cc +@@ -17,10 +17,10 @@ limitations under the License. + + #include + #include +-#include + + #include "absl/status/status.h" + #include "absl/status/statusor.h" ++#include "absl/strings/str_cat.h" + + namespace xla { + namespace runtime { +diff --git a/third_party/xla/xla/service/cpu/runtime/BUILD b/third_party/xla/xla/service/cpu/runtime/BUILD +index 98c26d28448..830216b56a9 100644 +--- a/third_party/xla/xla/service/cpu/runtime/BUILD ++++ b/third_party/xla/xla/service/cpu/runtime/BUILD +@@ -142,6 +142,7 @@ cc_library( + "//xla:executable_run_options", + "//xla/runtime:memref_view", + "@com_google_absl//absl/status", ++ "@com_google_absl//absl/strings", + ], + ) + +diff --git a/third_party/xla/xla/service/cpu/runtime/rng.cc b/third_party/xla/xla/service/cpu/runtime/rng.cc +index a1cc6c046d2..5db2ec0a629 100644 +--- a/third_party/xla/xla/service/cpu/runtime/rng.cc ++++ b/third_party/xla/xla/service/cpu/runtime/rng.cc +@@ -18,6 +18,7 @@ + #include + + #include "absl/status/status.h" ++#include "absl/strings/str_cat.h" + #include "xla/executable_run_options.h" + + namespace xla { +diff --git a/third_party/xla/xla/stream_executor/dnn.h b/third_party/xla/xla/stream_executor/dnn.h +index 3561a1ffd4f..e0b50813196 100644 +--- a/third_party/xla/xla/stream_executor/dnn.h ++++ b/third_party/xla/xla/stream_executor/dnn.h +@@ -36,6 +36,9 @@ limitations under the License. + + #include "google/protobuf/wrappers.pb.h" + #include "absl/types/optional.h" ++#include "absl/status/status.h" ++#include "absl/status/statusor.h" ++#include "absl/strings/str_cat.h" + #include "absl/types/span.h" + #include "xla/stream_executor/data_type.h" + #include "xla/stream_executor/device_description.h" +-- +2.34.1 + From 5dcbdb16b60bfadcd93779b3cd99409e0b4e0c57 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 14:59:37 -0500 Subject: [PATCH 04/48] Add patch for absl log --- recipe/meta.yaml | 1 + ...absl_log_flags-instead-of-absl_flags.patch | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipe/patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4bb7dd5c..672c709c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,6 +32,7 @@ source: # https://github.com/tensorflow/tensorflow/pull/62684 - patches/62684.patch - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch + - patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.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/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch new file mode 100644 index 00000000..d864ab21 --- /dev/null +++ b/recipe/patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -0,0 +1,53 @@ +From 9c0871526e681c03e28eaed1e5c99aa7aee43e49 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Mon, 26 Feb 2024 22:30:08 -0500 +Subject: [PATCH] Link to absl_log_flags instead of absl_flags + +--- + third_party/absl/system.absl.flags.BUILD | 2 +- + third_party/xla/third_party/absl/system.absl.flags.BUILD | 2 +- + .../third_party/tsl/third_party/absl/system.absl.flags.BUILD | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/third_party/absl/system.absl.flags.BUILD b/third_party/absl/system.absl.flags.BUILD +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( + + cc_library( + name = "flag", +- linkopts = ["-labsl_flags"], ++ linkopts = ["-labsl_log_flags"], + deps = [ + ":config", + ":flag_internal", +diff --git a/third_party/xla/third_party/absl/system.absl.flags.BUILD b/third_party/xla/third_party/absl/system.absl.flags.BUILD +index aff653c7e5b..ee2e1bfe5e3 100644 +--- a/third_party/xla/third_party/absl/system.absl.flags.BUILD ++++ b/third_party/xla/third_party/absl/system.absl.flags.BUILD +@@ -97,7 +97,7 @@ cc_library( + + cc_library( + name = "flag", +- linkopts = ["-labsl_flags"], ++ linkopts = ["-labsl_log_flags"], + deps = [ + ":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 +--- 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( + + cc_library( + name = "flag", +- linkopts = ["-labsl_flags"], ++ linkopts = ["-labsl_log_flags"], + deps = [ + ":config", + ":flag_internal", +-- +2.34.1 + From a4d523dfb20905a907d2301d2f32253a4ba7a619 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:02:28 -0500 Subject: [PATCH 05/48] Add patch for ABSL Log linking --- recipe/meta.yaml | 1 + ...Definition-for-libabsl_vlog_config_i.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 recipe/patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 672c709c..4077ed18 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,6 +33,7 @@ source: - patches/62684.patch - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch - patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch + - patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.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/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch new file mode 100644 index 00000000..524f2b48 --- /dev/null +++ b/recipe/patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -0,0 +1,33 @@ +From 9b8306ca589c850b2cb54d9c4c2285b309ec13ab Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Tue, 27 Feb 2024 18:01:19 -0500 +Subject: [PATCH] Update ABSL Log Definition for + libabsl_vlog_config_internal.so + +--- + third_party/absl/system.absl.log.BUILD | 2 ++ + 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 +--- 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"]) + cc_library( + name = "log", + linkopts = [ ++ "-labsl_vlog_config_internal", + "-labsl_log_internal_conditions", + "-labsl_log_internal_check_op", + "-labsl_log_internal_message", +@@ -15,6 +16,7 @@ cc_library( + cc_library( + name = "check", + linkopts = [ ++ "-labsl_vlog_config_internal", + "-labsl_log_internal_check_op", + "-labsl_log_internal_message", + "-labsl_log_internal_nullguard", +-- +2.34.1 + From 50904e299c32a10a005b45d41c23da6786df43a1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 10 Mar 2024 15:58:06 +0000 Subject: [PATCH 06/48] Rebuild for flatbuffers 24.3.7 --- .ci_support/migrations/flatbuffers2437.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .ci_support/migrations/flatbuffers2437.yaml diff --git a/.ci_support/migrations/flatbuffers2437.yaml b/.ci_support/migrations/flatbuffers2437.yaml new file mode 100644 index 00000000..b149f4f0 --- /dev/null +++ b/.ci_support/migrations/flatbuffers2437.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for flatbuffers 24.3.7 + kind: version + migration_number: 1 +flatbuffers: +- 24.3.7 +migrator_ts: 1710070499.8910387 From c80c7655d2dc03f5d5773324fdc260fce5b406f3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 10 Mar 2024 13:08:30 -0400 Subject: [PATCH 07/48] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.10.12.43.11 --- ...xx_compiler_version12numpy1.22python3.10.____cpython.yaml | 4 ++-- ...cxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 4 ++-- ...xx_compiler_version12numpy1.23python3.11.____cpython.yaml | 4 ++-- ...xx_compiler_version12numpy1.22python3.10.____cpython.yaml | 4 ++-- ...cxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 4 ++-- ...xx_compiler_version12numpy1.23python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 2 +- .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 2 +- .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 2 +- .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- build-locally.py | 5 +++-- 15 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 6fe980aa..e4e50b2c 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: @@ -65,9 +65,9 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml index b0544c73..1818615a 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: @@ -65,9 +65,9 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml index cb994a9b..e286dc68 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: @@ -65,9 +65,9 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index b497f6df..46dc5283 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: @@ -65,9 +65,9 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 018cd627..a42a5eba 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: @@ -65,9 +65,9 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 7c76a960..794499da 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -21,7 +21,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: @@ -65,9 +65,9 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image - - libgrpc - libprotobuf diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 40b0d704..319998f8 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 282ce9d8..90826366 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 930679b5..395b1091 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index c8f3e2c7..564147c9 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index f2a219f5..ee89b328 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index d1fc28f0..32aa8184 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.7 giflib: - '5.2' icu: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 3612f05e..3d417bd3 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC 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 + 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 + 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}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index c09db846..f37dca58 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ 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 + 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 + pip mamba conda-build conda-libmamba-solver conda-forge-ci-setup=4 "conda-build>=24.1" diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From fed8701b9631f50c4e52b36092b97ebb4b43ba49 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 8 Mar 2024 10:59:06 +0000 Subject: [PATCH 08/48] Rebuild for libprotobuf 4.25.3 --- .../libgrpc162_libprotobuf4253.yaml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .ci_support/migrations/libgrpc162_libprotobuf4253.yaml diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml new file mode 100644 index 00000000..16b401a5 --- /dev/null +++ b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml @@ -0,0 +1,23 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libprotobuf 4.25.3 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + - protobuf +libgrpc: +- "1.62" +libprotobuf: +- 4.25.3 +# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252; +# this ensures that this migration applies also without the previous one +libabseil: +- "20240116" +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1709522594.9193177 From b3d7faa61d183d50991a251454394592469fd230 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 10 Mar 2024 13:20:38 -0400 Subject: [PATCH 09/48] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and conda-forge-pinning 2024.03.10.12.43.11 --- ...cxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 4 ++-- ...0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 4 ++-- ...cxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 4 ++-- ...cxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 4 ++-- ...ecxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 4 ++-- ...cxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml index e4e50b2c..3449562c 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -31,13 +31,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 1818615a..7e98adc7 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -31,13 +31,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml index e286dc68..63826b75 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -31,13 +31,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 46dc5283..185c82d3 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -31,13 +31,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index a42a5eba..2f717c4f 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -31,13 +31,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 nccl: - '2' numpy: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index 794499da..970ed377 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -31,13 +31,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 nccl: - '2' numpy: diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 319998f8..46c7a4aa 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -27,13 +27,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 90826366..9650e54e 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -27,13 +27,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 395b1091..dac128d8 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -27,13 +27,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 564147c9..10a6581e 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -25,13 +25,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index ee89b328..12a4efa0 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -25,13 +25,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 32aa8184..5950e625 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -25,13 +25,13 @@ libabseil: libcurl: - '8' libgrpc: -- '1.61' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.25.2 +- 4.25.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: From c7b3a7ffbbf94c6be39b8b8d158ac1e4df1a2a3c Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 05:40:08 -0400 Subject: [PATCH 10/48] Update to 2.16.1 badly --- recipe/meta.yaml | 7 +++---- recipe/patches/62684.patch | 22 ---------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 recipe/patches/62684.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4077ed18..1d05b6ef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.15.0" %} +{% set version = "2.16.1" %} {% set estimator_version = "2.15.0" %} package: @@ -7,7 +7,7 @@ package: source: - url: https://github.com/tensorflow/tensorflow/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz - sha256: 9cec5acb0ecf2d47b16891f8bc5bc6fbfdffe1700bdadc0d9ebe27ea34f0c220 + sha256: c729e56efc945c6df08efe5c9f5b8b89329c7c91b8f40ad2bb3e13900bd4876d patches: - patches/0001-loosen-requirements.patch - patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch @@ -29,8 +29,6 @@ source: - patches/0018-Use-PYTHON-for-build-wheel.patch - patches/0019-Always-use-Linux-sed-style.patch - patches/0020-Adjust-relative-path-for-libdevice.patch # [(cuda_compiler_version or "").startswith("12")] - # https://github.com/tensorflow/tensorflow/pull/62684 - - patches/62684.patch - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch - patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch - patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -38,6 +36,7 @@ source: sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530 folder: tensorflow-estimator # yes, the headers come from a different version than the python package required below. + # TODO: Check that these are still up to date - url: https://raw.githubusercontent.com/jax-ml/ml_dtypes/v0.3.1/ml_dtypes/include/float8.h fn: float8.h sha256: d2798fad4e64375b566b1df1d7bc440313e4b1024ca08f12cead3eaa4b73ff72 diff --git a/recipe/patches/62684.patch b/recipe/patches/62684.patch deleted file mode 100644 index 65a63878..00000000 --- a/recipe/patches/62684.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6712dade3b6ddd4881b5b7fd2150cf09eee40786 Mon Sep 17 00:00:00 2001 -From: Jinzhe Zeng -Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH] Fix protobuf errors when using system protobuf - ---- - tensorflow/api_template.__init__.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tensorflow/api_template.__init__.py b/tensorflow/api_template.__init__.py -index 1ccf2fe07f0af..1573f5131bc9f 100644 ---- a/tensorflow/api_template.__init__.py -+++ b/tensorflow/api_template.__init__.py -@@ -35,6 +35,8 @@ - import sys as _sys - import typing as _typing - -+# Do not remove this line; See https://github.com/tensorflow/tensorflow/issues/42596 -+from tensorflow.python import pywrap_tensorflow # pylint: disable=unused-import - from tensorflow.python.tools import module_util as _module_util - from tensorflow.python.util.lazy_loader import LazyLoader as _LazyLoader - from tensorflow.python.util.lazy_loader import KerasLazyLoader as _KerasLazyLoader From 9987c74fe0e64ac5efe1c76ca4e83987c6799ade Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:29:11 -0400 Subject: [PATCH 11/48] Update a few patches --- recipe/meta.yaml | 45 +-- recipe/patches/0001-Loosen-requirements.patch | 44 +++ recipe/patches/0001-loosen-requirements.patch | 35 -- ...absl_synchronization-linkage-to-gRPC.patch | 5 +- ...-any_invocable-target-to-absel-bazel.patch | 21 -- ...=> 0003-Fix-missing-abseil-linkages.patch} | 7 +- ...atch => 0004-Add-absl_log-systemlib.patch} | 9 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 11 +- ...ayout_proto_cc-if-protobuf-linkage-.patch} | 11 +- ... => 0007-Fix-further-abseil-linkage.patch} | 7 +- ...dd-constraint-to-pybind11-systemlib.patch} | 7 +- ...file-ending-for-flatbuffers-LICENSE.patch} | 7 +- ...=> 0010-Use-correct-hermetic-python.patch} | 9 +- ..._types_py_pb2-to-protobuf-systemlib.patch} | 7 +- ...atch => 0012-Add-protobuf-toolchain.patch} | 7 +- ...genproto.patch => 0013-fix-genproto.patch} | 9 +- ...me-usage-of-absl-str_format-in-CUDA.patch} | 9 +- ...ype-to-make-constructor-unambiguous.patch} | 7 +- ... => 0016-Use-PYTHON-for-build-wheel.patch} | 11 +- ... => 0017-Always-use-linux-sed-style.patch} | 18 +- .../0017-Load-cuda_build_defs-from-tsl.patch | 21 -- ...-Adjust-relative-path-for-libdevice.patch} | 8 +- ...019-Update-flatbuffers-static-assert.patch | 29 ++ ...udes-needed-for-Abseil-lts_2024_01_1.patch | 346 ------------------ ...absl_log_flags-instead-of-absl_flags.patch | 53 --- ...Definition-for-libabsl_vlog_config_i.patch | 33 -- 26 files changed, 195 insertions(+), 581 deletions(-) create mode 100644 recipe/patches/0001-Loosen-requirements.patch delete mode 100644 recipe/patches/0001-loosen-requirements.patch delete mode 100644 recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch rename recipe/patches/{0004-Fix-missing-abseil-linkages.patch => 0003-Fix-missing-abseil-linkages.patch} (84%) rename recipe/patches/{0006-Add-absl_log-systemlib.patch => 0004-Add-absl_log-systemlib.patch} (89%) rename recipe/patches/{0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch => 0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch} (74%) rename recipe/patches/{0008-Fix-further-abseil-linkage.patch => 0007-Fix-further-abseil-linkage.patch} (89%) rename recipe/patches/{0009-Add-constraint-to-pybind11-systemlib.patch => 0008-Add-constraint-to-pybind11-systemlib.patch} (81%) rename recipe/patches/{0010-Different-file-ending-for-flatbuffers-LICENSE.patch => 0009-Different-file-ending-for-flatbuffers-LICENSE.patch} (82%) rename recipe/patches/{0011-Use-correct-hermetic-python.patch => 0010-Use-correct-hermetic-python.patch} (90%) rename recipe/patches/{0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch => 0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch} (84%) rename recipe/patches/{0013-Add-protobuf-toolchain.patch => 0012-Add-protobuf-toolchain.patch} (89%) rename recipe/patches/{0014-fix-genproto.patch => 0013-fix-genproto.patch} (86%) rename recipe/patches/{0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch => 0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch} (93%) rename recipe/patches/{0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch => 0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch} (93%) rename recipe/patches/{0018-Use-PYTHON-for-build-wheel.patch => 0016-Use-PYTHON-for-build-wheel.patch} (81%) rename recipe/patches/{0019-Always-use-Linux-sed-style.patch => 0017-Always-use-linux-sed-style.patch} (77%) delete mode 100644 recipe/patches/0017-Load-cuda_build_defs-from-tsl.patch rename recipe/patches/{0020-Adjust-relative-path-for-libdevice.patch => 0018-Adjust-relative-path-for-libdevice.patch} (87%) create mode 100644 recipe/patches/0019-Update-flatbuffers-static-assert.patch delete mode 100644 recipe/patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch delete mode 100644 recipe/patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch delete mode 100644 recipe/patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1d05b6ef..d8b2cb11 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,29 +9,30 @@ source: - url: https://github.com/tensorflow/tensorflow/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz sha256: c729e56efc945c6df08efe5c9f5b8b89329c7c91b8f40ad2bb3e13900bd4876d patches: - - patches/0001-loosen-requirements.patch + - patches/0001-Loosen-requirements.patch - patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch - - patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch - - patches/0004-Fix-missing-abseil-linkages.patch + - patches/0003-Fix-missing-abseil-linkages.patch + - patches/0004-Add-absl_log-systemlib.patch - patches/0005-Fix-protobuf_python-for-systemlibs.patch - - patches/0006-Add-absl_log-systemlib.patch - - patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch - - patches/0008-Fix-further-abseil-linkage.patch - - patches/0009-Add-constraint-to-pybind11-systemlib.patch - - patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch - - patches/0011-Use-correct-hermetic-python.patch - - patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch - - patches/0013-Add-protobuf-toolchain.patch - - patches/0014-fix-genproto.patch - - patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch # [(cuda_compiler_version or "").startswith("11")] - - patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch - - patches/0017-Load-cuda_build_defs-from-tsl.patch - - patches/0018-Use-PYTHON-for-build-wheel.patch - - patches/0019-Always-use-Linux-sed-style.patch - - patches/0020-Adjust-relative-path-for-libdevice.patch # [(cuda_compiler_version or "").startswith("12")] - - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch - - patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch - - patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch + - patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch + - patches/0007-Fix-further-abseil-linkage.patch + - patches/0008-Add-constraint-to-pybind11-systemlib.patch + - patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch + - patches/0010-Use-correct-hermetic-python.patch + - patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch + - patches/0012-Add-protobuf-toolchain.patch + - patches/0013-fix-genproto.patch + - patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch + - patches/0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch + - patches/0016-Use-PYTHON-for-build-wheel.patch + - patches/0017-Always-use-linux-sed-style.patch + - patches/0018-Adjust-relative-path-for-libdevice.patch + - patches/0019-Update-flatbuffers-static-assert.patch + + # Not ported yet + # - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch + # - patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch + # - patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530 folder: tensorflow-estimator @@ -45,7 +46,7 @@ source: sha256: b3a9970c3c6b169c41ac2fd4375f668d3fd1b492d48b912d89415fa1522a8f50 build: - number: 4 + number: 0 skip: true # [win] skip: true # [python_impl == 'pypy'] skip: true # [py<39] diff --git a/recipe/patches/0001-Loosen-requirements.patch b/recipe/patches/0001-Loosen-requirements.patch new file mode 100644 index 00000000..a69aed2e --- /dev/null +++ b/recipe/patches/0001-Loosen-requirements.patch @@ -0,0 +1,44 @@ +From 145412013241e6db9a997c84405cef7a504e1403 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Wed, 13 Mar 2024 05:59:48 -0400 +Subject: [PATCH 01/19] Loosen requirements + +* Remove unused libclang requirement +* Remove unecessary tensorflow-io-gcs-filesystem +* unpin numpy + +Originally by: Uwe L. Korn +Co-authored-by: Mark Harfouche +Co-authored-by: ngam +--- + 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 cdec9d3a..9c563514 100644 +--- a/tensorflow/tools/pip_package/setup.py ++++ b/tensorflow/tools/pip_package/setup.py +@@ -89,11 +89,7 @@ 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', +- # 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 +@@ -106,8 +102,6 @@ REQUIRED_PACKAGES = [ + 'termcolor >= 1.1.0', + 'typing_extensions >= 3.6.6', + 'wrapt >= 1.11.0', +- # TODO(b/305196096): Remove the <3.12 condition once the pkg is updated +- 'tensorflow-io-gcs-filesystem >= 0.23.1 ; python_version < "3.12"', + # grpcio does not build correctly on big-endian machines due to lack of + # BoringSSL support. + # See https://github.com/tensorflow/tensorflow/issues/17882. +-- +2.43.2 + diff --git a/recipe/patches/0001-loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch deleted file mode 100644 index 662e5a63..00000000 --- a/recipe/patches/0001-loosen-requirements.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9a99881552b7271bb6024d00488752f41fa7ee34 Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/19] loosen requirements - -* Remove unused libclang requirement -* Remove unecessary tensorflow-io-gcs-filesystem -* unpin numpy - -Co-authored-by: Mark Harfouche -Co-authored-by: ngam ---- - 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 b4167313..d3ff1146 100644 ---- a/tensorflow/tools/pip_package/setup.py -+++ b/tensorflow/tools/pip_package/setup.py -@@ -88,7 +88,6 @@ REQUIRED_PACKAGES = [ - 'gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2', - 'google_pasta >= 0.1.1', - 'h5py >= 2.9.0', -- 'libclang >= 13.0.0', - 'ml_dtypes ~= 0.2.0', - 'numpy >= 1.23.5, < 2.0.0', - 'opt_einsum >= 2.3.2', -@@ -102,7 +101,6 @@ REQUIRED_PACKAGES = [ - 'termcolor >= 1.1.0', - 'typing_extensions >= 3.6.6', - 'wrapt >= 1.11.0, < 1.15', -- 'tensorflow-io-gcs-filesystem >= 0.23.1', - # grpcio does not build correctly on big-endian machines due to lack of - # BoringSSL support. - # See https://github.com/tensorflow/tensorflow/issues/17882. 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 73c917d1..07e78590 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 2303b70a02dd11e69976599c420dfe86bc7b32f7 Mon Sep 17 00:00:00 2001 +From c845600afd2bbf99c800163ece9e2f0d015dbb14 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 Subject: [PATCH 02/19] Add additional absl_synchronization linkage to gRPC @@ -35,3 +35,6 @@ index 8b703f11..417baf5d 100644 ], visibility = ["//visibility:public"], ) +-- +2.43.2 + diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch deleted file mode 100644 index 70c01c07..00000000 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9b0191e568cea7c2a008b42a60eb19487f54038e Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/19] Add missing any_invocable target to absel bazel - ---- - third_party/absl/system.absl.functional.BUILD | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/third_party/absl/system.absl.functional.BUILD b/third_party/absl/system.absl.functional.BUILD -index a4f70acf..f05aa98d 100644 ---- a/third_party/absl/system.absl.functional.BUILD -+++ b/third_party/absl/system.absl.functional.BUILD -@@ -9,3 +9,7 @@ cc_library( - cc_library( - name = "function_ref", - ) -+ -+cc_library( -+ name = "any_invocable", -+) diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0003-Fix-missing-abseil-linkages.patch similarity index 84% rename from recipe/patches/0004-Fix-missing-abseil-linkages.patch rename to recipe/patches/0003-Fix-missing-abseil-linkages.patch index 7f3c0c1b..4437cda7 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0003-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ -From 186a393177328aa80be37b4c4b5ffd63ad89c51b Mon Sep 17 00:00:00 2001 +From 14fc99f6e0e91dcf7424d7193ee19ddf4621f987 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/19] Fix missing abseil linkages +Subject: [PATCH 03/19] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- @@ -20,3 +20,6 @@ index fa9a7a84..d04776c9 100644 deps = [ ":str_format", "//absl/container:compressed_tuple", +-- +2.43.2 + diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0004-Add-absl_log-systemlib.patch similarity index 89% rename from recipe/patches/0006-Add-absl_log-systemlib.patch rename to recipe/patches/0004-Add-absl_log-systemlib.patch index 50f45ba9..57c67aac 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0004-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ -From 12590977bfcd91d7be12314ef3f0505284d6f25d Mon Sep 17 00:00:00 2001 +From ed9d9b4ac2c151a73c602566e136db65fab50a3c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/19] Add absl_log systemlib +Subject: [PATCH 04/19] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ @@ -38,7 +38,7 @@ index 00000000..0248bda0 + ], +) diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl -index 07f49ceb..a7f4e5ff 100644 +index 06f75166..c54df3cf 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -20,6 +20,7 @@ def repo(): @@ -49,3 +49,6 @@ index 07f49ceb..a7f4e5ff 100644 "memory", "meta", "numeric", +-- +2.43.2 + diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index 1d5dc9b6..4d4b47f3 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,4 +1,4 @@ -From 35ac91ebaf60bad15a9c295bc7023a643b97dd07 Mon Sep 17 00:00:00 2001 +From 88f98abdd9214170e7f690ed045a17504cf4c8d1 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 Subject: [PATCH 05/19] Fix protobuf_python for systemlibs @@ -12,10 +12,10 @@ Subject: [PATCH 05/19] 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 8601192e..fe422018 100644 +index 9e15c75c..6ca2f04b 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl -@@ -373,6 +373,7 @@ def _tf_repositories(): +@@ -382,6 +382,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 8601192e..fe422018 100644 }, urls = tf_mirror_urls("https://github.com/protocolbuffers/protobuf/archive/v3.21.9.zip"), ) -@@ -776,10 +777,10 @@ def _tf_repositories(): +@@ -786,10 +787,10 @@ def _tf_repositories(): tf_http_archive( name = "pybind11_protobuf", @@ -81,3 +81,6 @@ index 00000000..982617a7 + # hdrs = ["google/protobuf/proto_api.h"], + visibility = ["//visibility:public"], +) +-- +2.43.2 + diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch similarity index 74% rename from recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch rename to recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 5a3e0711..d41d3040 100644 --- a/recipe/patches/0007-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 d5decb66a3a3dc8f11cb77aad83b4aa65e2819e6 Mon Sep 17 00:00:00 2001 +From 8d97f81ec6a02f83b5827a2c6a47383e688078df Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/19] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 06/19] Omit linking to layout_proto_cc if protobuf linkage is shared --- @@ -9,10 +9,10 @@ Subject: [PATCH 07/19] 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 9810f8ac..c7feacb6 100644 +index 675709d4..4c713a93 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD -@@ -1330,7 +1330,6 @@ tf_python_pybind_extension( +@@ -1358,7 +1358,6 @@ tf_python_pybind_extension( features = ["-layering_check"], deps = [ ":pywrap_densor_device_headers", @@ -20,3 +20,6 @@ index 9810f8ac..c7feacb6 100644 "//tensorflow/python/lib/core:pybind11_lib", "//tensorflow/python/lib/core:pybind11_status_headers", "//third_party/python_runtime:headers", # buildcleaner: keep +-- +2.43.2 + diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0007-Fix-further-abseil-linkage.patch similarity index 89% rename from recipe/patches/0008-Fix-further-abseil-linkage.patch rename to recipe/patches/0007-Fix-further-abseil-linkage.patch index 71867a5c..f8b53485 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0007-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ -From 8008a891470fbe61654b955a38a353fcf7477a7c Mon Sep 17 00:00:00 2001 +From 6bca4b3f29f14825628071d8e150edbc601c7da1 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/19] Fix further abseil linkage +Subject: [PATCH 07/19] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- @@ -36,3 +36,6 @@ index d6bf8748..b3e42f4d 100644 visibility = [ "//absl:__subpackages__", ], +-- +2.43.2 + diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch similarity index 81% rename from recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch rename to recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch index 06dbf0a7..a6ff081e 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ -From 6bf76958a61fddb43cb6f886a59b6cbdb1437aa6 Mon Sep 17 00:00:00 2001 +From d48e2727b92611b792b7db68cc3d07284a9d15be Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/19] Add constraint to pybind11 systemlib +Subject: [PATCH 08/19] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ @@ -21,3 +21,6 @@ index 79a483d7..463dd1a8 100644 + name = "osx", + constraint_values = ["@platforms//os:osx"], +) +-- +2.43.2 + diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch similarity index 82% rename from recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch rename to recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch index 1b2c766d..a2a82cbc 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ -From a0c95bfc18bbb4e49fc6e32ab98b577fef9e5605 Mon Sep 17 00:00:00 2001 +From a2282b6494f4470d0e1836b26eddf7cc8493ef15 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/19] Different file ending for flatbuffers LICENSE +Subject: [PATCH 09/19] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ @@ -23,3 +23,6 @@ index 8fe4d7a5..297f8baf 100644 # Public flatc library to compile flatbuffer files at runtime. cc_library( name = "flatbuffers", +-- +2.43.2 + diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0010-Use-correct-hermetic-python.patch similarity index 90% rename from recipe/patches/0011-Use-correct-hermetic-python.patch rename to recipe/patches/0010-Use-correct-hermetic-python.patch index 9c04a2d1..d52d567f 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0010-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ -From 97c9899270de51fbc6a5f541164291481645b22e Mon Sep 17 00:00:00 2001 +From 3efda1bed69b12589cd5ae7869a13eb8e37fd7bf Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/19] Use correct, hermetic python +Subject: [PATCH 10/19] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ @@ -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 c856e8a6..ce1ec4bf 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,3 +37,6 @@ index c856e8a6..ce1ec4bf 100644 from tensorflow.python.tools.api.generator import doc_srcs from tensorflow.python.util import tf_decorator +-- +2.43.2 + diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch similarity index 84% rename from recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch rename to recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index 83e400b7..b2564f7e 100644 --- a/recipe/patches/0012-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,7 +1,7 @@ -From bd0adad748c9cfa883399df66a2264fc41289199 Mon Sep 17 00:00:00 2001 +From 317fd534645e377a9bbcc6c3dc78a3afc405f823 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/19] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 11/19] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ @@ -22,3 +22,6 @@ index 4d05ab28..b3d72b0e 100644 + srcs = [proto[1][0] for proto in WELL_KNOWN_PROTO_MAP.items()], + visibility = ["//visibility:public"], +) +-- +2.43.2 + diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0012-Add-protobuf-toolchain.patch similarity index 89% rename from recipe/patches/0013-Add-protobuf-toolchain.patch rename to recipe/patches/0012-Add-protobuf-toolchain.patch index 641e107b..860c26da 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0012-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ -From 418de6fd046cd447406110c928eb27577a0736de Mon Sep 17 00:00:00 2001 +From 3bd039141c155fc313673d4cdce7e084d0d07de6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/19] Add protobuf toolchain +Subject: [PATCH 12/19] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ @@ -38,3 +38,6 @@ index b3d72b0e..b122a753 100644 cc_library( name = "protoc_lib", linkopts = ["-lprotoc"], +-- +2.43.2 + diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0013-fix-genproto.patch similarity index 86% rename from recipe/patches/0014-fix-genproto.patch rename to recipe/patches/0013-fix-genproto.patch index 73e483aa..863b0f5c 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0013-fix-genproto.patch @@ -1,14 +1,14 @@ -From efdba95e47519e978d39f6906ea2185cff3fa060 Mon Sep 17 00:00:00 2001 +From ee1e5d6deefcab18f971310b13bd8b7d0eb865a9 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/19] fix genproto +Subject: [PATCH 13/19] 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 3fe7b206..b2fb5677 100644 +index c0826ed1..4f5fe02c 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( @@ -23,3 +23,6 @@ index 3fe7b206..b2fb5677 100644 proto_gen( name = name + "_genproto", +-- +2.43.2 + diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch similarity index 93% rename from recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch rename to recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch index 1e6d8a54..53ee87cb 100644 --- a/recipe/patches/0015-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 16f275bed08a13bfad3f7b3644e036959be983cf Mon Sep 17 00:00:00 2001 +From b963e6a865ef6de43f10678a3e132b8c005c509a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/19] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 14/19] 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 @@ -55,7 +55,7 @@ index 0f5ed556..b1adf718 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 80646bad..b47e8a73 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,3 +67,6 @@ index 80646bad..b47e8a73 100644 #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/kernels/gpu_utils.h" #include "tensorflow/core/lib/gtl/inlined_vector.h" +-- +2.43.2 + diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch similarity index 93% rename from recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch rename to recipe/patches/0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 6e64782f..be95c9e2 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ -From 661870ce07536134d415fa92911daca1efdb5c20 Mon Sep 17 00:00:00 2001 +From 292409c9c4a71eae535022396c9f6af74c4e475b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/19] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 15/19] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As @@ -48,3 +48,6 @@ index 84aeb00e..5e6abdfc 100644 link_files = { "//third_party/py/ml_dtypes:ml_dtypes.tests.BUILD": "tests/BUILD.bazel", "//third_party/py/ml_dtypes:LICENSE": "LICENSE", +-- +2.43.2 + diff --git a/recipe/patches/0018-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0016-Use-PYTHON-for-build-wheel.patch similarity index 81% rename from recipe/patches/0018-Use-PYTHON-for-build-wheel.patch rename to recipe/patches/0016-Use-PYTHON-for-build-wheel.patch index 7ccf702a..778ed804 100644 --- a/recipe/patches/0018-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0016-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ -From 57215882a5a6a3413c7d2ea5d33be38bd96ab5b2 Mon Sep 17 00:00:00 2001 +From 4976814888c435dfcf6ee74c4d8be9f4c2e954c8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 18/19] Use PYTHON for build wheel +Subject: [PATCH 16/19] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is @@ -11,10 +11,10 @@ not existing. Instead, point it to our Python installation. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh -index 423a79bf..ffac1e25 100755 +index ff21aadb..637faec0 100755 --- a/tensorflow/tools/pip_package/build_pip_package.sh +++ b/tensorflow/tools/pip_package/build_pip_package.sh -@@ -364,7 +364,7 @@ function build_wheel() { +@@ -352,7 +352,7 @@ function build_wheel() { rm -f MANIFEST echo $(date) : "=== Building wheel" @@ -23,3 +23,6 @@ index 423a79bf..ffac1e25 100755 mkdir -p ${DEST} cp dist/* ${DEST} popd > /dev/null +-- +2.43.2 + diff --git a/recipe/patches/0019-Always-use-Linux-sed-style.patch b/recipe/patches/0017-Always-use-linux-sed-style.patch similarity index 77% rename from recipe/patches/0019-Always-use-Linux-sed-style.patch rename to recipe/patches/0017-Always-use-linux-sed-style.patch index 89ac3247..81ba1516 100644 --- a/recipe/patches/0019-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0017-Always-use-linux-sed-style.patch @@ -1,17 +1,18 @@ -From 2be3883b2294cd63b14eada4cfaa5f0ab1a99e64 Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 19/19] Always use Linux-sed style +From 692f21acfe01c55abdc9f64c32a628b729ac29bb Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Wed, 13 Mar 2024 06:21:50 -0400 +Subject: [PATCH 17/19] Always use linux-sed style +Original patch by: "Uwe L. Korn" --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh -index ffac1e25..603f872a 100755 +index 637faec0..d9eec53b 100755 --- a/tensorflow/tools/pip_package/build_pip_package.sh +++ b/tensorflow/tools/pip_package/build_pip_package.sh -@@ -289,15 +289,9 @@ function prepare_src() { +@@ -278,15 +278,9 @@ function prepare_src() { cp -RLn bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/local_xla/xla ${TMPDIR}/tensorflow/compiler fi # Fix the proto stubs @@ -29,4 +30,7 @@ index ffac1e25..603f872a 100755 + find ${TMPDIR}/tensorflow/ -name "*.py" -type f -exec sed -i'' 's/from xla/from tensorflow.compiler.xla/' {} \; mkdir -p ${TMPDIR}/third_party - cp -R $RUNFILES/third_party/eigen3 ${TMPDIR}/third_party + cp -LR $RUNFILES/../local_config_cuda/cuda/_virtual_includes/cuda_headers_virtual/third_party/gpus ${TMPDIR}/third_party +-- +2.43.2 + diff --git a/recipe/patches/0017-Load-cuda_build_defs-from-tsl.patch b/recipe/patches/0017-Load-cuda_build_defs-from-tsl.patch deleted file mode 100644 index 1ae5ebc2..00000000 --- a/recipe/patches/0017-Load-cuda_build_defs-from-tsl.patch +++ /dev/null @@ -1,21 +0,0 @@ -From b78f2461196bbdfb9d9a5797a33341b365511bee Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Sat, 25 Nov 2023 20:47:12 +0100 -Subject: [PATCH 17/19] Load cuda_build_defs from tsl - ---- - third_party/nccl/system.BUILD.tpl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/third_party/nccl/system.BUILD.tpl b/third_party/nccl/system.BUILD.tpl -index 405d1e72..6e2a22a9 100644 ---- a/third_party/nccl/system.BUILD.tpl -+++ b/third_party/nccl/system.BUILD.tpl -@@ -1,6 +1,6 @@ - load("@bazel_skylib//rules:write_file.bzl", "write_file") - load( -- "@org_tensorflow//tensorflow/platform/default:cuda_build_defs.bzl", -+ "@local_tsl//tsl/platform/default:cuda_build_defs.bzl", - "cuda_rpath_flags" - ) - diff --git a/recipe/patches/0020-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0018-Adjust-relative-path-for-libdevice.patch similarity index 87% rename from recipe/patches/0020-Adjust-relative-path-for-libdevice.patch rename to recipe/patches/0018-Adjust-relative-path-for-libdevice.patch index 8a76e7fa..874de3d1 100644 --- a/recipe/patches/0020-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0018-Adjust-relative-path-for-libdevice.patch @@ -1,14 +1,14 @@ -From d0f71b5998edbd36ca0911f797f5f1fa34a67910 Mon Sep 17 00:00:00 2001 +From 271baae9836316af43b5698b1e42ecb84a081e32 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH] Adjust relative path for libdevice +Subject: [PATCH 18/19] 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 ed2ffece..271f3141 100644 +index ed2ffece..25ca9b9c 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() { @@ -21,5 +21,5 @@ index ed2ffece..271f3141 100644 } #endif // defined(PLATFORM_POSIX) && !defined(__APPLE__) -- -2.43.0 +2.43.2 diff --git a/recipe/patches/0019-Update-flatbuffers-static-assert.patch b/recipe/patches/0019-Update-flatbuffers-static-assert.patch new file mode 100644 index 00000000..e2b3aa72 --- /dev/null +++ b/recipe/patches/0019-Update-flatbuffers-static-assert.patch @@ -0,0 +1,29 @@ +From 02e68726417d00ca62895785071785444003e0cb Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Wed, 13 Mar 2024 06:24:35 -0400 +Subject: [PATCH 19/19] Update flatbuffers static assert + +--- + .../acceleration/configuration/configuration_generated.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tensorflow/lite/acceleration/configuration/configuration_generated.h b/tensorflow/lite/acceleration/configuration/configuration_generated.h +index 675dfc9d..6772d01b 100644 +--- a/tensorflow/lite/acceleration/configuration/configuration_generated.h ++++ b/tensorflow/lite/acceleration/configuration/configuration_generated.h +@@ -22,9 +22,9 @@ limitations under the License. + + // Ensure the included flatbuffers.h is the same version as when this file was + // generated, otherwise it may not be compatible. +-static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && +- FLATBUFFERS_VERSION_MINOR == 5 && +- FLATBUFFERS_VERSION_REVISION == 26, ++static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && ++ FLATBUFFERS_VERSION_MINOR == 3 && ++ FLATBUFFERS_VERSION_REVISION == 7, + "Non-compatible flatbuffers version included"); + + namespace tflite { +-- +2.43.2 + diff --git a/recipe/patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch b/recipe/patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch deleted file mode 100644 index 68fe98f8..00000000 --- a/recipe/patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch +++ /dev/null @@ -1,346 +0,0 @@ -From ec01c2c7842e7c2e91c1ad0b52d604929a6ec847 Mon Sep 17 00:00:00 2001 -From: David Majnemer -Date: Wed, 24 Jan 2024 03:58:26 -0800 -Subject: [PATCH] Fix missing includes needed for Abseil lts_2024_01_16 - -PiperOrigin-RevId: 601072928 ---- - tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD | 1 + - .../compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc | 1 + - tensorflow/core/graph/graph_debug_info_builder_test.cc | 1 + - tensorflow/core/tfrt/graph_executor/BUILD | 1 + - tensorflow/core/tfrt/graph_executor/config.h | 1 + - tensorflow/dtensor/mlir/function_renaming.cc | 1 + - tensorflow/lite/delegates/gpu/cl/BUILD | 1 + - tensorflow/lite/delegates/gpu/cl/cl_operation.h | 1 + - .../lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc | 1 + - .../delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc | 1 + - .../lite/delegates/utils/experimental/stable_delegate/BUILD | 1 + - .../utils/experimental/stable_delegate/delegate_loader.cc | 2 ++ - tensorflow/python/framework/BUILD | 1 + - tensorflow/python/framework/python_api_dispatcher_wrapper.cc | 1 + - tensorflow/python/util/BUILD | 1 + - tensorflow/python/util/function_parameter_canonicalizer.cc | 1 + - .../xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc | 3 +++ - third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD | 1 - - .../xla/third_party/tsl/tsl/profiler/utils/trace_utils.h | 1 + - third_party/xla/xla/backends/profiler/gpu/cupti_collector.h | 1 + - third_party/xla/xla/runtime/BUILD | 1 + - third_party/xla/xla/runtime/constraints.cc | 2 +- - third_party/xla/xla/service/cpu/runtime/BUILD | 1 + - third_party/xla/xla/service/cpu/runtime/rng.cc | 1 + - third_party/xla/xla/stream_executor/dnn.h | 3 +++ - 25 files changed, 29 insertions(+), 2 deletions(-) - -diff --git a/tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD b/tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD -index b065f29da4d..bc887cdfc96 100644 ---- a/tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD -+++ b/tensorflow/compiler/mlir/tfrt/translate/mlrt/BUILD -@@ -25,6 +25,7 @@ cc_library( - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status:statusor", -+ "@com_google_absl//absl/strings", - "@llvm-project//llvm:Support", - "@llvm-project//mlir:FuncDialect", - "@llvm-project//mlir:IR", -diff --git a/tensorflow/compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc b/tensorflow/compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc -index 8c85f9f80ac..c0ef7c58c8b 100644 ---- a/tensorflow/compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc -+++ b/tensorflow/compiler/mlir/tfrt/translate/mlrt/mlir_to_bytecode.cc -@@ -24,6 +24,7 @@ limitations under the License. - #include "absl/container/flat_hash_map.h" - #include "absl/log/check.h" - #include "absl/log/log.h" -+#include "absl/strings/str_cat.h" - #include "llvm/ADT/DenseMap.h" - #include "llvm/ADT/TypeSwitch.h" - #include "mlir/IR/Attributes.h" // from @llvm-project -diff --git a/tensorflow/core/graph/graph_debug_info_builder_test.cc b/tensorflow/core/graph/graph_debug_info_builder_test.cc -index 6c236de97d0..f7e5a6c01f6 100644 ---- a/tensorflow/core/graph/graph_debug_info_builder_test.cc -+++ b/tensorflow/core/graph/graph_debug_info_builder_test.cc -@@ -21,6 +21,7 @@ limitations under the License. - #include - - #include -+#include "absl/strings/str_cat.h" - #include "tensorflow/core/framework/graph_debug_info.pb.h" - #include "tensorflow/core/platform/test.h" - -diff --git a/tensorflow/core/tfrt/graph_executor/BUILD b/tensorflow/core/tfrt/graph_executor/BUILD -index 7cc355fa1b2..d34699c2028 100644 ---- a/tensorflow/core/tfrt/graph_executor/BUILD -+++ b/tensorflow/core/tfrt/graph_executor/BUILD -@@ -181,6 +181,7 @@ cc_library( - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", -+ "@com_google_absl//absl/strings", - "@com_google_protobuf//:protobuf", - ], - ) -diff --git a/tensorflow/core/tfrt/graph_executor/config.h b/tensorflow/core/tfrt/graph_executor/config.h -index 60e96701336..b0e3fbf12d6 100644 ---- a/tensorflow/core/tfrt/graph_executor/config.h -+++ b/tensorflow/core/tfrt/graph_executor/config.h -@@ -21,6 +21,7 @@ limitations under the License. - #include "absl/container/flat_hash_map.h" - #include "absl/status/status.h" - #include "absl/status/statusor.h" -+#include "absl/strings/str_cat.h" - #include "tensorflow/core/tfrt/graph_executor/config.pb.h" - - namespace tensorflow { -diff --git a/tensorflow/dtensor/mlir/function_renaming.cc b/tensorflow/dtensor/mlir/function_renaming.cc -index fe91943915b..0c485e91878 100644 ---- a/tensorflow/dtensor/mlir/function_renaming.cc -+++ b/tensorflow/dtensor/mlir/function_renaming.cc -@@ -16,6 +16,7 @@ limitations under the License. - #include - #include - -+#include "absl/strings/str_cat.h" - #include "mlir/Dialect/Func/IR/FuncOps.h" // from @llvm-project - #include "mlir/IR/Attributes.h" // from @llvm-project - #include "mlir/IR/Operation.h" // from @llvm-project -diff --git a/tensorflow/lite/delegates/gpu/cl/BUILD b/tensorflow/lite/delegates/gpu/cl/BUILD -index 760f401bdc6..81e77b603b3 100644 ---- a/tensorflow/lite/delegates/gpu/cl/BUILD -+++ b/tensorflow/lite/delegates/gpu/cl/BUILD -@@ -260,6 +260,7 @@ cc_library( - ":program_cache", - ":tensor", - "//tensorflow/lite/delegates/gpu/common/task:gpu_operation", -+ "@com_google_absl//absl/strings", - ], - ) - -diff --git a/tensorflow/lite/delegates/gpu/cl/cl_operation.h b/tensorflow/lite/delegates/gpu/cl/cl_operation.h -index c9192830a02..772269c003f 100644 ---- a/tensorflow/lite/delegates/gpu/cl/cl_operation.h -+++ b/tensorflow/lite/delegates/gpu/cl/cl_operation.h -@@ -22,6 +22,7 @@ limitations under the License. - #include - #include - -+#include "absl/strings/str_cat.h" - #include "tensorflow/lite/delegates/gpu/cl/cl_arguments.h" - #include "tensorflow/lite/delegates/gpu/cl/cl_command_queue.h" - #include "tensorflow/lite/delegates/gpu/cl/cl_context.h" -diff --git a/tensorflow/lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc b/tensorflow/lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc -index 03909221f99..ffcf1fb2cdf 100644 ---- a/tensorflow/lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc -+++ b/tensorflow/lite/delegates/gpu/common/task/qcom_thin_filter_desc.cc -@@ -18,6 +18,7 @@ limitations under the License. - #include - #include - -+#include "absl/strings/str_cat.h" - #include "absl/strings/string_view.h" - - namespace tflite { -diff --git a/tensorflow/lite/delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc b/tensorflow/lite/delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc -index 03fd1292827..923aaf53efa 100644 ---- a/tensorflow/lite/delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc -+++ b/tensorflow/lite/delegates/gpu/common/tasks/special/thin_pointwise_fuser.cc -@@ -24,6 +24,7 @@ limitations under the License. - #include - #include - -+#include "absl/strings/str_cat.h" - #include "absl/strings/str_replace.h" - #include "tensorflow/lite/delegates/gpu/common/flops_util.h" - #include "tensorflow/lite/delegates/gpu/common/model.h" -diff --git a/tensorflow/lite/delegates/utils/experimental/stable_delegate/BUILD b/tensorflow/lite/delegates/utils/experimental/stable_delegate/BUILD -index cadf44ecef9..f038e55723f 100644 ---- a/tensorflow/lite/delegates/utils/experimental/stable_delegate/BUILD -+++ b/tensorflow/lite/delegates/utils/experimental/stable_delegate/BUILD -@@ -34,6 +34,7 @@ cc_library_with_tflite( - deps = [ - "//tensorflow/lite/experimental/acceleration/compatibility:android_info", - "//tensorflow/lite/tools:logging", -+ "@com_google_absl//absl/strings", - ], - ) - -diff --git a/tensorflow/lite/delegates/utils/experimental/stable_delegate/delegate_loader.cc b/tensorflow/lite/delegates/utils/experimental/stable_delegate/delegate_loader.cc -index abf89f71b3f..3ed11550aae 100644 ---- a/tensorflow/lite/delegates/utils/experimental/stable_delegate/delegate_loader.cc -+++ b/tensorflow/lite/delegates/utils/experimental/stable_delegate/delegate_loader.cc -@@ -21,6 +21,8 @@ limitations under the License. - #include - #include - -+#include "absl/strings/numbers.h" -+#include "tensorflow/lite/acceleration/configuration/c/stable_delegate.h" - #include "tensorflow/lite/experimental/acceleration/compatibility/android_info.h" - #include "tensorflow/lite/tools/logging.h" - -diff --git a/tensorflow/python/framework/BUILD b/tensorflow/python/framework/BUILD -index 9bfb9d2d9dd..fb30987bfd8 100644 ---- a/tensorflow/python/framework/BUILD -+++ b/tensorflow/python/framework/BUILD -@@ -1094,6 +1094,7 @@ tf_python_pybind_extension( - "//tensorflow/python/util:function_parameter_canonicalizer_hdrs", - "//third_party/python_runtime:headers", # buildcleaner: keep - "@com_google_absl//absl/container:flat_hash_map", -+ "@com_google_absl//absl/strings", - "@pybind11", - ], - ) -diff --git a/tensorflow/python/framework/python_api_dispatcher_wrapper.cc b/tensorflow/python/framework/python_api_dispatcher_wrapper.cc -index d3f688578a7..f6ae3df3d23 100644 ---- a/tensorflow/python/framework/python_api_dispatcher_wrapper.cc -+++ b/tensorflow/python/framework/python_api_dispatcher_wrapper.cc -@@ -14,6 +14,7 @@ limitations under the License. - ==============================================================================*/ - // Python bindings for tensorflow/python/framework/python_api_dispatcher.h. - -+#include "absl/strings/str_cat.h" - #include "pybind11/pybind11.h" // from @pybind11 - #include "pybind11/pytypes.h" // from @pybind11 - #include "pybind11/stl.h" // from @pybind11 -diff --git a/tensorflow/python/util/BUILD b/tensorflow/python/util/BUILD -index d1e7d626a1d..ae257943ce7 100644 ---- a/tensorflow/python/util/BUILD -+++ b/tensorflow/python/util/BUILD -@@ -483,6 +483,7 @@ cc_library( - "//tensorflow/python/lib/core:safe_pyobject_ptr", - "//third_party/python_runtime:headers", # buildcleaner: keep - "@com_google_absl//absl/container:flat_hash_set", -+ "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:span", - ], - ) -diff --git a/tensorflow/python/util/function_parameter_canonicalizer.cc b/tensorflow/python/util/function_parameter_canonicalizer.cc -index 6afd6d79910..d9769242cff 100644 ---- a/tensorflow/python/util/function_parameter_canonicalizer.cc -+++ b/tensorflow/python/util/function_parameter_canonicalizer.cc -@@ -16,6 +16,7 @@ limitations under the License. - #include "tensorflow/python/util/function_parameter_canonicalizer.h" - - #include "absl/container/flat_hash_set.h" -+#include "absl/strings/str_cat.h" - #include "tensorflow/core/platform/logging.h" - #include "tensorflow/core/platform/macros.h" - #include "tensorflow/python/lib/core/py_util.h" -diff --git a/third_party/xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc b/third_party/xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc -index 2d67789d8a0..6eb431c97fc 100644 ---- a/third_party/xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc -+++ b/third_party/xla/third_party/tsl/tsl/platform/default/dlopen_checker.cc -@@ -12,6 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ==============================================================================*/ -+#include "absl/status/status.h" -+#include "absl/status/statusor.h" -+#include "absl/strings/str_cat.h" - #include "tsl/platform/default/dso_loader.h" - #include "tsl/platform/errors.h" - #include "tsl/platform/logging.h" -diff --git a/third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD b/third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD -index 0c3e736a915..3b3cc94c865 100644 ---- a/third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD -+++ b/third_party/xla/third_party/tsl/tsl/profiler/utils/BUILD -@@ -190,7 +190,6 @@ cc_library( - deps = [ - "//tsl/platform:types", - "@com_google_absl//absl/strings", -- "@com_google_absl//absl/types:optional", - ], - ) - -diff --git a/third_party/xla/third_party/tsl/tsl/profiler/utils/trace_utils.h b/third_party/xla/third_party/tsl/tsl/profiler/utils/trace_utils.h -index d2580982122..034a634a6f6 100644 ---- a/third_party/xla/third_party/tsl/tsl/profiler/utils/trace_utils.h -+++ b/third_party/xla/third_party/tsl/tsl/profiler/utils/trace_utils.h -@@ -18,6 +18,7 @@ limitations under the License. - - #include - -+#include "absl/strings/numbers.h" - #include "absl/strings/string_view.h" - #include "tsl/platform/types.h" - -diff --git a/third_party/xla/xla/backends/profiler/gpu/cupti_collector.h b/third_party/xla/xla/backends/profiler/gpu/cupti_collector.h -index 8af5927269d..ee788fd5fbd 100644 ---- a/third_party/xla/xla/backends/profiler/gpu/cupti_collector.h -+++ b/third_party/xla/xla/backends/profiler/gpu/cupti_collector.h -@@ -21,6 +21,7 @@ limitations under the License. - #include "absl/container/fixed_array.h" - #include "absl/container/flat_hash_map.h" - #include "absl/container/node_hash_set.h" -+#include "absl/strings/str_cat.h" - #include "absl/strings/string_view.h" - #include "tsl/platform/macros.h" - #include "tsl/platform/status.h" -diff --git a/third_party/xla/xla/runtime/BUILD b/third_party/xla/xla/runtime/BUILD -index 92a0319568e..959af04f52a 100644 ---- a/third_party/xla/xla/runtime/BUILD -+++ b/third_party/xla/xla/runtime/BUILD -@@ -83,6 +83,7 @@ cc_library( - deps = [ - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", -+ "@com_google_absl//absl/strings", - "@llvm-project//llvm:Support", - ], - ) -diff --git a/third_party/xla/xla/runtime/constraints.cc b/third_party/xla/xla/runtime/constraints.cc -index 5086d25a31b..d93ee193585 100644 ---- a/third_party/xla/xla/runtime/constraints.cc -+++ b/third_party/xla/xla/runtime/constraints.cc -@@ -17,10 +17,10 @@ limitations under the License. - - #include - #include --#include - - #include "absl/status/status.h" - #include "absl/status/statusor.h" -+#include "absl/strings/str_cat.h" - - namespace xla { - namespace runtime { -diff --git a/third_party/xla/xla/service/cpu/runtime/BUILD b/third_party/xla/xla/service/cpu/runtime/BUILD -index 98c26d28448..830216b56a9 100644 ---- a/third_party/xla/xla/service/cpu/runtime/BUILD -+++ b/third_party/xla/xla/service/cpu/runtime/BUILD -@@ -142,6 +142,7 @@ cc_library( - "//xla:executable_run_options", - "//xla/runtime:memref_view", - "@com_google_absl//absl/status", -+ "@com_google_absl//absl/strings", - ], - ) - -diff --git a/third_party/xla/xla/service/cpu/runtime/rng.cc b/third_party/xla/xla/service/cpu/runtime/rng.cc -index a1cc6c046d2..5db2ec0a629 100644 ---- a/third_party/xla/xla/service/cpu/runtime/rng.cc -+++ b/third_party/xla/xla/service/cpu/runtime/rng.cc -@@ -18,6 +18,7 @@ - #include - - #include "absl/status/status.h" -+#include "absl/strings/str_cat.h" - #include "xla/executable_run_options.h" - - namespace xla { -diff --git a/third_party/xla/xla/stream_executor/dnn.h b/third_party/xla/xla/stream_executor/dnn.h -index 3561a1ffd4f..e0b50813196 100644 ---- a/third_party/xla/xla/stream_executor/dnn.h -+++ b/third_party/xla/xla/stream_executor/dnn.h -@@ -36,6 +36,9 @@ limitations under the License. - - #include "google/protobuf/wrappers.pb.h" - #include "absl/types/optional.h" -+#include "absl/status/status.h" -+#include "absl/status/statusor.h" -+#include "absl/strings/str_cat.h" - #include "absl/types/span.h" - #include "xla/stream_executor/data_type.h" - #include "xla/stream_executor/device_description.h" --- -2.34.1 - diff --git a/recipe/patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch deleted file mode 100644 index d864ab21..00000000 --- a/recipe/patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9c0871526e681c03e28eaed1e5c99aa7aee43e49 Mon Sep 17 00:00:00 2001 -From: Mark Harfouche -Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH] Link to absl_log_flags instead of absl_flags - ---- - third_party/absl/system.absl.flags.BUILD | 2 +- - third_party/xla/third_party/absl/system.absl.flags.BUILD | 2 +- - .../third_party/tsl/third_party/absl/system.absl.flags.BUILD | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/third_party/absl/system.absl.flags.BUILD b/third_party/absl/system.absl.flags.BUILD -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( - - cc_library( - name = "flag", -- linkopts = ["-labsl_flags"], -+ linkopts = ["-labsl_log_flags"], - deps = [ - ":config", - ":flag_internal", -diff --git a/third_party/xla/third_party/absl/system.absl.flags.BUILD b/third_party/xla/third_party/absl/system.absl.flags.BUILD -index aff653c7e5b..ee2e1bfe5e3 100644 ---- a/third_party/xla/third_party/absl/system.absl.flags.BUILD -+++ b/third_party/xla/third_party/absl/system.absl.flags.BUILD -@@ -97,7 +97,7 @@ cc_library( - - cc_library( - name = "flag", -- linkopts = ["-labsl_flags"], -+ linkopts = ["-labsl_log_flags"], - deps = [ - ":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 ---- 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( - - cc_library( - name = "flag", -- linkopts = ["-labsl_flags"], -+ linkopts = ["-labsl_log_flags"], - deps = [ - ":config", - ":flag_internal", --- -2.34.1 - diff --git a/recipe/patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch deleted file mode 100644 index 524f2b48..00000000 --- a/recipe/patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9b8306ca589c850b2cb54d9c4c2285b309ec13ab Mon Sep 17 00:00:00 2001 -From: Mark Harfouche -Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH] Update ABSL Log Definition for - libabsl_vlog_config_internal.so - ---- - third_party/absl/system.absl.log.BUILD | 2 ++ - 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 ---- 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"]) - cc_library( - name = "log", - linkopts = [ -+ "-labsl_vlog_config_internal", - "-labsl_log_internal_conditions", - "-labsl_log_internal_check_op", - "-labsl_log_internal_message", -@@ -15,6 +16,7 @@ cc_library( - cc_library( - name = "check", - linkopts = [ -+ "-labsl_vlog_config_internal", - "-labsl_log_internal_check_op", - "-labsl_log_internal_message", - "-labsl_log_internal_nullguard", --- -2.34.1 - From 559ef74652bb19a7af0472d2cb0d6958224bc2e2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 7 May 2024 05:39:23 +0000 Subject: [PATCH 12/48] Rebuild for flatbuffers 24.3.25 --- .ci_support/migrations/flatbuffers24325.yaml | 8 ++++++++ conda-forge.yml | 6 +++--- recipe/conda_build_config.yaml | 2 +- recipe/meta.yaml | 6 +++++- 4 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 .ci_support/migrations/flatbuffers24325.yaml diff --git a/.ci_support/migrations/flatbuffers24325.yaml b/.ci_support/migrations/flatbuffers24325.yaml new file mode 100644 index 00000000..9d371a83 --- /dev/null +++ b/.ci_support/migrations/flatbuffers24325.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for flatbuffers 24.3.25 + kind: version + migration_number: 1 +flatbuffers: +- 24.3.25 +migrator_ts: 1711479416.8699827 diff --git a/conda-forge.yml b/conda-forge.yml index b3388e53..1518f682 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -7,17 +7,17 @@ build_platform: osx_arm64: osx_64 conda_build: pkg_format: '2' +conda_build_tool: conda-build+conda-libmamba-solver conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main -test: native_and_emulated -conda_build_tool: conda-build+conda-libmamba-solver github_actions: - timeout_minutes: 720 self_hosted: true + timeout_minutes: 720 triggers: - push - pull_request provider: linux_64: github_actions +test: native_and_emulated diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 48de5cd0..2885bdd5 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ # 2021/12/05 hmaarrfk # Tensorflow 2.7.0 requires futimens which is only # available on 10.13 -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +c_stdlib_version: # [osx and x86_64] - '10.13' # [osx and x86_64] MACOSX_SDK_VERSION: # [osx and x86_64] - '10.13' # [osx and x86_64] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d8b2cb11..c3afd2f3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -72,6 +72,7 @@ requirements: - pybind11 # [build_platform != target_platform] - numpy # [build_platform != target_platform] - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - bazel 6.1.2 @@ -183,6 +184,7 @@ outputs: # build requirements needs to pick up the compiler run_exports build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] - python # [build_platform != target_platform] @@ -268,7 +270,6 @@ outputs: - __cuda # [cuda_compiler_version != "None"] # https://github.com/conda-forge/tensorflow-feedstock/issues/296#issuecomment-1835781851 - cuda-nvcc-tools # [(cuda_compiler_version or "").startswith("12")] - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] # TODO: decide on the name of the package # run_constrained: # What is the difference between these two packages? @@ -330,6 +331,7 @@ outputs: requirements: build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} # Keep the cuda compiler here since it helps package solvers # decide on the cuda variant @@ -378,6 +380,7 @@ outputs: # build requirements needs to pick up the compiler run_exports build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} # Keep the cuda compiler here since it helps package solvers # decide on the cuda variant @@ -423,6 +426,7 @@ outputs: # build requirements needs to pick up the compiler run_exports build: - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} # Keep the cuda compiler here since it helps package solvers # decide on the cuda variant From fa8c4f1b023cd8293e2634f3fc048aa96a65c600 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 07:50:50 +1100 Subject: [PATCH 13/48] add python 3.12 migration --- .ci_support/migrations/python312.yaml | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .ci_support/migrations/python312.yaml diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml new file mode 100644 index 00000000..784a0a25 --- /dev/null +++ b/.ci_support/migrations/python312.yaml @@ -0,0 +1,38 @@ +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 From aab875548ccc8df1df1d0488e56ebd42654ff7a0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 07:53:37 +1100 Subject: [PATCH 14/48] remove 10.13 specification now that it's the default --- recipe/conda_build_config.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 2885bdd5..84b5a2fb 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,9 +1,2 @@ -# 2021/12/05 hmaarrfk -# Tensorflow 2.7.0 requires futimens which is only -# available on 10.13 -c_stdlib_version: # [osx and x86_64] -- '10.13' # [osx and x86_64] -MACOSX_SDK_VERSION: # [osx and x86_64] -- '10.13' # [osx and x86_64] github_actions_labels: - cirun-openstack-cpu-xlarge From df5f2310acc4bc871276c430cdb9cf999d3d688a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 07:54:45 +1100 Subject: [PATCH 15/48] reinstate patch that's not in 2.16.1 yet --- recipe/meta.yaml | 2 ++ recipe/patches/62684.patch | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 recipe/patches/62684.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c3afd2f3..4726c578 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,6 +28,8 @@ source: - patches/0017-Always-use-linux-sed-style.patch - patches/0018-Adjust-relative-path-for-libdevice.patch - patches/0019-Update-flatbuffers-static-assert.patch + # https://github.com/tensorflow/tensorflow/pull/62684 + - patches/62684.patch # Not ported yet # - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch diff --git a/recipe/patches/62684.patch b/recipe/patches/62684.patch new file mode 100644 index 00000000..46b0aedd --- /dev/null +++ b/recipe/patches/62684.patch @@ -0,0 +1,21 @@ +From 6712dade3b6ddd4881b5b7fd2150cf09eee40786 Mon Sep 17 00:00:00 2001 +From: Jinzhe Zeng +Date: Sat, 23 Dec 2023 00:59:32 -0500 +Subject: [PATCH] Fix protobuf errors when using system protobuf + +--- + tensorflow/api_template.__init__.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tensorflow/api_template.__init__.py b/tensorflow/api_template.__init__.py +index 1ccf2fe07f0af..1573f5131bc9f 100644 +--- a/tensorflow/api_template.__init__.py ++++ b/tensorflow/api_template.__init__.py +@@ -35,6 +35,8 @@ + import site as _site + import sys as _sys + ++# Do not remove this line; See https://github.com/tensorflow/tensorflow/issues/42596 ++from tensorflow.python import pywrap_tensorflow # pylint: disable=unused-import + from tensorflow.python.tools import module_util as _module_util + from tensorflow.python.util.lazy_loader import KerasLazyLoader as _KerasLazyLoader From 9ddf964a9ef50ce4388990f20c4b2219aaadfef2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 08:03:23 +1100 Subject: [PATCH 16/48] remove obsolete skip --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4726c578..aa7edd2b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -52,7 +52,6 @@ build: skip: true # [win] skip: true # [python_impl == 'pypy'] skip: true # [py<39] - skip: true # [cuda_compiler_version == "11.2"] # The following skip can be removed when the absl::StrFormat build issues are fixed. skip: true # [cuda_compiler_version == "11.8"] From e3a32e096e8d637979fa476e47b3dd6f5b9aec27 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 08:07:28 +1100 Subject: [PATCH 17/48] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.11.20.29.32 --- .azure-pipelines/azure-pipelines-osx.yml | 9 +- ...ion12numpy1.22python3.10.____cpython.yaml} | 19 +++-- ...sion12numpy1.22python3.9.____cpython.yaml} | 19 +++-- ...ion12numpy1.23python3.11.____cpython.yaml} | 19 +++-- ...sion12numpy1.26python3.12.____cpython.yaml | 83 +++++++++++++++++++ ...ion12numpy1.22python3.10.____cpython.yaml} | 19 +++-- ...sion12numpy1.22python3.9.____cpython.yaml} | 19 +++-- ...ion12numpy1.23python3.11.____cpython.yaml} | 19 +++-- ...sion12numpy1.26python3.12.____cpython.yaml | 83 +++++++++++++++++++ ...sx_64_numpy1.22python3.10.____cpython.yaml | 18 ++-- ...osx_64_numpy1.22python3.9.____cpython.yaml | 18 ++-- ...sx_64_numpy1.23python3.11.____cpython.yaml | 18 ++-- ...sx_64_numpy1.26python3.12.____cpython.yaml | 70 ++++++++++++++++ ...arm64_numpy1.22python3.10.____cpython.yaml | 16 ++-- ..._arm64_numpy1.22python3.9.____cpython.yaml | 16 ++-- ...arm64_numpy1.23python3.11.____cpython.yaml | 16 ++-- ...arm64_numpy1.26python3.12.____cpython.yaml | 70 ++++++++++++++++ .github/workflows/automerge.yml | 2 - .github/workflows/conda-build.yml | 36 +++++--- .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- README.md | 52 +++++++++--- 22 files changed, 499 insertions(+), 126 deletions(-) rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml} (88%) rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml} (88%) rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml} (88%) create mode 100644 .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml} (88%) rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml} (88%) rename .ci_support/{linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml} (88%) create mode 100644 .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7437759f..8e2b8deb 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_numpy1.22python3.10.____cpython: @@ -17,6 +17,9 @@ jobs: osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_64_numpy1.26python3.12.____cpython: + CONFIG: osx_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.10.____cpython: CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' @@ -26,7 +29,11 @@ jobs: osx_arm64_numpy1.23python3.11.____cpython: CONFIG: osx_arm64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.26python3.12.____cpython: + CONFIG: osx_arm64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 1 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 1fd7c2d0..3871ae16 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -21,7 +25,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -29,17 +33,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 nccl: - '2' numpy: @@ -57,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -67,12 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml index 0ec7e0a3..936c1326 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -21,7 +25,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -29,17 +33,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 nccl: - '2' numpy: @@ -57,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -67,12 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml index d3f77ac5..1e1cb074 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' cdt_name: - cos6 channel_sources: @@ -21,7 +25,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -29,17 +33,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 nccl: - '2' numpy: @@ -57,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -67,12 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..c2b5d8c4 --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,83 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.12' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +flatbuffers: +- 24.3.25 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-cpu-xlarge +icu: +- '73' +libabseil: +- '20240116' +libcurl: +- '8' +libgrpc: +- '1.62' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 4.25.3 +nccl: +- '2' +numpy: +- '1.26' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +snappy: +- '1.1' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.15' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml index 5400ade5..91c88216 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -21,7 +25,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -29,17 +33,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 nccl: - '2' numpy: @@ -57,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -67,12 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml index b385bb7c..0116fb47 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -21,7 +25,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -29,17 +33,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 nccl: - '2' numpy: @@ -57,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -67,12 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml similarity index 88% rename from .ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml index fdcfa1df..1ae250d1 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -21,7 +25,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -29,17 +33,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 nccl: - '2' numpy: @@ -57,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -67,12 +71,11 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version + - cdt_name - cuda_compiler - cuda_compiler_version - - cdt_name - docker_image -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..346d255f --- /dev/null +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,83 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +flatbuffers: +- 24.3.25 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-cpu-xlarge +icu: +- '73' +libabseil: +- '20240116' +libcurl: +- '8' +libgrpc: +- '1.62' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 4.25.3 +nccl: +- '2' +numpy: +- '1.26' +openssl: +- '3' +perl: +- 5.32.1 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +snappy: +- '1.1' +sqlite: +- '3' +target_platform: +- linux-64 +tensorflow: +- '2.15' +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - c_stdlib_version + - cdt_name + - cuda_compiler + - cuda_compiler_version + - docker_image +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 9f68af31..d52d3a62 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,11 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' -MACOSX_SDK_VERSION: -- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -17,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -25,17 +27,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -51,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -61,8 +63,6 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index dcfbc419..563ff829 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,11 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' -MACOSX_SDK_VERSION: -- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -17,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -25,17 +27,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -51,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -61,8 +63,6 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 17571817..6d9a1a5f 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,11 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' -MACOSX_SDK_VERSION: -- '10.13' c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -17,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -25,17 +27,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 macos_machine: - x86_64-apple-darwin13.4.0 numpy: @@ -51,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -61,8 +63,6 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..2aaa3d4c --- /dev/null +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,70 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +flatbuffers: +- 24.3.25 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-cpu-xlarge +icu: +- '73' +libabseil: +- '20240116' +libcurl: +- '8' +libgrpc: +- '1.62' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 4.25.3 +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.26' +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +snappy: +- '1.1' +sqlite: +- '3' +target_platform: +- osx-64 +tensorflow: +- '2.15' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index b735e99e..61877847 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -15,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -23,17 +27,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -49,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -59,8 +63,6 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 3f3d2fc8..801ffb97 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -15,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -23,17 +27,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -49,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -59,8 +63,6 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index a23e3c46..b7137923 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - clang c_compiler_version: - '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -15,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '16' flatbuffers: -- 23.5.26 +- 24.3.25 giflib: - '5.2' github_actions_labels: @@ -23,17 +27,17 @@ github_actions_labels: icu: - '73' libabseil: -- '20230802' +- '20240116' libcurl: - '8' libgrpc: -- '1.59' +- '1.62' libjpeg_turbo: - '3' libpng: - '1.6' libprotobuf: -- 4.24.4 +- 4.25.3 macos_machine: - arm64-apple-darwin20.0.0 numpy: @@ -49,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1' +- '1.1' sqlite: - '3' target_platform: @@ -59,8 +63,6 @@ tensorflow: zip_keys: - - c_compiler_version - cxx_compiler_version -- - libgrpc - - libprotobuf - - python - numpy - python_impl diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 00000000..d7a3d565 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,70 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +flatbuffers: +- 24.3.25 +giflib: +- '5.2' +github_actions_labels: +- cirun-openstack-cpu-xlarge +icu: +- '73' +libabseil: +- '20240116' +libcurl: +- '8' +libgrpc: +- '1.62' +libjpeg_turbo: +- '3' +libpng: +- '1.6' +libprotobuf: +- 4.25.3 +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.26' +openssl: +- '3' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +python_impl: +- cpython +snappy: +- '1.1' +sqlite: +- '3' +target_platform: +- osx-arm64 +tensorflow: +- '2.15' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy + - python_impl +zlib: +- '1.2' diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index da1368a1..0535f6aa 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest name: automerge steps: - - name: checkout - uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index ed68b3f7..8e34433a 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,35 +21,45 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h583ac9ac0b', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h4207929cd8', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h998bba98e6', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h833a15bc5f', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_hab675490e1', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h01eb75b48f', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h30d3536c9c', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h2ff63460bc', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_h0cba298c1d', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h628dff9dc9', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12cuda_c_ha76770977f', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hd2c406d7d1', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hf105be2eef', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h6c22f0e19a', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 steps: @@ -108,7 +118,7 @@ jobs: ./.scripts/run_osx_build.sh - name: Install Miniconda for windows - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest miniforge-variant: Mambaforge diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 3d417bd3..2d071f47 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - CONDA_SOLVER=libmamba conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + CONDA_SOLVER=libmamba conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index f37dca58..a504f893 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - CONDA_SOLVER=libmamba conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + 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" diff --git a/README.md b/README.md index 53caed64..c6abaf83 100644 --- a/README.md +++ b/README.md @@ -37,45 +37,59 @@ Current build status - + - + - + - + - + - + + + + + + + @@ -99,6 +113,13 @@ Current build status variant + + + + + +
VariantStatus
linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython - variant + variant + +
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython + + variant + +
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython + + variant
osx_64_numpy1.26python3.12.____cpython + + variant + +
osx_arm64_numpy1.22python3.10.____cpython @@ -120,6 +141,13 @@ Current build status variant
osx_arm64_numpy1.26python3.12.____cpython + + variant + +
From 05499a32176efbab0502b522471c32d0ac5259d8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 08:39:25 +1100 Subject: [PATCH 18/48] update dependencies --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aa7edd2b..d7deb46c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -152,10 +152,10 @@ requirements: - six >=1.12 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - - wrapt >=1.11.0,<1.15 + - wrapt >=1.11.0 # TF-API needs to move in sync - tensorboard >=2.15,<2.16 - - keras >=2.15,<2.16 + - keras >=3.0 outputs: # 2021/12/29: hmaarrfk From 11c8bb13a90c3f66fa25900ad07510ff74dc131c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 08:50:56 +1100 Subject: [PATCH 19/48] use upstream ml_types again --- recipe/meta.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d7deb46c..5c4f57cd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,14 +38,6 @@ source: - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz sha256: 2d7e100b1878084da34b5e23b49a0cbb5ee8a7add74b7dd189a82ada1cf85530 folder: tensorflow-estimator - # yes, the headers come from a different version than the python package required below. - # TODO: Check that these are still up to date - - url: https://raw.githubusercontent.com/jax-ml/ml_dtypes/v0.3.1/ml_dtypes/include/float8.h - fn: float8.h - sha256: d2798fad4e64375b566b1df1d7bc440313e4b1024ca08f12cead3eaa4b73ff72 - - url: https://raw.githubusercontent.com/jax-ml/ml_dtypes/v0.3.1/ml_dtypes/include/int4.h - fn: int4.h - sha256: b3a9970c3c6b169c41ac2fd4375f668d3fd1b492d48b912d89415fa1522a8f50 build: number: 0 @@ -144,7 +136,7 @@ requirements: - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - h5py >=2.9.0 - - ml_dtypes 0.2.0 + - ml_dtypes >=0.3.1,<0.4 - numpy - opt_einsum >=2.3.2 - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 From 94812a507ad56ac75402e3c0202afecc82db7472 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 09:00:41 +1100 Subject: [PATCH 20/48] update the other mentions of wrapt/keras/ml_types as well --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5c4f57cd..11a9d1dd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -226,7 +226,7 @@ outputs: - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - h5py >=2.9.0 - - ml_dtypes 0.2.0 + - ml_dtypes >=0.3.1,<0.4 - numpy - opt_einsum >=2.3.2 - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 @@ -234,10 +234,10 @@ outputs: - six >=1.12 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - - wrapt >=1.11.0,<1.15 + - wrapt >=1.11.0 # TF-API needs to move in sync - tensorboard >=2.15,<2.16 - - keras >=2.15,<2.16 + - keras >=3.0 run: - python - packaging @@ -247,7 +247,7 @@ outputs: - google-pasta >=0.1.1 - grpcio {{ libgrpc }}.* - h5py >=2.9.0 - - ml_dtypes 0.2.0 + - ml_dtypes >=0.3.1,<0.4 - {{ pin_compatible('numpy', lower_bound='1.22') }} - opt_einsum >=2.3.2 - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 @@ -255,10 +255,10 @@ outputs: - six >=1.12 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - - wrapt >=1.11.0,<1.15 + - wrapt >=1.11.0 # TF-API needs to move in sync - tensorboard >=2.15,<2.16 - - keras >=2.15,<2.16 + - keras >=3.0 # avoid that people without GPUs needlessly download ~0.5-1GB - __cuda # [cuda_compiler_version != "None"] # https://github.com/conda-forge/tensorflow-feedstock/issues/296#issuecomment-1835781851 From 0b6e6de029f4bd5dc18fa90cf24ea8d1e3d01538 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 12:50:10 +1100 Subject: [PATCH 21/48] re-rebase patches --- recipe/meta.yaml | 37 ++++++++++--------- ...s.patch => 0001-loosen-requirements.patch} | 14 +++---- ...absl_synchronization-linkage-to-gRPC.patch | 9 ++--- ...-any_invocable-target-to-absel-bazel.patch | 21 +++++++++++ ...=> 0004-Fix-missing-abseil-linkages.patch} | 9 ++--- ...5-Fix-protobuf_python-for-systemlibs.patch | 13 +++---- ...atch => 0006-Add-absl_log-systemlib.patch} | 11 ++---- ...ayout_proto_cc-if-protobuf-linkage-.patch} | 9 ++--- ... => 0008-Fix-further-abseil-linkage.patch} | 9 ++--- ...dd-constraint-to-pybind11-systemlib.patch} | 9 ++--- ...file-ending-for-flatbuffers-LICENSE.patch} | 9 ++--- ...=> 0011-Use-correct-hermetic-python.patch} | 11 ++---- ..._types_py_pb2-to-protobuf-systemlib.patch} | 9 ++--- ...atch => 0013-Add-protobuf-toolchain.patch} | 9 ++--- ...genproto.patch => 0014-fix-genproto.patch} | 9 ++--- ...me-usage-of-absl-str_format-in-CUDA.patch} | 13 +++---- ...ype-to-make-constructor-unambiguous.patch} | 11 ++---- ... => 0017-Use-PYTHON-for-build-wheel.patch} | 9 ++--- ... => 0018-Always-use-Linux-sed-style.patch} | 14 +++---- ...-Adjust-relative-path-for-libdevice.patch} | 9 ++--- ...f-errors-when-using-system-protobuf.patch} | 9 +++-- ...21-Update-flatbuffers-static-assert.patch} | 9 ++--- 22 files changed, 113 insertions(+), 149 deletions(-) rename recipe/patches/{0001-Loosen-requirements.patch => 0001-loosen-requirements.patch} (82%) create mode 100644 recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch rename recipe/patches/{0003-Fix-missing-abseil-linkages.patch => 0004-Fix-missing-abseil-linkages.patch} (80%) rename recipe/patches/{0004-Add-absl_log-systemlib.patch => 0006-Add-absl_log-systemlib.patch} (88%) rename recipe/patches/{0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch => 0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch} (80%) rename recipe/patches/{0007-Fix-further-abseil-linkage.patch => 0008-Fix-further-abseil-linkage.patch} (87%) rename recipe/patches/{0008-Add-constraint-to-pybind11-systemlib.patch => 0009-Add-constraint-to-pybind11-systemlib.patch} (77%) rename recipe/patches/{0009-Different-file-ending-for-flatbuffers-LICENSE.patch => 0010-Different-file-ending-for-flatbuffers-LICENSE.patch} (78%) rename recipe/patches/{0010-Use-correct-hermetic-python.patch => 0011-Use-correct-hermetic-python.patch} (88%) rename recipe/patches/{0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch => 0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch} (81%) rename recipe/patches/{0012-Add-protobuf-toolchain.patch => 0013-Add-protobuf-toolchain.patch} (86%) rename recipe/patches/{0013-fix-genproto.patch => 0014-fix-genproto.patch} (86%) rename recipe/patches/{0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch => 0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch} (91%) rename recipe/patches/{0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch => 0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch} (90%) rename recipe/patches/{0016-Use-PYTHON-for-build-wheel.patch => 0017-Use-PYTHON-for-build-wheel.patch} (85%) rename recipe/patches/{0017-Always-use-linux-sed-style.patch => 0018-Always-use-Linux-sed-style.patch} (85%) rename recipe/patches/{0018-Adjust-relative-path-for-libdevice.patch => 0019-Adjust-relative-path-for-libdevice.patch} (87%) rename recipe/patches/{62684.patch => 0020-Fix-protobuf-errors-when-using-system-protobuf.patch} (77%) rename recipe/patches/{0019-Update-flatbuffers-static-assert.patch => 0021-Update-flatbuffers-static-assert.patch} (86%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 11a9d1dd..071a1518 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,27 +9,28 @@ source: - url: https://github.com/tensorflow/tensorflow/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz sha256: c729e56efc945c6df08efe5c9f5b8b89329c7c91b8f40ad2bb3e13900bd4876d patches: - - patches/0001-Loosen-requirements.patch + - patches/0001-loosen-requirements.patch - patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch - - patches/0003-Fix-missing-abseil-linkages.patch - - patches/0004-Add-absl_log-systemlib.patch + - patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch + - patches/0004-Fix-missing-abseil-linkages.patch - patches/0005-Fix-protobuf_python-for-systemlibs.patch - - patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch - - patches/0007-Fix-further-abseil-linkage.patch - - patches/0008-Add-constraint-to-pybind11-systemlib.patch - - patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch - - patches/0010-Use-correct-hermetic-python.patch - - patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch - - patches/0012-Add-protobuf-toolchain.patch - - patches/0013-fix-genproto.patch - - patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch - - patches/0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch - - patches/0016-Use-PYTHON-for-build-wheel.patch - - patches/0017-Always-use-linux-sed-style.patch - - patches/0018-Adjust-relative-path-for-libdevice.patch - - patches/0019-Update-flatbuffers-static-assert.patch + - patches/0006-Add-absl_log-systemlib.patch + - patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch + - patches/0008-Fix-further-abseil-linkage.patch + - patches/0009-Add-constraint-to-pybind11-systemlib.patch + - patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch + - patches/0011-Use-correct-hermetic-python.patch + - patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch + - patches/0013-Add-protobuf-toolchain.patch + - patches/0014-fix-genproto.patch + - patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch # [(cuda_compiler_version or "").startswith("11")] + - patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch + - patches/0017-Use-PYTHON-for-build-wheel.patch + - patches/0018-Always-use-linux-sed-style.patch + - patches/0019-Adjust-relative-path-for-libdevice.patch # https://github.com/tensorflow/tensorflow/pull/62684 - - patches/62684.patch + - patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch + - patches/0021-Update-flatbuffers-static-assert.patch # Not ported yet # - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch diff --git a/recipe/patches/0001-Loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch similarity index 82% rename from recipe/patches/0001-Loosen-requirements.patch rename to recipe/patches/0001-loosen-requirements.patch index a69aed2e..6a14ede6 100644 --- a/recipe/patches/0001-Loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,13 +1,12 @@ -From 145412013241e6db9a997c84405cef7a504e1403 Mon Sep 17 00:00:00 2001 -From: Mark Harfouche -Date: Wed, 13 Mar 2024 05:59:48 -0400 -Subject: [PATCH 01/19] Loosen requirements +From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 30 Dec 2021 06:57:09 +0200 +Subject: [PATCH 01/21] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem * unpin numpy -Originally by: Uwe L. Korn Co-authored-by: Mark Harfouche Co-authored-by: ngam --- @@ -15,7 +14,7 @@ Co-authored-by: ngam 1 file changed, 6 deletions(-) diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index cdec9d3a..9c563514 100644 +index cdec9d3a783..9c563514058 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -89,11 +89,7 @@ REQUIRED_PACKAGES = [ @@ -39,6 +38,3 @@ index cdec9d3a..9c563514 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.43.2 - 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 07e78590..c47c0a29 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 c845600afd2bbf99c800163ece9e2f0d015dbb14 Mon Sep 17 00:00:00 2001 +From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/19] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/21] 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( @@ -35,6 +35,3 @@ index 8b703f11..417baf5d 100644 ], visibility = ["//visibility:public"], ) --- -2.43.2 - diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch new file mode 100644 index 00000000..dbe50d3e --- /dev/null +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -0,0 +1,21 @@ +From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Sun, 2 Jul 2023 05:36:41 +0000 +Subject: [PATCH 03/21] Add missing any_invocable target to absel bazel + +--- + third_party/absl/system.absl.functional.BUILD | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/third_party/absl/system.absl.functional.BUILD b/third_party/absl/system.absl.functional.BUILD +index 9439bd0ba22..c46e5bd8174 100644 +--- a/third_party/absl/system.absl.functional.BUILD ++++ b/third_party/absl/system.absl.functional.BUILD +@@ -13,3 +13,7 @@ cc_library( + cc_library( + name = "function_ref", + ) ++ ++cc_library( ++ name = "any_invocable", ++) diff --git a/recipe/patches/0003-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch similarity index 80% rename from recipe/patches/0003-Fix-missing-abseil-linkages.patch rename to recipe/patches/0004-Fix-missing-abseil-linkages.patch index 4437cda7..de320cb4 100644 --- a/recipe/patches/0003-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,14 +1,14 @@ -From 14fc99f6e0e91dcf7424d7193ee19ddf4621f987 Mon Sep 17 00:00:00 2001 +From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 03/19] Fix missing abseil linkages +Subject: [PATCH 04/21] 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( @@ -20,6 +20,3 @@ index fa9a7a84..d04776c9 100644 deps = [ ":str_format", "//absl/container:compressed_tuple", --- -2.43.2 - diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index 4d4b47f3..baac399a 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ -From 88f98abdd9214170e7f690ed045a17504cf4c8d1 Mon Sep 17 00:00:00 2001 +From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/19] Fix protobuf_python for systemlibs +Subject: [PATCH 05/21] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- @@ -12,7 +12,7 @@ Subject: [PATCH 05/19] 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 9e15c75c..6ca2f04b 100644 +index 9e15c75c183..6ca2f04bfc2 100644 --- a/tensorflow/workspace2.bzl +++ b/tensorflow/workspace2.bzl @@ -382,6 +382,7 @@ def _tf_repositories(): @@ -40,7 +40,7 @@ index 9e15c75c..6ca2f04b 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,6 +81,3 @@ index 00000000..982617a7 + # hdrs = ["google/protobuf/proto_api.h"], + visibility = ["//visibility:public"], +) --- -2.43.2 - diff --git a/recipe/patches/0004-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch similarity index 88% rename from recipe/patches/0004-Add-absl_log-systemlib.patch rename to recipe/patches/0006-Add-absl_log-systemlib.patch index 57c67aac..5cb4e444 100644 --- a/recipe/patches/0004-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ -From ed9d9b4ac2c151a73c602566e136db65fab50a3c Mon Sep 17 00:00:00 2001 +From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 04/19] Add absl_log systemlib +Subject: [PATCH 06/21] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ @@ -11,7 +11,7 @@ Subject: [PATCH 04/19] 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 06f75166ce4..c54df3cfbae 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -20,6 +20,7 @@ def repo(): @@ -49,6 +49,3 @@ index 06f75166..c54df3cf 100644 "memory", "meta", "numeric", --- -2.43.2 - diff --git a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch similarity index 80% rename from recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch rename to recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index d41d3040..85ace1ff 100644 --- a/recipe/patches/0006-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ -From 8d97f81ec6a02f83b5827a2c6a47383e688078df Mon Sep 17 00:00:00 2001 +From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 06/19] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/21] Omit linking to layout_proto_cc if protobuf linkage is shared --- @@ -9,7 +9,7 @@ Subject: [PATCH 06/19] 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 675709d4..4c713a93 100644 +index 675709d4314..4c713a9374c 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -1358,7 +1358,6 @@ tf_python_pybind_extension( @@ -20,6 +20,3 @@ index 675709d4..4c713a93 100644 "//tensorflow/python/lib/core:pybind11_lib", "//tensorflow/python/lib/core:pybind11_status_headers", "//third_party/python_runtime:headers", # buildcleaner: keep --- -2.43.2 - diff --git a/recipe/patches/0007-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch similarity index 87% rename from recipe/patches/0007-Fix-further-abseil-linkage.patch rename to recipe/patches/0008-Fix-further-abseil-linkage.patch index f8b53485..dc189c64 100644 --- a/recipe/patches/0007-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,14 +1,14 @@ -From 6bca4b3f29f14825628071d8e150edbc601c7da1 Mon Sep 17 00:00:00 2001 +From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 07/19] Fix further abseil linkage +Subject: [PATCH 08/21] 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"]) @@ -36,6 +36,3 @@ index d6bf8748..b3e42f4d 100644 visibility = [ "//absl:__subpackages__", ], --- -2.43.2 - diff --git a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch similarity index 77% rename from recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch rename to recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index a6ff081e..9f0968c9 100644 --- a/recipe/patches/0008-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,14 +1,14 @@ -From d48e2727b92611b792b7db68cc3d07284a9d15be Mon Sep 17 00:00:00 2001 +From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 08/19] Add constraint to pybind11 systemlib +Subject: [PATCH 09/21] 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 79a483d7..463dd1a8 100644 +index 79a483d7b5d..463dd1a8ec7 100644 --- a/third_party/systemlibs/pybind11.BUILD +++ b/third_party/systemlibs/pybind11.BUILD @@ -6,3 +6,9 @@ cc_library( @@ -21,6 +21,3 @@ index 79a483d7..463dd1a8 100644 + name = "osx", + constraint_values = ["@platforms//os:osx"], +) --- -2.43.2 - diff --git a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch similarity index 78% rename from recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch rename to recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index a2a82cbc..3d7b9821 100644 --- a/recipe/patches/0009-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,14 +1,14 @@ -From a2282b6494f4470d0e1836b26eddf7cc8493ef15 Mon Sep 17 00:00:00 2001 +From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 09/19] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/21] 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( @@ -23,6 +23,3 @@ index 8fe4d7a5..297f8baf 100644 # Public flatc library to compile flatbuffer files at runtime. cc_library( name = "flatbuffers", --- -2.43.2 - diff --git a/recipe/patches/0010-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch similarity index 88% rename from recipe/patches/0010-Use-correct-hermetic-python.patch rename to recipe/patches/0011-Use-correct-hermetic-python.patch index d52d567f..b375e2a9 100644 --- a/recipe/patches/0010-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ -From 3efda1bed69b12589cd5ae7869a13eb8e37fd7bf Mon Sep 17 00:00:00 2001 +From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 10/19] Use correct, hermetic python +Subject: [PATCH 11/21] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ @@ -9,7 +9,7 @@ Subject: [PATCH 10/19] 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,6 +37,3 @@ index cd76ae73..c12533c9 100644 from tensorflow.python.tools.api.generator import doc_srcs from tensorflow.python.util import tf_decorator --- -2.43.2 - diff --git a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch similarity index 81% rename from recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch rename to recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index b2564f7e..00e27452 100644 --- a/recipe/patches/0011-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,14 +1,14 @@ -From 317fd534645e377a9bbcc6c3dc78a3afc405f823 Mon Sep 17 00:00:00 2001 +From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 11/19] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/21] 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 4d05ab28..b3d72b0e 100644 +index 4d05ab28d12..b3d72b0e3ad 100644 --- a/third_party/systemlibs/protobuf.BUILD +++ b/third_party/systemlibs/protobuf.BUILD @@ -111,3 +111,10 @@ py_library( @@ -22,6 +22,3 @@ index 4d05ab28..b3d72b0e 100644 + srcs = [proto[1][0] for proto in WELL_KNOWN_PROTO_MAP.items()], + visibility = ["//visibility:public"], +) --- -2.43.2 - diff --git a/recipe/patches/0012-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch similarity index 86% rename from recipe/patches/0012-Add-protobuf-toolchain.patch rename to recipe/patches/0013-Add-protobuf-toolchain.patch index 860c26da..436a512b 100644 --- a/recipe/patches/0012-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,14 +1,14 @@ -From 3bd039141c155fc313673d4cdce7e084d0d07de6 Mon Sep 17 00:00:00 2001 +From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 12/19] Add protobuf toolchain +Subject: [PATCH 13/21] 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 b3d72b0e..b122a753 100644 +index b3d72b0e3ad..b122a753474 100644 --- a/third_party/systemlibs/protobuf.BUILD +++ b/third_party/systemlibs/protobuf.BUILD @@ -65,12 +65,26 @@ cc_library( @@ -38,6 +38,3 @@ index b3d72b0e..b122a753 100644 cc_library( name = "protoc_lib", linkopts = ["-lprotoc"], --- -2.43.2 - diff --git a/recipe/patches/0013-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch similarity index 86% rename from recipe/patches/0013-fix-genproto.patch rename to recipe/patches/0014-fix-genproto.patch index 863b0f5c..bfa492ef 100644 --- a/recipe/patches/0013-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,14 +1,14 @@ -From ee1e5d6deefcab18f971310b13bd8b7d0eb865a9 Mon Sep 17 00:00:00 2001 +From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 13/19] fix genproto +Subject: [PATCH 14/21] 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 c0826ed1..4f5fe02c 100644 +index c0826ed1517..4f5fe02cb93 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( @@ -23,6 +23,3 @@ index c0826ed1..4f5fe02c 100644 proto_gen( name = name + "_genproto", --- -2.43.2 - diff --git a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch similarity index 91% rename from recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch rename to recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index 53ee87cb..0c311006 100644 --- a/recipe/patches/0014-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ -From b963e6a865ef6de43f10678a3e132b8c005c509a Mon Sep 17 00:00:00 2001 +From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 14/19] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/21] 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 0f5ed556..b1adf718 100644 +index 0f5ed5560d6..b1adf7180a7 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 0f5ed556..b1adf718 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,6 +67,3 @@ 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.43.2 - diff --git a/recipe/patches/0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch similarity index 90% rename from recipe/patches/0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch rename to recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index be95c9e2..3870b404 100644 --- a/recipe/patches/0015-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ -From 292409c9c4a71eae535022396c9f6af74c4e475b Mon Sep 17 00:00:00 2001 +From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 15/19] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/21] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As @@ -15,7 +15,7 @@ to make it explicit. diff --git a/third_party/py/ml_dtypes/int4.patch b/third_party/py/ml_dtypes/int4.patch new file mode 100644 -index 00000000..d91c68cb +index 00000000000..d91c68cbf88 --- /dev/null +++ b/third_party/py/ml_dtypes/int4.patch @@ -0,0 +1,15 @@ @@ -35,7 +35,7 @@ index 00000000..d91c68cb + static constexpr i4 lowest() { + return std::is_signed::value ? i4(-8) : i4(0); diff --git a/third_party/py/ml_dtypes/workspace.bzl b/third_party/py/ml_dtypes/workspace.bzl -index 84aeb00e..5e6abdfc 100644 +index 84aeb00edbe..5e6abdfc4c9 100644 --- a/third_party/py/ml_dtypes/workspace.bzl +++ b/third_party/py/ml_dtypes/workspace.bzl @@ -12,6 +12,9 @@ def repo(): @@ -48,6 +48,3 @@ index 84aeb00e..5e6abdfc 100644 link_files = { "//third_party/py/ml_dtypes:ml_dtypes.tests.BUILD": "tests/BUILD.bazel", "//third_party/py/ml_dtypes:LICENSE": "LICENSE", --- -2.43.2 - diff --git a/recipe/patches/0016-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch similarity index 85% rename from recipe/patches/0016-Use-PYTHON-for-build-wheel.patch rename to recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index 778ed804..157d16df 100644 --- a/recipe/patches/0016-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ -From 4976814888c435dfcf6ee74c4d8be9f4c2e954c8 Mon Sep 17 00:00:00 2001 +From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 16/19] Use PYTHON for build wheel +Subject: [PATCH 17/21] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is @@ -11,7 +11,7 @@ not existing. Instead, point it to our Python installation. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh -index ff21aadb..637faec0 100755 +index ff21aadba95..637faec06cb 100755 --- a/tensorflow/tools/pip_package/build_pip_package.sh +++ b/tensorflow/tools/pip_package/build_pip_package.sh @@ -352,7 +352,7 @@ function build_wheel() { @@ -23,6 +23,3 @@ index ff21aadb..637faec0 100755 mkdir -p ${DEST} cp dist/* ${DEST} popd > /dev/null --- -2.43.2 - diff --git a/recipe/patches/0017-Always-use-linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch similarity index 85% rename from recipe/patches/0017-Always-use-linux-sed-style.patch rename to recipe/patches/0018-Always-use-Linux-sed-style.patch index 81ba1516..62e3eb85 100644 --- a/recipe/patches/0017-Always-use-linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,15 +1,14 @@ -From 692f21acfe01c55abdc9f64c32a628b729ac29bb Mon Sep 17 00:00:00 2001 -From: Mark Harfouche -Date: Wed, 13 Mar 2024 06:21:50 -0400 -Subject: [PATCH 17/19] Always use linux-sed style +From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 14 Dec 2023 14:17:28 +0100 +Subject: [PATCH 18/21] Always use Linux-sed style -Original patch by: "Uwe L. Korn" --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh -index 637faec0..d9eec53b 100755 +index 637faec06cb..d9eec53b870 100755 --- a/tensorflow/tools/pip_package/build_pip_package.sh +++ b/tensorflow/tools/pip_package/build_pip_package.sh @@ -278,15 +278,9 @@ function prepare_src() { @@ -31,6 +30,3 @@ index 637faec0..d9eec53b 100755 mkdir -p ${TMPDIR}/third_party cp -LR $RUNFILES/../local_config_cuda/cuda/_virtual_includes/cuda_headers_virtual/third_party/gpus ${TMPDIR}/third_party --- -2.43.2 - diff --git a/recipe/patches/0018-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch similarity index 87% rename from recipe/patches/0018-Adjust-relative-path-for-libdevice.patch rename to recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index 874de3d1..08f44b9c 100644 --- a/recipe/patches/0018-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,14 +1,14 @@ -From 271baae9836316af43b5698b1e42ecb84a081e32 Mon Sep 17 00:00:00 2001 +From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 18/19] Adjust relative path for libdevice +Subject: [PATCH 19/21] 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 ed2ffece..25ca9b9c 100644 +index ed2ffece588..25ca9b9c4b4 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() { @@ -20,6 +20,3 @@ index ed2ffece..25ca9b9c 100644 roots.emplace_back(std::string(dir) + path); } #endif // defined(PLATFORM_POSIX) && !defined(__APPLE__) --- -2.43.2 - diff --git a/recipe/patches/62684.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch similarity index 77% rename from recipe/patches/62684.patch rename to recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index 46b0aedd..ba229b22 100644 --- a/recipe/patches/62684.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,17 +1,17 @@ -From 6712dade3b6ddd4881b5b7fd2150cf09eee40786 Mon Sep 17 00:00:00 2001 +From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/21] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tensorflow/api_template.__init__.py b/tensorflow/api_template.__init__.py -index 1ccf2fe07f0af..1573f5131bc9f 100644 +index a0f88926b5e..4f68ccc2be5 100644 --- a/tensorflow/api_template.__init__.py +++ b/tensorflow/api_template.__init__.py -@@ -35,6 +35,8 @@ +@@ -34,6 +34,8 @@ import os as _os import site as _site import sys as _sys @@ -19,3 +19,4 @@ index 1ccf2fe07f0af..1573f5131bc9f 100644 +from tensorflow.python import pywrap_tensorflow # pylint: disable=unused-import from tensorflow.python.tools import module_util as _module_util from tensorflow.python.util.lazy_loader import KerasLazyLoader as _KerasLazyLoader + diff --git a/recipe/patches/0019-Update-flatbuffers-static-assert.patch b/recipe/patches/0021-Update-flatbuffers-static-assert.patch similarity index 86% rename from recipe/patches/0019-Update-flatbuffers-static-assert.patch rename to recipe/patches/0021-Update-flatbuffers-static-assert.patch index e2b3aa72..f1a997f5 100644 --- a/recipe/patches/0019-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0021-Update-flatbuffers-static-assert.patch @@ -1,14 +1,14 @@ -From 02e68726417d00ca62895785071785444003e0cb Mon Sep 17 00:00:00 2001 +From b36b0fe3cccc9cb91e2fdbbae46a3358ea1ee3bb Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 19/19] Update flatbuffers static assert +Subject: [PATCH 21/21] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tensorflow/lite/acceleration/configuration/configuration_generated.h b/tensorflow/lite/acceleration/configuration/configuration_generated.h -index 675dfc9d..6772d01b 100644 +index 675dfc9d8c9..6772d01b7d3 100644 --- a/tensorflow/lite/acceleration/configuration/configuration_generated.h +++ b/tensorflow/lite/acceleration/configuration/configuration_generated.h @@ -22,9 +22,9 @@ limitations under the License. @@ -24,6 +24,3 @@ index 675dfc9d..6772d01b 100644 "Non-compatible flatbuffers version included"); namespace tflite { --- -2.43.2 - From 26f17b0fda513209c0e55bee9cb04f67ae10577c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 12:52:06 +1100 Subject: [PATCH 22/48] update overlooked h5py lower bound --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 071a1518..7e6d2336 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -136,7 +136,7 @@ requirements: - astunparse >=1.6.0 - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - - h5py >=2.9.0 + - h5py >=3.10 - ml_dtypes >=0.3.1,<0.4 - numpy - opt_einsum >=2.3.2 @@ -226,7 +226,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 >=2.9.0 + - h5py >=3.10 - ml_dtypes >=0.3.1,<0.4 - numpy - opt_einsum >=2.3.2 @@ -247,7 +247,7 @@ outputs: - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - grpcio {{ libgrpc }}.* - - h5py >=2.9.0 + - h5py >=3.10 - ml_dtypes >=0.3.1,<0.4 - {{ pin_compatible('numpy', lower_bound='1.22') }} - opt_einsum >=2.3.2 From 09df789de5df4d97d59e56f7ba2301513ead73c4 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 13:17:40 +1100 Subject: [PATCH 23/48] rebase remaining abseil patches from #372 --- recipe/meta.yaml | 9 ++--- recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 36 +++++++++++++++++++ ...Definition-for-libabsl_vlog_config_i.patch | 30 ++++++++++++++++ ...23-Update-flatbuffers-static-assert.patch} | 4 +-- 24 files changed, 91 insertions(+), 28 deletions(-) create mode 100644 recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch create mode 100644 recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch rename recipe/patches/{0021-Update-flatbuffers-static-assert.patch => 0023-Update-flatbuffers-static-assert.patch} (90%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7e6d2336..3c5f1d60 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,12 +30,9 @@ source: - patches/0019-Adjust-relative-path-for-libdevice.patch # https://github.com/tensorflow/tensorflow/pull/62684 - patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch - - patches/0021-Update-flatbuffers-static-assert.patch - - # Not ported yet - # - patches/0023-Fix-missing-includes-needed-for-Abseil-lts_2024_01_1.patch - # - patches/0024-Link-to-absl_log_flags-instead-of-absl_flags.patch - # - patches/0025-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch + - patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch + - patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch + - patches/0023-Update-flatbuffers-static-assert.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 6a14ede6..4b747423 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/21] loosen requirements +Subject: [PATCH 01/23] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 c47c0a29..79150cd9 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/21] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/23] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index dbe50d3e..87bce2c6 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/21] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/23] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index de320cb4..180e78d0 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/21] Fix missing abseil linkages +Subject: [PATCH 04/23] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index baac399a..a313313d 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/21] Fix protobuf_python for systemlibs +Subject: [PATCH 05/23] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index 5cb4e444..eb27ffb9 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/21] Add absl_log systemlib +Subject: [PATCH 06/23] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 85ace1ff..473b480d 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/21] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/23] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index dc189c64..563733fe 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/21] Fix further abseil linkage +Subject: [PATCH 08/23] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index 9f0968c9..2d362f96 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/21] Add constraint to pybind11 systemlib +Subject: [PATCH 09/23] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index 3d7b9821..d1ced7f6 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/21] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/23] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index b375e2a9..e7896865 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/21] Use correct, hermetic python +Subject: [PATCH 11/23] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index 00e27452..dfa4597b 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/21] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/23] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index 436a512b..268e2d86 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/21] Add protobuf toolchain +Subject: [PATCH 13/23] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index bfa492ef..72a134bf 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/21] fix genproto +Subject: [PATCH 14/23] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index 0c311006..1d47e1cd 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/21] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/23] 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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 3870b404..45bd1295 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/21] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/23] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index 157d16df..11e58cbb 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/21] Use PYTHON for build wheel +Subject: [PATCH 17/23] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index 62e3eb85..fd8c805e 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/21] Always use Linux-sed style +Subject: [PATCH 18/23] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index 08f44b9c..b118bf7f 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/21] Adjust relative path for libdevice +Subject: [PATCH 19/23] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index ba229b22..2c9b7782 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/21] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/23] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch new file mode 100644 index 00000000..50209c80 --- /dev/null +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -0,0 +1,36 @@ +From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Mon, 26 Feb 2024 22:30:08 -0500 +Subject: [PATCH 21/23] Link to absl_log_flags instead of absl_flags + +--- + third_party/absl/system.absl.flags.BUILD | 2 +- + .../third_party/tsl/third_party/absl/system.absl.flags.BUILD | 2 +- + 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 +--- a/third_party/absl/system.absl.flags.BUILD ++++ b/third_party/absl/system.absl.flags.BUILD +@@ -97,7 +97,7 @@ cc_library( + + cc_library( + name = "flag", +- linkopts = ["-labsl_flags"], ++ linkopts = ["-labsl_log_flags"], + deps = [ + ":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 +--- 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( + + cc_library( + name = "flag", +- linkopts = ["-labsl_flags"], ++ linkopts = ["-labsl_log_flags"], + deps = [ + ":config", + ":flag_internal", diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch new file mode 100644 index 00000000..bb6623e1 --- /dev/null +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -0,0 +1,30 @@ +From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Tue, 27 Feb 2024 18:01:19 -0500 +Subject: [PATCH 22/23] Update ABSL Log Definition for + libabsl_vlog_config_internal.so + +--- + third_party/absl/system.absl.log.BUILD | 2 ++ + 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 +--- 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"]) + cc_library( + name = "log", + linkopts = [ ++ "-labsl_vlog_config_internal", + "-labsl_log_internal_conditions", + "-labsl_log_internal_check_op", + "-labsl_log_internal_message", +@@ -15,6 +16,7 @@ cc_library( + cc_library( + name = "check", + linkopts = [ ++ "-labsl_vlog_config_internal", + "-labsl_log_internal_check_op", + "-labsl_log_internal_message", + "-labsl_log_internal_nullguard", diff --git a/recipe/patches/0021-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch similarity index 90% rename from recipe/patches/0021-Update-flatbuffers-static-assert.patch rename to recipe/patches/0023-Update-flatbuffers-static-assert.patch index f1a997f5..8a638820 100644 --- a/recipe/patches/0021-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ -From b36b0fe3cccc9cb91e2fdbbae46a3358ea1ee3bb Mon Sep 17 00:00:00 2001 +From cd1fce87063081da7f3643dffc2a69e0f0026500 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 21/21] Update flatbuffers static assert +Subject: [PATCH 23/23] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- From e5de23931e806567cb671a329b40f784f93317c8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 13:20:08 +1100 Subject: [PATCH 24/48] remaining rerebase diff --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3c5f1d60..76e4bdab 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,8 +26,8 @@ source: - patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch # [(cuda_compiler_version or "").startswith("11")] - patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch - patches/0017-Use-PYTHON-for-build-wheel.patch - - patches/0018-Always-use-linux-sed-style.patch - - patches/0019-Adjust-relative-path-for-libdevice.patch + - patches/0018-Always-use-Linux-sed-style.patch + - patches/0019-Adjust-relative-path-for-libdevice.patch # [(cuda_compiler_version or "").startswith("12")] # https://github.com/tensorflow/tensorflow/pull/62684 - patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch - patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch From 0a898430463cecb5bb37d253ab60d2c14d9fd3ca Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:52 +1100 Subject: [PATCH 25/48] add patch for absl_string_view Suggested-By: Jinzhe Zeng --- recipe/meta.yaml | 1 + recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 2 +- ...Definition-for-libabsl_vlog_config_i.patch | 2 +- ...023-Update-flatbuffers-static-assert.patch | 2 +- .../0024-add-absl_string_view-target.patch | 32 +++++++++++++++++++ 25 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 recipe/patches/0024-add-absl_string_view-target.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 76e4bdab..6c32c97f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,6 +33,7 @@ source: - patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch - patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch - patches/0023-Update-flatbuffers-static-assert.patch + - patches/0024-add-absl_string_view-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 4b747423..5ae01fe9 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/23] loosen requirements +Subject: [PATCH 01/24] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 79150cd9..5efbad15 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/23] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/24] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index 87bce2c6..85dddf91 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/23] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/24] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index 180e78d0..a7d0608e 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/23] Fix missing abseil linkages +Subject: [PATCH 04/24] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index a313313d..6d76d5ec 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/23] Fix protobuf_python for systemlibs +Subject: [PATCH 05/24] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index eb27ffb9..3aa98737 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/23] Add absl_log systemlib +Subject: [PATCH 06/24] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 473b480d..c9d2a20a 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/23] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/24] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index 563733fe..df2496aa 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/23] Fix further abseil linkage +Subject: [PATCH 08/24] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index 2d362f96..e79968c8 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/23] Add constraint to pybind11 systemlib +Subject: [PATCH 09/24] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index d1ced7f6..e3cb8a8d 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/23] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/24] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index e7896865..15f97fdf 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/23] Use correct, hermetic python +Subject: [PATCH 11/24] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index dfa4597b..a5f065e7 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/23] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/24] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index 268e2d86..b8aff687 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/23] Add protobuf toolchain +Subject: [PATCH 13/24] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index 72a134bf..e3ee19ed 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/23] fix genproto +Subject: [PATCH 14/24] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index 1d47e1cd..5073f835 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/23] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/24] 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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 45bd1295..7fc0c27f 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/23] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/24] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index 11e58cbb..46ebf2ae 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/23] Use PYTHON for build wheel +Subject: [PATCH 17/24] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index fd8c805e..731c2a43 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/23] Always use Linux-sed style +Subject: [PATCH 18/24] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index b118bf7f..43cb0139 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/23] Adjust relative path for libdevice +Subject: [PATCH 19/24] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index 2c9b7782..216b1dbd 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/23] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/24] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch index 50209c80..efafa5a9 100644 --- a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 21/23] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 21/24] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index bb6623e1..bd175401 100644 --- a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 22/23] Update ABSL Log Definition for +Subject: [PATCH 22/24] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index 8a638820..a21073ff 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ From cd1fce87063081da7f3643dffc2a69e0f0026500 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 23/23] Update flatbuffers static assert +Subject: [PATCH 23/24] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch new file mode 100644 index 00000000..9b1836d7 --- /dev/null +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -0,0 +1,32 @@ +From ef06083ab34f9f809faa25077bdae82fee5d0b0a Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sun, 12 May 2024 18:45:03 +1100 +Subject: [PATCH 24/24] add absl_string_view target + +--- + third_party/absl/system.absl.strings.BUILD | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/third_party/absl/system.absl.strings.BUILD b/third_party/absl/system.absl.strings.BUILD +index d04776c98bf..573d6c2f32d 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") + + package(default_visibility = ["//visibility:public"]) + ++cc_library( ++ name = "string_view", ++ linkopts = ["-labsl_string_view"], ++ deps = [ ++ "//absl/base", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:nullability", ++ "//absl/base:throw_delegate", ++ ], ++) ++ + cc_library( + name = "strings", + linkopts = ["-labsl_strings"], From 47e2511fd8ba1d39aff877479374a2a21fb49d9a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:48:17 +1100 Subject: [PATCH 26/48] match flatbuffers version in patch with migrator --- recipe/patches/0023-Update-flatbuffers-static-assert.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index a21073ff..d1553a3e 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -20,7 +20,7 @@ index 675dfc9d8c9..6772d01b7d3 100644 - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && -+ FLATBUFFERS_VERSION_REVISION == 7, ++ FLATBUFFERS_VERSION_REVISION == 25, "Non-compatible flatbuffers version included"); namespace tflite { From bfffa02c072d36ac91e9c65b689142bc46636ca1 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:14:20 +1100 Subject: [PATCH 27/48] disable any_invocable patch --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6c32c97f..3f20437e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: patches: - patches/0001-loosen-requirements.patch - patches/0002-Add-additional-absl_synchronization-linkage-to-gRPC.patch - - patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch + # - patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch - patches/0004-Fix-missing-abseil-linkages.patch - patches/0005-Fix-protobuf_python-for-systemlibs.patch - patches/0006-Add-absl_log-systemlib.patch From 4eb0699fb9dad6af027ed14d7c5560a0754e96e5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:31:31 +1100 Subject: [PATCH 28/48] more abseil target patching --- recipe/meta.yaml | 1 + recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 2 +- ...Definition-for-libabsl_vlog_config_i.patch | 2 +- ...023-Update-flatbuffers-static-assert.patch | 4 +-- .../0024-add-absl_string_view-target.patch | 2 +- .../0025-add-absl_nullability-target.patch | 28 +++++++++++++++++++ 26 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 recipe/patches/0025-add-absl_nullability-target.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3f20437e..659444cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,6 +34,7 @@ source: - patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch - patches/0023-Update-flatbuffers-static-assert.patch - patches/0024-add-absl_string_view-target.patch + - patches/0025-add-absl_nullability-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 5ae01fe9..793ec3c2 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/24] loosen requirements +Subject: [PATCH 01/25] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 5efbad15..da5e7e56 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/24] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/25] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index 85dddf91..a0d5a624 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/24] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/25] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index a7d0608e..25d1e015 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/24] Fix missing abseil linkages +Subject: [PATCH 04/25] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index 6d76d5ec..01440cc2 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/24] Fix protobuf_python for systemlibs +Subject: [PATCH 05/25] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index 3aa98737..d62355f7 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/24] Add absl_log systemlib +Subject: [PATCH 06/25] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index c9d2a20a..945af06a 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/24] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/25] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index df2496aa..3f2a977a 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/24] Fix further abseil linkage +Subject: [PATCH 08/25] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index e79968c8..d440b5db 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/24] Add constraint to pybind11 systemlib +Subject: [PATCH 09/25] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index e3cb8a8d..aef27aba 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/24] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/25] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index 15f97fdf..832e0dcd 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/24] Use correct, hermetic python +Subject: [PATCH 11/25] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index a5f065e7..b5a22118 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/24] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/25] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index b8aff687..5396a438 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/24] Add protobuf toolchain +Subject: [PATCH 13/25] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index e3ee19ed..8b06cbf2 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/24] fix genproto +Subject: [PATCH 14/25] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index 5073f835..4402b55e 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/24] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/25] 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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 7fc0c27f..b27896b6 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/24] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/25] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index 46ebf2ae..55fbc056 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/24] Use PYTHON for build wheel +Subject: [PATCH 17/25] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index 731c2a43..93b07554 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/24] Always use Linux-sed style +Subject: [PATCH 18/25] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index 43cb0139..39617600 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/24] Adjust relative path for libdevice +Subject: [PATCH 19/25] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index 216b1dbd..a459b721 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/24] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/25] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch index efafa5a9..11f92a67 100644 --- a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 21/24] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 21/25] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index bd175401..73376355 100644 --- a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 22/24] Update ABSL Log Definition for +Subject: [PATCH 22/25] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index d1553a3e..b8d3acce 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ From cd1fce87063081da7f3643dffc2a69e0f0026500 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 23/24] Update flatbuffers static assert +Subject: [PATCH 23/25] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- @@ -20,7 +20,7 @@ index 675dfc9d8c9..6772d01b7d3 100644 - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && -+ FLATBUFFERS_VERSION_REVISION == 25, ++ FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); namespace tflite { diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch index 9b1836d7..2853a794 100644 --- a/recipe/patches/0024-add-absl_string_view-target.patch +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -1,7 +1,7 @@ From ef06083ab34f9f809faa25077bdae82fee5d0b0a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 -Subject: [PATCH 24/24] add absl_string_view target +Subject: [PATCH 24/25] add absl_string_view target --- third_party/absl/system.absl.strings.BUILD | 12 ++++++++++++ diff --git a/recipe/patches/0025-add-absl_nullability-target.patch b/recipe/patches/0025-add-absl_nullability-target.patch new file mode 100644 index 00000000..d23da925 --- /dev/null +++ b/recipe/patches/0025-add-absl_nullability-target.patch @@ -0,0 +1,28 @@ +From cf2589d28ae17e3aad343d418b90c9a20a612633 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sun, 12 May 2024 19:30:44 +1100 +Subject: [PATCH 25/25] 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 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( + ], + ) + ++cc_library( ++ name = "nullability", ++ deps = [ ++ ":core_headers", ++ "//absl/meta:type_traits", ++ ], ++) ++ + cc_library( + name = "raw_logging_internal", + linkopts = [ From d5840e0bf71a58156171ed8bb66a34439c1ed631 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:30:12 +1100 Subject: [PATCH 29/48] add absl_prefetch --- recipe/meta.yaml | 1 + recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 2 +- ...Definition-for-libabsl_vlog_config_i.patch | 2 +- ...023-Update-flatbuffers-static-assert.patch | 2 +- .../0024-add-absl_string_view-target.patch | 2 +- .../0025-add-absl_nullability-target.patch | 2 +- recipe/patches/0026-add-absl_prefetch.patch | 28 +++++++++++++++++++ 27 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 recipe/patches/0026-add-absl_prefetch.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 659444cc..3a874222 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,6 +35,7 @@ source: - patches/0023-Update-flatbuffers-static-assert.patch - patches/0024-add-absl_string_view-target.patch - patches/0025-add-absl_nullability-target.patch + - patches/0026-add-absl_prefetch.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 793ec3c2..abf1a994 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/25] loosen requirements +Subject: [PATCH 01/26] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 da5e7e56..19629b76 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/25] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/26] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index a0d5a624..06c69fb5 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/25] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/26] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index 25d1e015..281175b5 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/25] Fix missing abseil linkages +Subject: [PATCH 04/26] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index 01440cc2..f378375e 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/25] Fix protobuf_python for systemlibs +Subject: [PATCH 05/26] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index d62355f7..36804654 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/25] Add absl_log systemlib +Subject: [PATCH 06/26] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 945af06a..86ffd951 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/25] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/26] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index 3f2a977a..bdcdbe37 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/25] Fix further abseil linkage +Subject: [PATCH 08/26] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index d440b5db..4c629177 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/25] Add constraint to pybind11 systemlib +Subject: [PATCH 09/26] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index aef27aba..5f828885 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/25] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/26] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index 832e0dcd..49d56c7d 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/25] Use correct, hermetic python +Subject: [PATCH 11/26] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index b5a22118..cebaccd5 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/25] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/26] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index 5396a438..b6612d02 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/25] Add protobuf toolchain +Subject: [PATCH 13/26] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index 8b06cbf2..ea71dec6 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/25] fix genproto +Subject: [PATCH 14/26] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index 4402b55e..1eca0f9a 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/25] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/26] 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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index b27896b6..66303858 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/25] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/26] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index 55fbc056..3647123a 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/25] Use PYTHON for build wheel +Subject: [PATCH 17/26] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index 93b07554..9e5fecc8 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/25] Always use Linux-sed style +Subject: [PATCH 18/26] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index 39617600..3f41d9af 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/25] Adjust relative path for libdevice +Subject: [PATCH 19/26] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index a459b721..cfbf6bcd 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/25] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/26] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch index 11f92a67..66ab0758 100644 --- a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 21/25] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 21/26] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index 73376355..d924468b 100644 --- a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 22/25] Update ABSL Log Definition for +Subject: [PATCH 22/26] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index b8d3acce..18a5eb4c 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ From cd1fce87063081da7f3643dffc2a69e0f0026500 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 23/25] Update flatbuffers static assert +Subject: [PATCH 23/26] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch index 2853a794..58164adc 100644 --- a/recipe/patches/0024-add-absl_string_view-target.patch +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -1,7 +1,7 @@ From ef06083ab34f9f809faa25077bdae82fee5d0b0a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 -Subject: [PATCH 24/25] add absl_string_view target +Subject: [PATCH 24/26] add absl_string_view target --- third_party/absl/system.absl.strings.BUILD | 12 ++++++++++++ diff --git a/recipe/patches/0025-add-absl_nullability-target.patch b/recipe/patches/0025-add-absl_nullability-target.patch index d23da925..d0ae6c9d 100644 --- a/recipe/patches/0025-add-absl_nullability-target.patch +++ b/recipe/patches/0025-add-absl_nullability-target.patch @@ -1,7 +1,7 @@ From cf2589d28ae17e3aad343d418b90c9a20a612633 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 -Subject: [PATCH 25/25] add absl_nullability target +Subject: [PATCH 25/26] add absl_nullability target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0026-add-absl_prefetch.patch b/recipe/patches/0026-add-absl_prefetch.patch new file mode 100644 index 00000000..fe25ebaa --- /dev/null +++ b/recipe/patches/0026-add-absl_prefetch.patch @@ -0,0 +1,28 @@ +From 5aa0e123090fd527e29031a8c525f1e0185c59ce Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sun, 12 May 2024 22:29:25 +1100 +Subject: [PATCH 26/26] add absl_prefetch + +--- + 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 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( + ], + ) + ++cc_library( ++ name = "prefetch", ++ deps = [ ++ ":config", ++ ":core_headers", ++ ], ++) ++ + cc_library( + name = "strerror", + linkopts = ["-labsl_strerror"], From 2547bda73ded56698e5e5f492b66673f1c559e40 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:47:13 +1100 Subject: [PATCH 30/48] add absl_die_if_null --- recipe/meta.yaml | 3 +- recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 2 +- ...Definition-for-libabsl_vlog_config_i.patch | 2 +- ...023-Update-flatbuffers-static-assert.patch | 2 +- .../0024-add-absl_string_view-target.patch | 2 +- .../0025-add-absl_nullability-target.patch | 2 +- ...ch => 0026-add-absl_prefetch-target.patch} | 4 +-- .../0027-add-absl_die_if_null-target.patch | 31 +++++++++++++++++++ 28 files changed, 60 insertions(+), 28 deletions(-) rename recipe/patches/{0026-add-absl_prefetch.patch => 0026-add-absl_prefetch-target.patch} (84%) create mode 100644 recipe/patches/0027-add-absl_die_if_null-target.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3a874222..be254f46 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -35,7 +35,8 @@ source: - patches/0023-Update-flatbuffers-static-assert.patch - patches/0024-add-absl_string_view-target.patch - patches/0025-add-absl_nullability-target.patch - - patches/0026-add-absl_prefetch.patch + - patches/0026-add-absl_prefetch-target.patch + - patches/0027-add-absl_die_if_null-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 abf1a994..16e5b3cb 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/26] loosen requirements +Subject: [PATCH 01/27] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 19629b76..d9bdc84c 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/26] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/27] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index 06c69fb5..0eec7165 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/26] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/27] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index 281175b5..ed47c32b 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/26] Fix missing abseil linkages +Subject: [PATCH 04/27] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index f378375e..9c6359de 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/26] Fix protobuf_python for systemlibs +Subject: [PATCH 05/27] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index 36804654..b0ebe950 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/26] Add absl_log systemlib +Subject: [PATCH 06/27] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 86ffd951..f0946b75 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/26] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/27] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index bdcdbe37..997d3f5f 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/26] Fix further abseil linkage +Subject: [PATCH 08/27] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index 4c629177..2cb74ac8 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/26] Add constraint to pybind11 systemlib +Subject: [PATCH 09/27] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index 5f828885..e94af32e 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/26] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/27] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index 49d56c7d..f8a7cd54 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/26] Use correct, hermetic python +Subject: [PATCH 11/27] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index cebaccd5..acd264c3 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/26] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/27] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index b6612d02..d09a5949 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/26] Add protobuf toolchain +Subject: [PATCH 13/27] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index ea71dec6..5fc8640d 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/26] fix genproto +Subject: [PATCH 14/27] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index 1eca0f9a..66fff218 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/26] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/27] 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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 66303858..976bf47b 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/26] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/27] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index 3647123a..40dfe896 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/26] Use PYTHON for build wheel +Subject: [PATCH 17/27] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index 9e5fecc8..2e1549c1 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/26] Always use Linux-sed style +Subject: [PATCH 18/27] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index 3f41d9af..c764a579 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/26] Adjust relative path for libdevice +Subject: [PATCH 19/27] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index cfbf6bcd..5cb41c95 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/26] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/27] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch index 66ab0758..8944a5df 100644 --- a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 21/26] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 21/27] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index d924468b..acc57f87 100644 --- a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 22/26] Update ABSL Log Definition for +Subject: [PATCH 22/27] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index 18a5eb4c..576cda31 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ From cd1fce87063081da7f3643dffc2a69e0f0026500 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 23/26] Update flatbuffers static assert +Subject: [PATCH 23/27] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch index 58164adc..d219950a 100644 --- a/recipe/patches/0024-add-absl_string_view-target.patch +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -1,7 +1,7 @@ From ef06083ab34f9f809faa25077bdae82fee5d0b0a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 -Subject: [PATCH 24/26] add absl_string_view target +Subject: [PATCH 24/27] add absl_string_view target --- third_party/absl/system.absl.strings.BUILD | 12 ++++++++++++ diff --git a/recipe/patches/0025-add-absl_nullability-target.patch b/recipe/patches/0025-add-absl_nullability-target.patch index d0ae6c9d..e987a178 100644 --- a/recipe/patches/0025-add-absl_nullability-target.patch +++ b/recipe/patches/0025-add-absl_nullability-target.patch @@ -1,7 +1,7 @@ From cf2589d28ae17e3aad343d418b90c9a20a612633 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 -Subject: [PATCH 25/26] add absl_nullability target +Subject: [PATCH 25/27] add absl_nullability target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0026-add-absl_prefetch.patch b/recipe/patches/0026-add-absl_prefetch-target.patch similarity index 84% rename from recipe/patches/0026-add-absl_prefetch.patch rename to recipe/patches/0026-add-absl_prefetch-target.patch index fe25ebaa..972c76b4 100644 --- a/recipe/patches/0026-add-absl_prefetch.patch +++ b/recipe/patches/0026-add-absl_prefetch-target.patch @@ -1,7 +1,7 @@ -From 5aa0e123090fd527e29031a8c525f1e0185c59ce Mon Sep 17 00:00:00 2001 +From 7f11c46aa27e91d2d2a628d1679d7f584895d757 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 -Subject: [PATCH 26/26] add absl_prefetch +Subject: [PATCH 26/27] add absl_prefetch target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0027-add-absl_die_if_null-target.patch b/recipe/patches/0027-add-absl_die_if_null-target.patch new file mode 100644 index 00000000..ef15b444 --- /dev/null +++ b/recipe/patches/0027-add-absl_die_if_null-target.patch @@ -0,0 +1,31 @@ +From dd75a82943aca2e655d783c1b2ea18af6ddab030 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sun, 12 May 2024 22:46:04 +1100 +Subject: [PATCH 27/27] add absl_die_if_null target + +--- + third_party/absl/system.absl.log.BUILD | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD +index 1fe1e342594..d6c3b50b01b 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") + + package(default_visibility = ["//visibility:public"]) + ++cc_library( ++ name = "die_if_null", ++ linkopts = ["-libabsl_die_if_null"], ++ deps = [ ++ ":log", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/strings", ++ ], ++) ++ + cc_library( + name = "log", + linkopts = [ From a14db6911b4cea524568e324a291f7451f2754e0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:42:09 +1100 Subject: [PATCH 31/48] add absl_crc32c --- recipe/meta.yaml | 1 + recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 2 +- ...Definition-for-libabsl_vlog_config_i.patch | 2 +- ...023-Update-flatbuffers-static-assert.patch | 2 +- .../0024-add-absl_string_view-target.patch | 2 +- .../0025-add-absl_nullability-target.patch | 2 +- .../0026-add-absl_prefetch-target.patch | 2 +- .../0027-add-absl_die_if_null-target.patch | 2 +- .../patches/0028-add-absl_crc32c-target.patch | 53 +++++++++++++++++++ 29 files changed, 81 insertions(+), 27 deletions(-) create mode 100644 recipe/patches/0028-add-absl_crc32c-target.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index be254f46..c7b959b8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,6 +37,7 @@ source: - patches/0025-add-absl_nullability-target.patch - patches/0026-add-absl_prefetch-target.patch - patches/0027-add-absl_die_if_null-target.patch + - patches/0028-add-absl_crc32c-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 16e5b3cb..35d90fe4 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e 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/28] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 d9bdc84c..7ae27a1f 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f 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/28] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index 0eec7165..0304c723 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/27] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/28] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index ed47c32b..08ba30f5 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/27] Fix missing abseil linkages +Subject: [PATCH 04/28] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index 9c6359de..7b70d067 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/27] Fix protobuf_python for systemlibs +Subject: [PATCH 05/28] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index b0ebe950..81c1a8f0 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/27] Add absl_log systemlib +Subject: [PATCH 06/28] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index f0946b75..cf4be42a 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/27] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/28] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index 997d3f5f..3b181471 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/27] Fix further abseil linkage +Subject: [PATCH 08/28] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index 2cb74ac8..0eb79a7b 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/27] Add constraint to pybind11 systemlib +Subject: [PATCH 09/28] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index e94af32e..de97bc82 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/27] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/28] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index f8a7cd54..b35537c4 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/27] Use correct, hermetic python +Subject: [PATCH 11/28] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index acd264c3..bb5f9405 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/27] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/28] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index d09a5949..5d4953ce 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/27] Add protobuf toolchain +Subject: [PATCH 13/28] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index 5fc8640d..919710aa 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/27] fix genproto +Subject: [PATCH 14/28] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index 66fff218..ced3c87d 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/27] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/28] 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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 976bf47b..2139f2c9 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/27] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/28] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index 40dfe896..f3220ee2 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/27] Use PYTHON for build wheel +Subject: [PATCH 17/28] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index 2e1549c1..a140377a 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/27] Always use Linux-sed style +Subject: [PATCH 18/28] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index c764a579..bc84e81e 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/27] Adjust relative path for libdevice +Subject: [PATCH 19/28] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index 5cb41c95..2966d512 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/27] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/28] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch index 8944a5df..7c0276a5 100644 --- a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 21/27] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 21/28] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index acc57f87..c51cffdc 100644 --- a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 22/27] Update ABSL Log Definition for +Subject: [PATCH 22/28] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index 576cda31..d3262adb 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ From cd1fce87063081da7f3643dffc2a69e0f0026500 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 23/27] Update flatbuffers static assert +Subject: [PATCH 23/28] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch index d219950a..a3eb655b 100644 --- a/recipe/patches/0024-add-absl_string_view-target.patch +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -1,7 +1,7 @@ From ef06083ab34f9f809faa25077bdae82fee5d0b0a Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 -Subject: [PATCH 24/27] add absl_string_view target +Subject: [PATCH 24/28] add absl_string_view target --- third_party/absl/system.absl.strings.BUILD | 12 ++++++++++++ diff --git a/recipe/patches/0025-add-absl_nullability-target.patch b/recipe/patches/0025-add-absl_nullability-target.patch index e987a178..b71bd464 100644 --- a/recipe/patches/0025-add-absl_nullability-target.patch +++ b/recipe/patches/0025-add-absl_nullability-target.patch @@ -1,7 +1,7 @@ From cf2589d28ae17e3aad343d418b90c9a20a612633 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 -Subject: [PATCH 25/27] add absl_nullability target +Subject: [PATCH 25/28] add absl_nullability target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0026-add-absl_prefetch-target.patch b/recipe/patches/0026-add-absl_prefetch-target.patch index 972c76b4..834be6c7 100644 --- a/recipe/patches/0026-add-absl_prefetch-target.patch +++ b/recipe/patches/0026-add-absl_prefetch-target.patch @@ -1,7 +1,7 @@ From 7f11c46aa27e91d2d2a628d1679d7f584895d757 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 -Subject: [PATCH 26/27] add absl_prefetch target +Subject: [PATCH 26/28] add absl_prefetch target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0027-add-absl_die_if_null-target.patch b/recipe/patches/0027-add-absl_die_if_null-target.patch index ef15b444..ccc2eccb 100644 --- a/recipe/patches/0027-add-absl_die_if_null-target.patch +++ b/recipe/patches/0027-add-absl_die_if_null-target.patch @@ -1,7 +1,7 @@ From dd75a82943aca2e655d783c1b2ea18af6ddab030 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:46:04 +1100 -Subject: [PATCH 27/27] add absl_die_if_null target +Subject: [PATCH 27/28] add absl_die_if_null target --- third_party/absl/system.absl.log.BUILD | 11 +++++++++++ diff --git a/recipe/patches/0028-add-absl_crc32c-target.patch b/recipe/patches/0028-add-absl_crc32c-target.patch new file mode 100644 index 00000000..c1cf8dcc --- /dev/null +++ b/recipe/patches/0028-add-absl_crc32c-target.patch @@ -0,0 +1,53 @@ +From 919b803ee8f6e0cb0c1fe75244281718624f2d1f Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Mon, 13 May 2024 09:41:09 +1100 +Subject: [PATCH 28/28] add absl_crc32c target + +--- + third_party/absl/system.absl.crc.BUILD | 24 ++++++++++++++++++++++++ + third_party/absl/workspace.bzl | 1 + + 2 files changed, 25 insertions(+) + create mode 100644 third_party/absl/system.absl.crc.BUILD + +diff --git a/third_party/absl/system.absl.crc.BUILD b/third_party/absl/system.absl.crc.BUILD +new file mode 100644 +index 00000000000..60c81a4e518 +--- /dev/null ++++ b/third_party/absl/system.absl.crc.BUILD +@@ -0,0 +1,24 @@ ++load("@rules_cc//cc:defs.bzl", "cc_library") ++ ++package(default_visibility = ["//visibility:public"]) ++ ++cc_library( ++ name = "crc32c", ++ linkopts = [ ++ "-labsl_crc32c", ++ "-labsl_crc_cord_state", ++ "-labsl_crc_cpu_detect", ++ "-labsl_crc_internal", ++ ], ++ deps = [ ++ ":cpu_detect", ++ ":crc_internal", ++ ":non_temporal_memcpy", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:endian", ++ "//absl/base:prefetch", ++ "//absl/strings", ++ "//absl/strings:str_format", ++ ], ++) +diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl +index c54df3cfbae..94ee77bb7d2 100644 +--- a/third_party/absl/workspace.bzl ++++ b/third_party/absl/workspace.bzl +@@ -14,6 +14,7 @@ def repo(): + SYS_DIRS = [ + "algorithm", + "base", ++ "crc", + "cleanup", + "container", + "debugging", From b186a89394914010152441a3b33cd05a66ae7277 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 10:14:37 +1100 Subject: [PATCH 32/48] add dependent crc targets --- recipe/meta.yaml | 2 +- ...tch => 0028-add-absl_crc32c-targets.patch} | 58 +++++++++++++++++-- 2 files changed, 53 insertions(+), 7 deletions(-) rename recipe/patches/{0028-add-absl_crc32c-target.patch => 0028-add-absl_crc32c-targets.patch} (52%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c7b959b8..d66013fd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,7 +37,7 @@ source: - patches/0025-add-absl_nullability-target.patch - patches/0026-add-absl_prefetch-target.patch - patches/0027-add-absl_die_if_null-target.patch - - patches/0028-add-absl_crc32c-target.patch + - patches/0028-add-absl_crc32c-targets.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-add-absl_crc32c-target.patch b/recipe/patches/0028-add-absl_crc32c-targets.patch similarity index 52% rename from recipe/patches/0028-add-absl_crc32c-target.patch rename to recipe/patches/0028-add-absl_crc32c-targets.patch index c1cf8dcc..2a17887b 100644 --- a/recipe/patches/0028-add-absl_crc32c-target.patch +++ b/recipe/patches/0028-add-absl_crc32c-targets.patch @@ -1,20 +1,20 @@ -From 919b803ee8f6e0cb0c1fe75244281718624f2d1f Mon Sep 17 00:00:00 2001 +From b3f83eb9bd6aae6d68332b80b201b2ea38dab5df Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:41:09 +1100 -Subject: [PATCH 28/28] add absl_crc32c target +Subject: [PATCH 28/28] add absl_crc32c targets --- - third_party/absl/system.absl.crc.BUILD | 24 ++++++++++++++++++++++++ + third_party/absl/system.absl.crc.BUILD | 70 ++++++++++++++++++++++++++ third_party/absl/workspace.bzl | 1 + - 2 files changed, 25 insertions(+) + 2 files changed, 71 insertions(+) create mode 100644 third_party/absl/system.absl.crc.BUILD diff --git a/third_party/absl/system.absl.crc.BUILD b/third_party/absl/system.absl.crc.BUILD new file mode 100644 -index 00000000000..60c81a4e518 +index 00000000000..487c36ff45b --- /dev/null +++ b/third_party/absl/system.absl.crc.BUILD -@@ -0,0 +1,24 @@ +@@ -0,0 +1,70 @@ +load("@rules_cc//cc:defs.bzl", "cc_library") + +package(default_visibility = ["//visibility:public"]) @@ -39,6 +39,52 @@ index 00000000000..60c81a4e518 + "//absl/strings:str_format", + ], +) ++ ++cc_library( ++ name = "cpu_detect", ++ visibility = ["//visibility:private"], ++ deps = [ ++ "//absl/base", ++ "//absl/base:config", ++ ], ++) ++ ++cc_library( ++ name = "crc_internal", ++ visibility = ["//visibility:private"], ++ deps = [ ++ ":cpu_detect", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:endian", ++ "//absl/base:prefetch", ++ "//absl/base:raw_logging_internal", ++ "//absl/memory", ++ "//absl/numeric:bits", ++ ], ++) ++ ++cc_library( ++ name = "non_temporal_memcpy", ++ visibility = [ ++ ":__pkg__", ++ ], ++ deps = [ ++ ":non_temporal_arm_intrinsics", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ ], ++) ++ ++cc_library( ++ name = "non_temporal_arm_intrinsics", ++ visibility = [ ++ ":__pkg__", ++ ], ++ deps = [ ++ "//absl/base:config", ++ ], ++) diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl index c54df3cfbae..94ee77bb7d2 100644 --- a/third_party/absl/workspace.bzl From fd9a0677aee3ba98ec2da41c6cdb1d1fbe4b3e5f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 10:33:57 +1100 Subject: [PATCH 33/48] actually update flatbuffers patch --- recipe/patches/0023-Update-flatbuffers-static-assert.patch | 6 +++--- recipe/patches/0024-add-absl_string_view-target.patch | 2 +- recipe/patches/0025-add-absl_nullability-target.patch | 2 +- recipe/patches/0026-add-absl_prefetch-target.patch | 2 +- recipe/patches/0027-add-absl_die_if_null-target.patch | 2 +- recipe/patches/0028-add-absl_crc32c-targets.patch | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index d3262adb..ed57406a 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,4 +1,4 @@ -From cd1fce87063081da7f3643dffc2a69e0f0026500 Mon Sep 17 00:00:00 2001 +From ebbe28d3e1fb1bb3e62c09d32971781c464940f5 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 Subject: [PATCH 23/28] Update flatbuffers static assert @@ -8,7 +8,7 @@ Subject: [PATCH 23/28] Update flatbuffers static assert 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tensorflow/lite/acceleration/configuration/configuration_generated.h b/tensorflow/lite/acceleration/configuration/configuration_generated.h -index 675dfc9d8c9..6772d01b7d3 100644 +index 675dfc9d8c9..1d6e59fef30 100644 --- a/tensorflow/lite/acceleration/configuration/configuration_generated.h +++ b/tensorflow/lite/acceleration/configuration/configuration_generated.h @@ -22,9 +22,9 @@ limitations under the License. @@ -20,7 +20,7 @@ index 675dfc9d8c9..6772d01b7d3 100644 - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && -+ FLATBUFFERS_VERSION_REVISION == 7, ++ FLATBUFFERS_VERSION_REVISION == 25, "Non-compatible flatbuffers version included"); namespace tflite { diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch index a3eb655b..c3895011 100644 --- a/recipe/patches/0024-add-absl_string_view-target.patch +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -1,4 +1,4 @@ -From ef06083ab34f9f809faa25077bdae82fee5d0b0a Mon Sep 17 00:00:00 2001 +From c22619432afb58caf2b50814a7fbc3a72552c3b2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 Subject: [PATCH 24/28] add absl_string_view target diff --git a/recipe/patches/0025-add-absl_nullability-target.patch b/recipe/patches/0025-add-absl_nullability-target.patch index b71bd464..57e17948 100644 --- a/recipe/patches/0025-add-absl_nullability-target.patch +++ b/recipe/patches/0025-add-absl_nullability-target.patch @@ -1,4 +1,4 @@ -From cf2589d28ae17e3aad343d418b90c9a20a612633 Mon Sep 17 00:00:00 2001 +From 2c7f29d8292e71e71c36d53a0e16f76ae38c10ce Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 Subject: [PATCH 25/28] add absl_nullability target diff --git a/recipe/patches/0026-add-absl_prefetch-target.patch b/recipe/patches/0026-add-absl_prefetch-target.patch index 834be6c7..d0120609 100644 --- a/recipe/patches/0026-add-absl_prefetch-target.patch +++ b/recipe/patches/0026-add-absl_prefetch-target.patch @@ -1,4 +1,4 @@ -From 7f11c46aa27e91d2d2a628d1679d7f584895d757 Mon Sep 17 00:00:00 2001 +From ca71b607eb6be971ec18a77913916f66d19fd1c0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 Subject: [PATCH 26/28] add absl_prefetch target diff --git a/recipe/patches/0027-add-absl_die_if_null-target.patch b/recipe/patches/0027-add-absl_die_if_null-target.patch index ccc2eccb..72681d38 100644 --- a/recipe/patches/0027-add-absl_die_if_null-target.patch +++ b/recipe/patches/0027-add-absl_die_if_null-target.patch @@ -1,4 +1,4 @@ -From dd75a82943aca2e655d783c1b2ea18af6ddab030 Mon Sep 17 00:00:00 2001 +From 70b435a5337e7660c746f8fd8d0c72b9a12e69b7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:46:04 +1100 Subject: [PATCH 27/28] add absl_die_if_null target diff --git a/recipe/patches/0028-add-absl_crc32c-targets.patch b/recipe/patches/0028-add-absl_crc32c-targets.patch index 2a17887b..5d7204ac 100644 --- a/recipe/patches/0028-add-absl_crc32c-targets.patch +++ b/recipe/patches/0028-add-absl_crc32c-targets.patch @@ -1,4 +1,4 @@ -From b3f83eb9bd6aae6d68332b80b201b2ea38dab5df Mon Sep 17 00:00:00 2001 +From c935573e985f0fd8a84e9ccf83b8582884417305 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:41:09 +1100 Subject: [PATCH 28/28] add absl_crc32c targets From fd58fc18fbcf8d376f5c64fcbf3f4e6ce5dbc769 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 15:05:57 +1100 Subject: [PATCH 34/48] add patch for disambiguating TritonWrapperResult --- recipe/meta.yaml | 1 + recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 2 +- ...Definition-for-libabsl_vlog_config_i.patch | 2 +- ...023-Update-flatbuffers-static-assert.patch | 2 +- .../0024-add-absl_string_view-target.patch | 2 +- .../0025-add-absl_nullability-target.patch | 2 +- .../0026-add-absl_prefetch-target.patch | 2 +- .../0027-add-absl_die_if_null-target.patch | 2 +- .../0028-add-absl_crc32c-targets.patch | 2 +- ...ity-in-conversion-to-absl-StatusOr-T.patch | 29 +++++++++++++++++++ 30 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d66013fd..8403538a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,6 +38,7 @@ source: - patches/0026-add-absl_prefetch-target.patch - patches/0027-add-absl_die_if_null-target.patch - patches/0028-add-absl_crc32c-targets.patch + - patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-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/0001-loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch index 35d90fe4..5d2431cb 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/28] loosen requirements +Subject: [PATCH 01/29] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 7ae27a1f..37d277c4 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/28] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/29] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index 0304c723..5833d8a1 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/28] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/29] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index 08ba30f5..ec68728f 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/28] Fix missing abseil linkages +Subject: [PATCH 04/29] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index 7b70d067..be34661c 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/28] Fix protobuf_python for systemlibs +Subject: [PATCH 05/29] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index 81c1a8f0..0346ef3f 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/28] Add absl_log systemlib +Subject: [PATCH 06/29] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index cf4be42a..2c4c782d 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/28] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/29] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index 3b181471..61564815 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/28] Fix further abseil linkage +Subject: [PATCH 08/29] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index 0eb79a7b..582eb2d3 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/28] Add constraint to pybind11 systemlib +Subject: [PATCH 09/29] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index de97bc82..2ad9bc0d 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/28] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/29] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index b35537c4..05c587b6 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/28] Use correct, hermetic python +Subject: [PATCH 11/29] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index bb5f9405..3b2280af 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/28] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/29] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index 5d4953ce..fde96803 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/28] Add protobuf toolchain +Subject: [PATCH 13/29] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index 919710aa..e867bc41 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/28] fix genproto +Subject: [PATCH 14/29] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index ced3c87d..f3e5f630 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/28] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 2139f2c9..9aec1318 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/28] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/29] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index f3220ee2..bd6158fd 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/28] Use PYTHON for build wheel +Subject: [PATCH 17/29] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index a140377a..ecbb3970 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/28] Always use Linux-sed style +Subject: [PATCH 18/29] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index bc84e81e..3015e04d 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/28] Adjust relative path for libdevice +Subject: [PATCH 19/29] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index 2966d512..c15905e3 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/28] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/29] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch index 7c0276a5..16218cb7 100644 --- a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 21/28] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 21/29] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index c51cffdc..cdf0c1e7 100644 --- a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 22/28] Update ABSL Log Definition for +Subject: [PATCH 22/29] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index ed57406a..1f3d9cdd 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ From ebbe28d3e1fb1bb3e62c09d32971781c464940f5 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 23/28] Update flatbuffers static assert +Subject: [PATCH 23/29] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch index c3895011..2b6c045f 100644 --- a/recipe/patches/0024-add-absl_string_view-target.patch +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -1,7 +1,7 @@ From c22619432afb58caf2b50814a7fbc3a72552c3b2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 -Subject: [PATCH 24/28] add absl_string_view target +Subject: [PATCH 24/29] add absl_string_view target --- third_party/absl/system.absl.strings.BUILD | 12 ++++++++++++ diff --git a/recipe/patches/0025-add-absl_nullability-target.patch b/recipe/patches/0025-add-absl_nullability-target.patch index 57e17948..8ce9cbe4 100644 --- a/recipe/patches/0025-add-absl_nullability-target.patch +++ b/recipe/patches/0025-add-absl_nullability-target.patch @@ -1,7 +1,7 @@ From 2c7f29d8292e71e71c36d53a0e16f76ae38c10ce Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 -Subject: [PATCH 25/28] add absl_nullability target +Subject: [PATCH 25/29] add absl_nullability target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0026-add-absl_prefetch-target.patch b/recipe/patches/0026-add-absl_prefetch-target.patch index d0120609..a5b4e045 100644 --- a/recipe/patches/0026-add-absl_prefetch-target.patch +++ b/recipe/patches/0026-add-absl_prefetch-target.patch @@ -1,7 +1,7 @@ From ca71b607eb6be971ec18a77913916f66d19fd1c0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 -Subject: [PATCH 26/28] add absl_prefetch target +Subject: [PATCH 26/29] add absl_prefetch target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0027-add-absl_die_if_null-target.patch b/recipe/patches/0027-add-absl_die_if_null-target.patch index 72681d38..b84ea204 100644 --- a/recipe/patches/0027-add-absl_die_if_null-target.patch +++ b/recipe/patches/0027-add-absl_die_if_null-target.patch @@ -1,7 +1,7 @@ From 70b435a5337e7660c746f8fd8d0c72b9a12e69b7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:46:04 +1100 -Subject: [PATCH 27/28] add absl_die_if_null target +Subject: [PATCH 27/29] add absl_die_if_null target --- third_party/absl/system.absl.log.BUILD | 11 +++++++++++ diff --git a/recipe/patches/0028-add-absl_crc32c-targets.patch b/recipe/patches/0028-add-absl_crc32c-targets.patch index 5d7204ac..ff96ca3e 100644 --- a/recipe/patches/0028-add-absl_crc32c-targets.patch +++ b/recipe/patches/0028-add-absl_crc32c-targets.patch @@ -1,7 +1,7 @@ From c935573e985f0fd8a84e9ccf83b8582884417305 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:41:09 +1100 -Subject: [PATCH 28/28] add absl_crc32c targets +Subject: [PATCH 28/29] add absl_crc32c targets --- third_party/absl/system.absl.crc.BUILD | 70 ++++++++++++++++++++++++++ diff --git a/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch b/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch new file mode 100644 index 00000000..6af7e233 --- /dev/null +++ b/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch @@ -0,0 +1,29 @@ +From b3126ec5872366856b0d564ed92e423ed8a8ba23 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Mon, 13 May 2024 15:01:23 +1100 +Subject: [PATCH 29/29] avoid ambiguity in conversion to absl::StatusOr + +The function in question wants to return a `TritonWrapperResult`, see +https://github.com/tensorflow/tensorflow/blob/v2.16.1/third_party/xla/xla/service/gpu/ir_emitter_triton.cc#L2063 +where the inner type (in case of success) is just a simple struct, see +https://github.com/tensorflow/tensorflow/blob/v2.16.1/third_party/xla/xla/service/gpu/ir_emitter_triton.h#L40-L42 + +Explicitly instantiate the right type, rather than relying on finding +the right one in C++'s _many_ initialisation flavours. +--- + third_party/xla/xla/service/gpu/ir_emitter_triton.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/xla/xla/service/gpu/ir_emitter_triton.cc b/third_party/xla/xla/service/gpu/ir_emitter_triton.cc +index d535a52d42f..998e446d623 100644 +--- a/third_party/xla/xla/service/gpu/ir_emitter_triton.cc ++++ b/third_party/xla/xla/service/gpu/ir_emitter_triton.cc +@@ -2219,7 +2219,7 @@ absl::StatusOr TritonWrapper( + VerifyModule(*llvm_module); + } + +- return {{shared_mem_bytes}}; ++ return TritonWrapperResult{shared_mem_bytes}; + } + + } // namespace gpu From bdf8f3d208c2131df1b238eb12a89d1610b2f222 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 23:37:42 +1100 Subject: [PATCH 35/48] add absl_kernel_timeout_internal --- recipe/meta.yaml | 1 + recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 2 +- ...Definition-for-libabsl_vlog_config_i.patch | 2 +- ...023-Update-flatbuffers-static-assert.patch | 2 +- .../0024-add-absl_string_view-target.patch | 2 +- .../0025-add-absl_nullability-target.patch | 2 +- .../0026-add-absl_prefetch-target.patch | 2 +- .../0027-add-absl_die_if_null-target.patch | 8 ++-- .../0028-add-absl_crc32c-targets.patch | 4 +- ...ity-in-conversion-to-absl-StatusOr-T.patch | 4 +- ...0-add-kernel_timeout_internal-target.patch | 43 +++++++++++++++++++ 31 files changed, 78 insertions(+), 34 deletions(-) create mode 100644 recipe/patches/0030-add-kernel_timeout_internal-target.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8403538a..d9968b9a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,6 +39,7 @@ source: - patches/0027-add-absl_die_if_null-target.patch - patches/0028-add-absl_crc32c-targets.patch - patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch + - patches/0030-add-kernel_timeout_internal-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 5d2431cb..1aa88432 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/29] loosen requirements +Subject: [PATCH 01/30] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 37d277c4..d255eef5 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/29] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/30] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index 5833d8a1..e41eb284 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/29] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/30] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index ec68728f..04119fe8 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/29] Fix missing abseil linkages +Subject: [PATCH 04/30] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index be34661c..5fa4c7f7 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/29] Fix protobuf_python for systemlibs +Subject: [PATCH 05/30] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index 0346ef3f..82459cbb 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/29] Add absl_log systemlib +Subject: [PATCH 06/30] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 2c4c782d..1dd13875 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/29] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/30] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index 61564815..3bf1e143 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/29] Fix further abseil linkage +Subject: [PATCH 08/30] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index 582eb2d3..92cbdd31 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/29] Add constraint to pybind11 systemlib +Subject: [PATCH 09/30] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index 2ad9bc0d..0c245c17 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/29] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/30] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index 05c587b6..11c8ea25 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/29] Use correct, hermetic python +Subject: [PATCH 11/30] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index 3b2280af..b7e629e3 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/29] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/30] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index fde96803..32198f00 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/29] Add protobuf toolchain +Subject: [PATCH 13/30] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index e867bc41..2147f13c 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/29] fix genproto +Subject: [PATCH 14/30] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index f3e5f630..d3a8feb4 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/29] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/30] 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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 9aec1318..6ff5bffb 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/29] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/30] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index bd6158fd..87ccc8b0 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/29] Use PYTHON for build wheel +Subject: [PATCH 17/30] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index ecbb3970..8968878a 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/29] Always use Linux-sed style +Subject: [PATCH 18/30] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index 3015e04d..e3ff026d 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/29] Adjust relative path for libdevice +Subject: [PATCH 19/30] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index c15905e3..1773f5a7 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/29] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/30] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch index 16218cb7..c217cd51 100644 --- a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 21/29] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 21/30] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index cdf0c1e7..bb158ee9 100644 --- a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 22/29] Update ABSL Log Definition for +Subject: [PATCH 22/30] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index 1f3d9cdd..3cc9d69f 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ From ebbe28d3e1fb1bb3e62c09d32971781c464940f5 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 23/29] Update flatbuffers static assert +Subject: [PATCH 23/30] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch index 2b6c045f..c714e91d 100644 --- a/recipe/patches/0024-add-absl_string_view-target.patch +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -1,7 +1,7 @@ From c22619432afb58caf2b50814a7fbc3a72552c3b2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 -Subject: [PATCH 24/29] add absl_string_view target +Subject: [PATCH 24/30] add absl_string_view target --- third_party/absl/system.absl.strings.BUILD | 12 ++++++++++++ diff --git a/recipe/patches/0025-add-absl_nullability-target.patch b/recipe/patches/0025-add-absl_nullability-target.patch index 8ce9cbe4..a0787844 100644 --- a/recipe/patches/0025-add-absl_nullability-target.patch +++ b/recipe/patches/0025-add-absl_nullability-target.patch @@ -1,7 +1,7 @@ From 2c7f29d8292e71e71c36d53a0e16f76ae38c10ce Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 -Subject: [PATCH 25/29] add absl_nullability target +Subject: [PATCH 25/30] add absl_nullability target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0026-add-absl_prefetch-target.patch b/recipe/patches/0026-add-absl_prefetch-target.patch index a5b4e045..fb59f818 100644 --- a/recipe/patches/0026-add-absl_prefetch-target.patch +++ b/recipe/patches/0026-add-absl_prefetch-target.patch @@ -1,7 +1,7 @@ From ca71b607eb6be971ec18a77913916f66d19fd1c0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 -Subject: [PATCH 26/29] add absl_prefetch target +Subject: [PATCH 26/30] add absl_prefetch target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0027-add-absl_die_if_null-target.patch b/recipe/patches/0027-add-absl_die_if_null-target.patch index b84ea204..7372cbbb 100644 --- a/recipe/patches/0027-add-absl_die_if_null-target.patch +++ b/recipe/patches/0027-add-absl_die_if_null-target.patch @@ -1,14 +1,14 @@ -From 70b435a5337e7660c746f8fd8d0c72b9a12e69b7 Mon Sep 17 00:00:00 2001 +From 79c2aa021c104391d7db6e1f21cb1fb5855a9641 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:46:04 +1100 -Subject: [PATCH 27/29] add absl_die_if_null target +Subject: [PATCH 27/30] add absl_die_if_null target --- third_party/absl/system.absl.log.BUILD | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD -index 1fe1e342594..d6c3b50b01b 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") @@ -17,7 +17,7 @@ index 1fe1e342594..d6c3b50b01b 100644 +cc_library( + name = "die_if_null", -+ linkopts = ["-libabsl_die_if_null"], ++ linkopts = ["-labsl_die_if_null"], + deps = [ + ":log", + "//absl/base:config", diff --git a/recipe/patches/0028-add-absl_crc32c-targets.patch b/recipe/patches/0028-add-absl_crc32c-targets.patch index ff96ca3e..1e807ce6 100644 --- a/recipe/patches/0028-add-absl_crc32c-targets.patch +++ b/recipe/patches/0028-add-absl_crc32c-targets.patch @@ -1,7 +1,7 @@ -From c935573e985f0fd8a84e9ccf83b8582884417305 Mon Sep 17 00:00:00 2001 +From 6d4f8ae9081929763b22db11ba55fc9e72db1c0b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:41:09 +1100 -Subject: [PATCH 28/29] add absl_crc32c targets +Subject: [PATCH 28/30] add absl_crc32c targets --- third_party/absl/system.absl.crc.BUILD | 70 ++++++++++++++++++++++++++ diff --git a/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch b/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch index 6af7e233..efcdc815 100644 --- a/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch +++ b/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch @@ -1,7 +1,7 @@ -From b3126ec5872366856b0d564ed92e423ed8a8ba23 Mon Sep 17 00:00:00 2001 +From ccbf4bd71b3934f88120ccbaef189b22f0bf0260 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 15:01:23 +1100 -Subject: [PATCH 29/29] avoid ambiguity in conversion to absl::StatusOr +Subject: [PATCH 29/30] avoid ambiguity in conversion to absl::StatusOr The function in question wants to return a `TritonWrapperResult`, see https://github.com/tensorflow/tensorflow/blob/v2.16.1/third_party/xla/xla/service/gpu/ir_emitter_triton.cc#L2063 diff --git a/recipe/patches/0030-add-kernel_timeout_internal-target.patch b/recipe/patches/0030-add-kernel_timeout_internal-target.patch new file mode 100644 index 00000000..610415e0 --- /dev/null +++ b/recipe/patches/0030-add-kernel_timeout_internal-target.patch @@ -0,0 +1,43 @@ +From cfc62516dbcb3c17bcc2c026bd7ef7ba8cdbfa3e Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Mon, 13 May 2024 23:36:48 +1100 +Subject: [PATCH 30/30] 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 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( + ], + ) + ++cc_library( ++ name = "kernel_timeout_internal", ++ visibility = [ ++ ], ++ deps = [ ++ "//absl/base", ++ "//absl/base:config", ++ "//absl/base:core_headers", ++ "//absl/base:raw_logging_internal", ++ "//absl/time", ++ ], ++) ++ + cc_library( + name = "synchronization", + linkopts = [ + "-labsl_synchronization", ++ "-labsl_kernel_timeout_internal", + "-pthread", + ], + deps = [ + ":graphcycles_internal", ++ ":kernel_timeout_internal", + "//absl/base", + "//absl/base:atomic_hook", + "//absl/base:dynamic_annotations", From 852e1c30be0d767fce0607a75f1de1802c65d92b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 14 May 2024 07:38:22 +1100 Subject: [PATCH 36/48] remove remnants of manual ml_dtypes handling --- recipe/cp_libtensorflow_cc.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/cp_libtensorflow_cc.sh b/recipe/cp_libtensorflow_cc.sh index 0a5aed09..2ac29062 100644 --- a/recipe/cp_libtensorflow_cc.sh +++ b/recipe/cp_libtensorflow_cc.sh @@ -1,5 +1,2 @@ tar -C ${PREFIX} -xf $SRC_DIR/libtensorflow_cc_output.tar -mkdir -p ${PREFIX}/include/ml_dtypes/include/ -cp float8.h ${PREFIX}/include/ml_dtypes/include/float8.h -cp int4.h ${PREFIX}/include/ml_dtypes/include/int4.h rsync -av ${PREFIX}/include/external/local_tsl/tsl/ ${PREFIX}/include/tsl From 00010fb0419b6fb424a89cdbc911348bb35fabc5 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 14 May 2024 13:14:23 +1100 Subject: [PATCH 37/48] add libml_dtypes-headers run-dep to libtensorflow_cc --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d9968b9a..3c7f4dba 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -447,6 +447,7 @@ outputs: - sqlite - zlib run: + - libml_dtypes-headers <0.4 # avoid that people without GPUs needlessly download ~200-300MB - __cuda # [cuda_compiler_version != "None"] test: From 1488df23b72019584c7119f00989c262db989d8c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 14 May 2024 13:20:52 +1100 Subject: [PATCH 38/48] factor out ml_dtypes_version to reduce risk of mismatches --- recipe/meta.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3c7f4dba..b6d42387 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,6 @@ {% set version = "2.16.1" %} {% set estimator_version = "2.15.0" %} +{% set ml_dtypes_version = "0.3.1" %} package: name: tensorflow-split @@ -141,7 +142,7 @@ requirements: - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 - google-pasta >=0.1.1 - h5py >=3.10 - - ml_dtypes >=0.3.1,<0.4 + - ml_dtypes >={{ ml_dtypes_version }},<0.4 - numpy - opt_einsum >=2.3.2 - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 @@ -231,7 +232,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 >=0.3.1,<0.4 + - ml_dtypes >={{ ml_dtypes_version }},<0.4 - numpy - opt_einsum >=2.3.2 - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 @@ -252,7 +253,7 @@ outputs: - google-pasta >=0.1.1 - grpcio {{ libgrpc }}.* - h5py >=3.10 - - ml_dtypes >=0.3.1,<0.4 + - ml_dtypes >={{ ml_dtypes_version }},<0.4 - {{ pin_compatible('numpy', lower_bound='1.22') }} - opt_einsum >=2.3.2 - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 @@ -447,7 +448,7 @@ outputs: - sqlite - zlib run: - - libml_dtypes-headers <0.4 + - libml_dtypes-headers >={{ ml_dtypes_version }},<0.4 # avoid that people without GPUs needlessly download ~200-300MB - __cuda # [cuda_compiler_version != "None"] test: From 40bff6b363da0d864f7362219b2b8b70237e12cb Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 14 May 2024 19:00:21 +1100 Subject: [PATCH 39/48] fix tensorboard bounds --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b6d42387..96e56f04 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -152,7 +152,7 @@ requirements: - typing_extensions >=3.6.6 - wrapt >=1.11.0 # TF-API needs to move in sync - - tensorboard >=2.15,<2.16 + - tensorboard >=2.16,<2.17 - keras >=3.0 outputs: @@ -242,7 +242,7 @@ outputs: - typing_extensions >=3.6.6 - wrapt >=1.11.0 # TF-API needs to move in sync - - tensorboard >=2.15,<2.16 + - tensorboard >=2.16,<2.17 - keras >=3.0 run: - python @@ -263,7 +263,7 @@ outputs: - typing_extensions >=3.6.6 - wrapt >=1.11.0 # TF-API needs to move in sync - - tensorboard >=2.15,<2.16 + - tensorboard >=2.16,<2.17 - keras >=3.0 # avoid that people without GPUs needlessly download ~0.5-1GB - __cuda # [cuda_compiler_version != "None"] From 74c7137328a47910252601f14854578beca0617d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 May 2024 06:47:19 +1100 Subject: [PATCH 40/48] add new requests dependency --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 96e56f04..bfc163ae 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -237,6 +237,7 @@ outputs: - opt_einsum >=2.3.2 - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 - python-flatbuffers >=23.5.26 + - requests >=2.21.0,<3 - six >=1.12 - termcolor >=1.1.0 - typing_extensions >=3.6.6 @@ -258,6 +259,7 @@ outputs: - opt_einsum >=2.3.2 - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 - python-flatbuffers >=23.5.26 + - requests >=2.21.0,<3 - six >=1.12 - termcolor >=1.1.0 - typing_extensions >=3.6.6 From 1c249ca40f852eac119d90001020d2d7267bde54 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 May 2024 06:48:34 +1100 Subject: [PATCH 41/48] remove redundant package python specs in global build env --- recipe/meta.yaml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bfc163ae..bde8e9cf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -135,25 +135,6 @@ requirements: - sqlite - snappy - zlib - # requirements specified by the package itself, see - # github.com/tensorflow/tensorflow/blob/v{{ version }}/tensorflow/tools/pip_package/setup.py - - absl-py >=1.0.0 - - 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 - - ml_dtypes >={{ ml_dtypes_version }},<0.4 - - numpy - - opt_einsum >=2.3.2 - - protobuf >=3.20.3,<5,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5 - - python-flatbuffers >=23.5.26 - - six >=1.12 - - termcolor >=1.1.0 - - typing_extensions >=3.6.6 - - wrapt >=1.11.0 - # TF-API needs to move in sync - - tensorboard >=2.16,<2.17 - - keras >=3.0 outputs: # 2021/12/29: hmaarrfk @@ -226,7 +207,8 @@ outputs: - snappy - sqlite - zlib - # requirements specified by the package itself + # requirements specified by the package itself, see + # github.com/tensorflow/tensorflow/blob/v{{ version }}/tensorflow/tools/pip_package/setup.py - absl-py >=1.0.0 - astunparse >=1.6.0 - gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2 From a176d88c30a2270e2718335b7ddabe448bf16cb0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 May 2024 06:52:16 +1100 Subject: [PATCH 42/48] add snappy migration --- .ci_support/migrations/snappy120.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .ci_support/migrations/snappy120.yaml diff --git a/.ci_support/migrations/snappy120.yaml b/.ci_support/migrations/snappy120.yaml new file mode 100644 index 00000000..10e1f141 --- /dev/null +++ b/.ci_support/migrations/snappy120.yaml @@ -0,0 +1,7 @@ +migrator_ts: 1712592149 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 +snappy: + - 1.2 From bf7445a5f5cd56169ec28685d1cc3b8db35d14ce Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 15 May 2024 06:55:11 +1100 Subject: [PATCH 43/48] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.14.14.54.30 --- .azure-pipelines/azure-pipelines-osx.yml | 32 +++++----- ...iler_version12python3.10.____cpython.yaml} | 2 +- ...iler_version12python3.11.____cpython.yaml} | 2 +- ...iler_version12python3.12.____cpython.yaml} | 2 +- ...piler_version12python3.9.____cpython.yaml} | 2 +- ...iler_version12python3.10.____cpython.yaml} | 2 +- ...iler_version12python3.11.____cpython.yaml} | 2 +- ...iler_version12python3.12.____cpython.yaml} | 2 +- ...piler_version12python3.9.____cpython.yaml} | 2 +- .../libgrpc162_libprotobuf4253.yaml | 23 ------- ...aml => osx_64_python3.10.____cpython.yaml} | 2 +- ...aml => osx_64_python3.11.____cpython.yaml} | 2 +- ...aml => osx_64_python3.12.____cpython.yaml} | 2 +- ...yaml => 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 +- ...l => osx_arm64_python3.9.____cpython.yaml} | 2 +- .github/workflows/conda-build.yml | 32 +++++----- README.md | 64 +++++++++---------- 20 files changed, 80 insertions(+), 103 deletions(-) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml} (99%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml} (99%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml} (99%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml} (99%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml} (99%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml} (99%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml} (99%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml} (99%) delete mode 100644 .ci_support/migrations/libgrpc162_libprotobuf4253.yaml rename .ci_support/{osx_64_numpy1.22python3.10.____cpython.yaml => osx_64_python3.10.____cpython.yaml} (99%) rename .ci_support/{osx_64_numpy1.23python3.11.____cpython.yaml => osx_64_python3.11.____cpython.yaml} (99%) rename .ci_support/{osx_64_numpy1.26python3.12.____cpython.yaml => osx_64_python3.12.____cpython.yaml} (99%) rename .ci_support/{osx_64_numpy1.22python3.9.____cpython.yaml => osx_64_python3.9.____cpython.yaml} (99%) rename .ci_support/{osx_arm64_numpy1.22python3.10.____cpython.yaml => osx_arm64_python3.10.____cpython.yaml} (99%) rename .ci_support/{osx_arm64_numpy1.23python3.11.____cpython.yaml => osx_arm64_python3.11.____cpython.yaml} (99%) rename .ci_support/{osx_arm64_numpy1.26python3.12.____cpython.yaml => osx_arm64_python3.12.____cpython.yaml} (99%) rename .ci_support/{osx_arm64_numpy1.22python3.9.____cpython.yaml => osx_arm64_python3.9.____cpython.yaml} (99%) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 8e2b8deb..f21ec9c1 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,29 +8,29 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_numpy1.22python3.10.____cpython: - CONFIG: osx_64_numpy1.22python3.10.____cpython + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.9.____cpython: - CONFIG: osx_64_numpy1.22python3.9.____cpython + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.23python3.11.____cpython: - CONFIG: osx_64_numpy1.23python3.11.____cpython + osx_64_python3.12.____cpython: + CONFIG: osx_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.26python3.12.____cpython: - CONFIG: osx_64_numpy1.26python3.12.____cpython + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.10.____cpython: - CONFIG: osx_arm64_numpy1.22python3.10.____cpython + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.9.____cpython: - CONFIG: osx_arm64_numpy1.22python3.9.____cpython + osx_arm64_python3.11.____cpython: + CONFIG: osx_arm64_python3.11.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.23python3.11.____cpython: - CONFIG: osx_arm64_numpy1.23python3.11.____cpython + osx_arm64_python3.12.____cpython: + CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.26python3.12.____cpython: - CONFIG: osx_arm64_numpy1.26python3.12.____cpython + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 1 variables: {} diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml index 3871ae16..094aae4b 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml @@ -61,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml index 1e1cb074..6de819fa 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml @@ -61,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml index c2b5d8c4..7e1b1dde 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml @@ -61,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml index 936c1326..7abb5a46 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml @@ -61,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml index 91c88216..9ebe50a8 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml @@ -61,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml index 1ae250d1..9bc13af8 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml @@ -61,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml index 346d255f..12b88ba3 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml @@ -61,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml similarity index 99% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml index 0116fb47..5fdfbd72 100644 --- a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml @@ -61,7 +61,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml deleted file mode 100644 index 16b401a5..00000000 --- a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml +++ /dev/null @@ -1,23 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libprotobuf 4.25.3 - kind: version - migration_number: 1 - exclude: - - abseil-cpp - - grpc-cpp - - libprotobuf - - protobuf -libgrpc: -- "1.62" -libprotobuf: -- 4.25.3 -# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252; -# this ensures that this migration applies also without the previous one -libabseil: -- "20240116" -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1709522594.9193177 diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 99% rename from .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index d52d3a62..bf605dee 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -53,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml similarity index 99% rename from .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_64_python3.11.____cpython.yaml index 6d9a1a5f..30abc9c1 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -53,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml similarity index 99% rename from .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_64_python3.12.____cpython.yaml index 2aaa3d4c..a79c5438 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -53,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 99% rename from .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index 563ff829..50c31640 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -53,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 99% rename from .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml index 61877847..edc56e68 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -53,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml similarity index 99% rename from .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml rename to .ci_support/osx_arm64_python3.11.____cpython.yaml index b7137923..3bf40f09 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -53,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml similarity index 99% rename from .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml rename to .ci_support/osx_arm64_python3.12.____cpython.yaml index d7a3d565..275b480b 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -53,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml similarity index 99% rename from .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml rename to .ci_support/osx_arm64_python3.9.____cpython.yaml index 801ffb97..b75a14ac 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -53,7 +53,7 @@ python: python_impl: - cpython snappy: -- '1.1' +- '1.2' sqlite: - '3' target_platform: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 8e34433a..882cfad8 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,45 +21,45 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h4207929cd8', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h75453abd28', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h833a15bc5f', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h490d3384b3', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h01eb75b48f', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hea853aa2dd', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h2ff63460bc', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h245c7b00ec', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h628dff9dc9', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h3e0739f5d4', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hd2c406d7d1', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h8a4d86845f', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hf105be2eef', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hb0a87320c2', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h6c22f0e19a', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h2381036914', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 steps: diff --git a/README.md b/README.md index c6abaf83..90b6975f 100644 --- a/README.md +++ b/README.md @@ -37,115 +37,115 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + From 8312ad316c0f45e2d57cb123c2fe3d53ca73f8ab Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 18 May 2024 07:21:31 +1100 Subject: [PATCH 44/48] use clang 18 --- 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 84b5a2fb..ae6a3603 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,6 @@ +c_compiler_version: # [osx] + - 18 # [osx] +cxx_compiler_version: # [osx] + - 18 # [osx] github_actions_labels: - cirun-openstack-cpu-xlarge From e65d4e7c0a0aa3f0a2ba83a5972ea98757c580b8 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 18 May 2024 07:22:50 +1100 Subject: [PATCH 45/48] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.17.12.37.09 --- ...iler_version12python3.10.____cpython.yaml} | 0 ...iler_version12python3.11.____cpython.yaml} | 0 ...iler_version12python3.12.____cpython.yaml} | 0 ...piler_version12python3.9.____cpython.yaml} | 0 ...iler_version12python3.10.____cpython.yaml} | 0 ...iler_version12python3.11.____cpython.yaml} | 0 ...iler_version12python3.12.____cpython.yaml} | 0 ...piler_version12python3.9.____cpython.yaml} | 0 .../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 | 32 +++++++++---------- README.md | 32 +++++++++---------- 18 files changed, 48 insertions(+), 48 deletions(-) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml} (100%) diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index bf605dee..87f4176e 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' 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 30abc9c1..304f76b6 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' 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 a79c5438..d9849922 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' 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 50c31640..454e996c 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' 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 edc56e68..2b5bd1f8 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' 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 3bf40f09..e3d6e8cc 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' 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 275b480b..b60c221d 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' 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 b75a14ac..fa6492e1 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '16' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' flatbuffers: - 24.3.25 giflib: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 882cfad8..6f1beb94 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,45 +21,45 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h75453abd28', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hafaa55c6cc', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h490d3384b3', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h083b1d4c48', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hea853aa2dd', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h032bac0f76', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h245c7b00ec', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h5c66f974c4', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h3e0739f5d4', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h98ca37dabd', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h8a4d86845f', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hf897ad1b3c', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hb0a87320c2', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h6e0feb2406', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h2381036914', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hb28bea4b20', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 steps: diff --git a/README.md b/README.md index 90b6975f..09b4c285 100644 --- a/README.md +++ b/README.md @@ -37,59 +37,59 @@ Current build status
VariantStatus
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12numpy1.26python3.12.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12numpy1.26python3.12.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython - variant + variant
osx_64_numpy1.22python3.10.____cpythonosx_64_python3.10.____cpython - variant + variant
osx_64_numpy1.22python3.9.____cpythonosx_64_python3.11.____cpython - variant + variant
osx_64_numpy1.23python3.11.____cpythonosx_64_python3.12.____cpython - variant + variant
osx_64_numpy1.26python3.12.____cpythonosx_64_python3.9.____cpython - variant + variant
osx_arm64_numpy1.22python3.10.____cpythonosx_arm64_python3.10.____cpython - variant + variant
osx_arm64_numpy1.22python3.9.____cpythonosx_arm64_python3.11.____cpython - variant + variant
osx_arm64_numpy1.23python3.11.____cpythonosx_arm64_python3.12.____cpython - variant + variant
osx_arm64_numpy1.26python3.12.____cpythonosx_arm64_python3.9.____cpython - variant + variant
- + - + - + - + - + - + - + - + From d41820159ff8e286c116d51bfd11b06554aab44b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 19 May 2024 20:53:33 +1100 Subject: [PATCH 46/48] back to default compilers --- ...iler_version12python3.10.____cpython.yaml} | 0 ...iler_version12python3.11.____cpython.yaml} | 0 ...iler_version12python3.12.____cpython.yaml} | 0 ...piler_version12python3.9.____cpython.yaml} | 0 ...iler_version12python3.10.____cpython.yaml} | 0 ...iler_version12python3.11.____cpython.yaml} | 0 ...iler_version12python3.12.____cpython.yaml} | 0 ...piler_version12python3.9.____cpython.yaml} | 0 .../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 | 32 +++++++++---------- README.md | 32 +++++++++---------- recipe/conda_build_config.yaml | 4 --- 19 files changed, 48 insertions(+), 52 deletions(-) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml} (100%) rename .ci_support/{linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml => linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml} (100%) diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython.yaml diff --git a/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml similarity index 100% rename from .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython.yaml diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 87f4176e..bf605dee 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '18' +- '16' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '16' 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 304f76b6..30abc9c1 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '18' +- '16' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '16' 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 d9849922..a79c5438 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '18' +- '16' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '16' 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 454e996c..50c31640 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '18' +- '16' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '16' 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 2b5bd1f8..edc56e68 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '18' +- '16' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '16' 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 e3d6e8cc..3bf40f09 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '18' +- '16' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '16' 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 b60c221d..275b480b 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '18' +- '16' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '16' 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 fa6492e1..b75a14ac 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '18' +- '16' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,7 +17,7 @@ cuda_compiler_version: cxx_compiler: - clangxx cxx_compiler_version: -- '18' +- '16' flatbuffers: - 24.3.25 giflib: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 6f1beb94..882cfad8 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,45 +21,45 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hafaa55c6cc', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h75453abd28', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h083b1d4c48', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h490d3384b3', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h032bac0f76', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hea853aa2dd', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h5c66f974c4', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h245c7b00ec', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h98ca37dabd', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h3e0739f5d4', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hf897ad1b3c', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h8a4d86845f', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h6e0feb2406', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hb0a87320c2', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython + - CONFIG: linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython UPLOAD_PACKAGES: True os: ubuntu - runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_hb28bea4b20', 'linux', 'x64', 'self-hosted'] + runs_on: ['cirun-openstack-cpu-xlarge--${{ github.run_id }}-linux_64_c_compiler_version12c_stdl_h2381036914', 'linux', 'x64', 'self-hosted'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 steps: diff --git a/README.md b/README.md index 09b4c285..90b6975f 100644 --- a/README.md +++ b/README.md @@ -37,59 +37,59 @@ Current build status
VariantStatus
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython - variant + variant
- + - + - + - + - + - + - + - + diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index ae6a3603..84b5a2fb 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,6 +1,2 @@ -c_compiler_version: # [osx] - - 18 # [osx] -cxx_compiler_version: # [osx] - - 18 # [osx] github_actions_labels: - cirun-openstack-cpu-xlarge From 215b4dd54f8176063eff8d282292a49752003136 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 19 May 2024 20:55:18 +1100 Subject: [PATCH 47/48] explicitly warning that clang does not suppress sufficiently --- recipe/meta.yaml | 1 + recipe/patches/0001-loosen-requirements.patch | 2 +- ...absl_synchronization-linkage-to-gRPC.patch | 2 +- ...-any_invocable-target-to-absel-bazel.patch | 2 +- .../0004-Fix-missing-abseil-linkages.patch | 2 +- ...5-Fix-protobuf_python-for-systemlibs.patch | 2 +- .../patches/0006-Add-absl_log-systemlib.patch | 2 +- ...layout_proto_cc-if-protobuf-linkage-.patch | 2 +- .../0008-Fix-further-abseil-linkage.patch | 2 +- ...Add-constraint-to-pybind11-systemlib.patch | 2 +- ...-file-ending-for-flatbuffers-LICENSE.patch | 2 +- .../0011-Use-correct-hermetic-python.patch | 2 +- ...n_types_py_pb2-to-protobuf-systemlib.patch | 2 +- .../patches/0013-Add-protobuf-toolchain.patch | 2 +- recipe/patches/0014-fix-genproto.patch | 2 +- ...ome-usage-of-absl-str_format-in-CUDA.patch | 2 +- ...type-to-make-constructor-unambiguous.patch | 2 +- .../0017-Use-PYTHON-for-build-wheel.patch | 2 +- .../0018-Always-use-Linux-sed-style.patch | 2 +- ...9-Adjust-relative-path-for-libdevice.patch | 2 +- ...uf-errors-when-using-system-protobuf.patch | 2 +- ...absl_log_flags-instead-of-absl_flags.patch | 2 +- ...Definition-for-libabsl_vlog_config_i.patch | 2 +- ...023-Update-flatbuffers-static-assert.patch | 2 +- .../0024-add-absl_string_view-target.patch | 2 +- .../0025-add-absl_nullability-target.patch | 2 +- .../0026-add-absl_prefetch-target.patch | 2 +- .../0027-add-absl_die_if_null-target.patch | 2 +- .../0028-add-absl_crc32c-targets.patch | 2 +- ...ity-in-conversion-to-absl-StatusOr-T.patch | 2 +- ...0-add-kernel_timeout_internal-target.patch | 2 +- ...warning-that-clang-falsely-treats-as.patch | 24 +++++++++++++++++++ 32 files changed, 55 insertions(+), 30 deletions(-) create mode 100644 recipe/patches/0031-work-around-for-warning-that-clang-falsely-treats-as.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bde8e9cf..2dfce714 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,6 +41,7 @@ source: - patches/0028-add-absl_crc32c-targets.patch - patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch - patches/0030-add-kernel_timeout_internal-target.patch + - patches/0031-work-around-for-warning-that-clang-falsely-treats-as.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 1aa88432..1fba4364 100644 --- a/recipe/patches/0001-loosen-requirements.patch +++ b/recipe/patches/0001-loosen-requirements.patch @@ -1,7 +1,7 @@ From cfa1a034779e20f221995ee2df4a6fefb938ea9e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH 01/30] loosen requirements +Subject: [PATCH 01/31] loosen requirements * Remove unused libclang requirement * Remove unecessary tensorflow-io-gcs-filesystem 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 d255eef5..67709b81 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,7 +1,7 @@ From a54389776c9f52d1af92482433cd822a5953557f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Jun 2023 08:39:32 +0000 -Subject: [PATCH 02/30] Add additional absl_synchronization linkage to gRPC +Subject: [PATCH 02/31] Add additional absl_synchronization linkage to gRPC --- third_party/systemlibs/grpc.BUILD | 3 +++ diff --git a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch index e41eb284..c2a12984 100644 --- a/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch +++ b/recipe/patches/0003-Add-missing-any_invocable-target-to-absel-bazel.patch @@ -1,7 +1,7 @@ From 91d60145bcd3e9362ac9ddc7815a14ae6d8fd029 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 2 Jul 2023 05:36:41 +0000 -Subject: [PATCH 03/30] Add missing any_invocable target to absel bazel +Subject: [PATCH 03/31] Add missing any_invocable target to absel bazel --- third_party/absl/system.absl.functional.BUILD | 4 ++++ diff --git a/recipe/patches/0004-Fix-missing-abseil-linkages.patch b/recipe/patches/0004-Fix-missing-abseil-linkages.patch index 04119fe8..6a476137 100644 --- a/recipe/patches/0004-Fix-missing-abseil-linkages.patch +++ b/recipe/patches/0004-Fix-missing-abseil-linkages.patch @@ -1,7 +1,7 @@ From 2bf472062fe84caad1cb2c72e4547e47f77a5331 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 3 Jul 2023 04:45:46 +0000 -Subject: [PATCH 04/30] Fix missing abseil linkages +Subject: [PATCH 04/31] Fix missing abseil linkages --- third_party/absl/system.absl.strings.BUILD | 2 +- diff --git a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch index 5fa4c7f7..a4cff902 100644 --- a/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch +++ b/recipe/patches/0005-Fix-protobuf_python-for-systemlibs.patch @@ -1,7 +1,7 @@ From 12f9c5241436ac077ccd8c6e9d5a735455a08e1a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:58:41 +0200 -Subject: [PATCH 05/30] Fix protobuf_python for systemlibs +Subject: [PATCH 05/31] Fix protobuf_python for systemlibs --- tensorflow/workspace2.bzl | 9 ++++--- diff --git a/recipe/patches/0006-Add-absl_log-systemlib.patch b/recipe/patches/0006-Add-absl_log-systemlib.patch index 82459cbb..e47b32d4 100644 --- a/recipe/patches/0006-Add-absl_log-systemlib.patch +++ b/recipe/patches/0006-Add-absl_log-systemlib.patch @@ -1,7 +1,7 @@ From 35c2cf9c9fb669ba9eb4e60be87b5153da23da1d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 30 Aug 2023 16:59:28 +0200 -Subject: [PATCH 06/30] Add absl_log systemlib +Subject: [PATCH 06/31] Add absl_log systemlib --- third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++ diff --git a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch index 1dd13875..755a2285 100644 --- a/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch +++ b/recipe/patches/0007-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch @@ -1,7 +1,7 @@ From 6c666e6ff7a51ed5518bbb96229f7556dd3c728b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 15 Sep 2023 11:06:27 +0200 -Subject: [PATCH 07/30] Omit linking to layout_proto_cc if protobuf linkage is +Subject: [PATCH 07/31] Omit linking to layout_proto_cc if protobuf linkage is shared --- diff --git a/recipe/patches/0008-Fix-further-abseil-linkage.patch b/recipe/patches/0008-Fix-further-abseil-linkage.patch index 3bf1e143..aee5225d 100644 --- a/recipe/patches/0008-Fix-further-abseil-linkage.patch +++ b/recipe/patches/0008-Fix-further-abseil-linkage.patch @@ -1,7 +1,7 @@ From 675b8ee10b58e9207b8205827cf6d2ae80e1c017 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 18 Sep 2023 14:47:08 +0000 -Subject: [PATCH 08/30] Fix further abseil linkage +Subject: [PATCH 08/31] Fix further abseil linkage --- third_party/absl/system.absl.base.BUILD | 14 ++++++++++++-- diff --git a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch index 92cbdd31..e34688f4 100644 --- a/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch +++ b/recipe/patches/0009-Add-constraint-to-pybind11-systemlib.patch @@ -1,7 +1,7 @@ From 53a4029609fa82a740a67fe16711413f325b7925 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:20:12 +0200 -Subject: [PATCH 09/30] Add constraint to pybind11 systemlib +Subject: [PATCH 09/31] Add constraint to pybind11 systemlib --- third_party/systemlibs/pybind11.BUILD | 6 ++++++ diff --git a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch index 0c245c17..e937ff31 100644 --- a/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch +++ b/recipe/patches/0010-Different-file-ending-for-flatbuffers-LICENSE.patch @@ -1,7 +1,7 @@ From b5086d59abd073469b65ba22ca29934bae2b3302 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:11 +0200 -Subject: [PATCH 10/30] Different file ending for flatbuffers LICENSE +Subject: [PATCH 10/31] Different file ending for flatbuffers LICENSE --- third_party/flatbuffers/BUILD.system | 5 +++++ diff --git a/recipe/patches/0011-Use-correct-hermetic-python.patch b/recipe/patches/0011-Use-correct-hermetic-python.patch index 11c8ea25..8e304109 100644 --- a/recipe/patches/0011-Use-correct-hermetic-python.patch +++ b/recipe/patches/0011-Use-correct-hermetic-python.patch @@ -1,7 +1,7 @@ From e68d370bfbb60acd40568564690a7050377bc42f Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 27 Oct 2023 11:21:38 +0200 -Subject: [PATCH 11/30] Use correct, hermetic python +Subject: [PATCH 11/31] Use correct, hermetic python --- .../tensorflow/gen_quantized_function_library.py | 5 +++++ diff --git a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch index b7e629e3..70745f85 100644 --- a/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch +++ b/recipe/patches/0012-Add-well_known_types_py_pb2-to-protobuf-systemlib.patch @@ -1,7 +1,7 @@ From 0189f65530cffb6722e1b23f3face82148dcc4a5 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 09:18:28 +0100 -Subject: [PATCH 12/30] Add well_known_types_py_pb2 to protobuf systemlib +Subject: [PATCH 12/31] Add well_known_types_py_pb2 to protobuf systemlib --- third_party/systemlibs/protobuf.BUILD | 7 +++++++ diff --git a/recipe/patches/0013-Add-protobuf-toolchain.patch b/recipe/patches/0013-Add-protobuf-toolchain.patch index 32198f00..4f4dd73d 100644 --- a/recipe/patches/0013-Add-protobuf-toolchain.patch +++ b/recipe/patches/0013-Add-protobuf-toolchain.patch @@ -1,7 +1,7 @@ From d0e5f4b93aae414be3e64f5ba6b45ddbdc72ebf8 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 15 Nov 2023 10:32:41 +0000 -Subject: [PATCH 13/30] Add protobuf toolchain +Subject: [PATCH 13/31] Add protobuf toolchain --- third_party/systemlibs/protobuf.BUILD | 14 ++++++++++++++ diff --git a/recipe/patches/0014-fix-genproto.patch b/recipe/patches/0014-fix-genproto.patch index 2147f13c..43c2f2a0 100644 --- a/recipe/patches/0014-fix-genproto.patch +++ b/recipe/patches/0014-fix-genproto.patch @@ -1,7 +1,7 @@ From d2a17a710785ef883aae9ce47509e4c150797099 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 16 Nov 2023 06:38:27 +0000 -Subject: [PATCH 14/30] fix genproto +Subject: [PATCH 14/31] fix genproto --- .../third_party/tsl/tsl/platform/default/build_config.bzl | 5 +---- diff --git a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch index d3a8feb4..bb6f7094 100644 --- a/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch +++ b/recipe/patches/0015-Remove-some-usage-of-absl-str_format-in-CUDA.patch @@ -1,7 +1,7 @@ From aa0139ad3c62e5f1a676a9d81bd6845557975e4a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 09:05:37 +0000 -Subject: [PATCH 15/30] Remove some usage of absl::str_format in CUDA +Subject: [PATCH 15/31] 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 diff --git a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch index 6ff5bffb..14582fe2 100644 --- a/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch +++ b/recipe/patches/0016-Patch-ml_dtype-to-make-constructor-unambiguous.patch @@ -1,7 +1,7 @@ From 5f9de4d19f32770ed47e3afbda687649107882ee Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 23 Nov 2023 20:50:37 +0000 -Subject: [PATCH 16/30] Patch ml_dtype to make constructor unambiguous +Subject: [PATCH 16/31] Patch ml_dtype to make constructor unambiguous Both constructors can be used and sadly, it seems there is no way to force the use of one of them as part of the macros Tensorflow uses. As diff --git a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch index 87ccc8b0..89a3599e 100644 --- a/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch +++ b/recipe/patches/0017-Use-PYTHON-for-build-wheel.patch @@ -1,7 +1,7 @@ From 8b973e939c1c41bf85504d80e3c9cf193893d5e7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 27 Nov 2023 10:35:53 +0000 -Subject: [PATCH 17/30] Use PYTHON for build wheel +Subject: [PATCH 17/31] Use PYTHON for build wheel Tensorflow tries to use a Python binary it downloaded as part of its hermetic Python approach. As we use our own Python toolchain, this is diff --git a/recipe/patches/0018-Always-use-Linux-sed-style.patch b/recipe/patches/0018-Always-use-Linux-sed-style.patch index 8968878a..c0149c9e 100644 --- a/recipe/patches/0018-Always-use-Linux-sed-style.patch +++ b/recipe/patches/0018-Always-use-Linux-sed-style.patch @@ -1,7 +1,7 @@ From f923273f8daabdcec4b4b570cd0158a79ae49f51 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 14:17:28 +0100 -Subject: [PATCH 18/30] Always use Linux-sed style +Subject: [PATCH 18/31] Always use Linux-sed style --- tensorflow/tools/pip_package/build_pip_package.sh | 12 +++--------- diff --git a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch index e3ff026d..15be63b3 100644 --- a/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch +++ b/recipe/patches/0019-Adjust-relative-path-for-libdevice.patch @@ -1,7 +1,7 @@ From 79fba94ead1a5577f654e97e787d9578810a5bac Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 27 Jan 2024 22:27:56 -0500 -Subject: [PATCH 19/30] Adjust relative path for libdevice +Subject: [PATCH 19/31] Adjust relative path for libdevice --- .../third_party/tsl/tsl/platform/default/cuda_libdevice_path.cc | 2 +- diff --git a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch index 1773f5a7..70cf26d2 100644 --- a/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch +++ b/recipe/patches/0020-Fix-protobuf-errors-when-using-system-protobuf.patch @@ -1,7 +1,7 @@ From 15ac3aa2f2c73fc7cc95d4c805b744cb6df0257f Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 23 Dec 2023 00:59:32 -0500 -Subject: [PATCH 20/30] Fix protobuf errors when using system protobuf +Subject: [PATCH 20/31] Fix protobuf errors when using system protobuf --- tensorflow/api_template.__init__.py | 2 ++ diff --git a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch index c217cd51..a919cf99 100644 --- a/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch +++ b/recipe/patches/0021-Link-to-absl_log_flags-instead-of-absl_flags.patch @@ -1,7 +1,7 @@ From 8f9a1240f7aa6c7229899e604dc057ab60cd0a07 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 26 Feb 2024 22:30:08 -0500 -Subject: [PATCH 21/30] Link to absl_log_flags instead of absl_flags +Subject: [PATCH 21/31] Link to absl_log_flags instead of absl_flags --- third_party/absl/system.absl.flags.BUILD | 2 +- diff --git a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch index bb158ee9..a3cfe3fc 100644 --- a/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch +++ b/recipe/patches/0022-Update-ABSL-Log-Definition-for-libabsl_vlog_config_i.patch @@ -1,7 +1,7 @@ From 7f11e4fb5dd26aa1cf3a1fdf2c47e8390f7b910f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 27 Feb 2024 18:01:19 -0500 -Subject: [PATCH 22/30] Update ABSL Log Definition for +Subject: [PATCH 22/31] Update ABSL Log Definition for libabsl_vlog_config_internal.so --- diff --git a/recipe/patches/0023-Update-flatbuffers-static-assert.patch b/recipe/patches/0023-Update-flatbuffers-static-assert.patch index 3cc9d69f..2121a060 100644 --- a/recipe/patches/0023-Update-flatbuffers-static-assert.patch +++ b/recipe/patches/0023-Update-flatbuffers-static-assert.patch @@ -1,7 +1,7 @@ From ebbe28d3e1fb1bb3e62c09d32971781c464940f5 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 13 Mar 2024 06:24:35 -0400 -Subject: [PATCH 23/30] Update flatbuffers static assert +Subject: [PATCH 23/31] Update flatbuffers static assert --- .../acceleration/configuration/configuration_generated.h | 6 +++--- diff --git a/recipe/patches/0024-add-absl_string_view-target.patch b/recipe/patches/0024-add-absl_string_view-target.patch index c714e91d..1d512b12 100644 --- a/recipe/patches/0024-add-absl_string_view-target.patch +++ b/recipe/patches/0024-add-absl_string_view-target.patch @@ -1,7 +1,7 @@ From c22619432afb58caf2b50814a7fbc3a72552c3b2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 18:45:03 +1100 -Subject: [PATCH 24/30] add absl_string_view target +Subject: [PATCH 24/31] add absl_string_view target --- third_party/absl/system.absl.strings.BUILD | 12 ++++++++++++ diff --git a/recipe/patches/0025-add-absl_nullability-target.patch b/recipe/patches/0025-add-absl_nullability-target.patch index a0787844..a86306ce 100644 --- a/recipe/patches/0025-add-absl_nullability-target.patch +++ b/recipe/patches/0025-add-absl_nullability-target.patch @@ -1,7 +1,7 @@ From 2c7f29d8292e71e71c36d53a0e16f76ae38c10ce Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 19:30:44 +1100 -Subject: [PATCH 25/30] add absl_nullability target +Subject: [PATCH 25/31] add absl_nullability target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0026-add-absl_prefetch-target.patch b/recipe/patches/0026-add-absl_prefetch-target.patch index fb59f818..a177fd1f 100644 --- a/recipe/patches/0026-add-absl_prefetch-target.patch +++ b/recipe/patches/0026-add-absl_prefetch-target.patch @@ -1,7 +1,7 @@ From ca71b607eb6be971ec18a77913916f66d19fd1c0 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:29:25 +1100 -Subject: [PATCH 26/30] add absl_prefetch target +Subject: [PATCH 26/31] add absl_prefetch target --- third_party/absl/system.absl.base.BUILD | 8 ++++++++ diff --git a/recipe/patches/0027-add-absl_die_if_null-target.patch b/recipe/patches/0027-add-absl_die_if_null-target.patch index 7372cbbb..05a6f998 100644 --- a/recipe/patches/0027-add-absl_die_if_null-target.patch +++ b/recipe/patches/0027-add-absl_die_if_null-target.patch @@ -1,7 +1,7 @@ From 79c2aa021c104391d7db6e1f21cb1fb5855a9641 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 12 May 2024 22:46:04 +1100 -Subject: [PATCH 27/30] add absl_die_if_null target +Subject: [PATCH 27/31] add absl_die_if_null target --- third_party/absl/system.absl.log.BUILD | 11 +++++++++++ diff --git a/recipe/patches/0028-add-absl_crc32c-targets.patch b/recipe/patches/0028-add-absl_crc32c-targets.patch index 1e807ce6..575ecec4 100644 --- a/recipe/patches/0028-add-absl_crc32c-targets.patch +++ b/recipe/patches/0028-add-absl_crc32c-targets.patch @@ -1,7 +1,7 @@ From 6d4f8ae9081929763b22db11ba55fc9e72db1c0b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 09:41:09 +1100 -Subject: [PATCH 28/30] add absl_crc32c targets +Subject: [PATCH 28/31] add absl_crc32c targets --- third_party/absl/system.absl.crc.BUILD | 70 ++++++++++++++++++++++++++ diff --git a/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch b/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch index efcdc815..f16d7322 100644 --- a/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch +++ b/recipe/patches/0029-avoid-ambiguity-in-conversion-to-absl-StatusOr-T.patch @@ -1,7 +1,7 @@ From ccbf4bd71b3934f88120ccbaef189b22f0bf0260 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 15:01:23 +1100 -Subject: [PATCH 29/30] avoid ambiguity in conversion to absl::StatusOr +Subject: [PATCH 29/31] avoid ambiguity in conversion to absl::StatusOr The function in question wants to return a `TritonWrapperResult`, see https://github.com/tensorflow/tensorflow/blob/v2.16.1/third_party/xla/xla/service/gpu/ir_emitter_triton.cc#L2063 diff --git a/recipe/patches/0030-add-kernel_timeout_internal-target.patch b/recipe/patches/0030-add-kernel_timeout_internal-target.patch index 610415e0..3a2bfa9a 100644 --- a/recipe/patches/0030-add-kernel_timeout_internal-target.patch +++ b/recipe/patches/0030-add-kernel_timeout_internal-target.patch @@ -1,7 +1,7 @@ From cfc62516dbcb3c17bcc2c026bd7ef7ba8cdbfa3e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Mon, 13 May 2024 23:36:48 +1100 -Subject: [PATCH 30/30] add kernel_timeout_internal target +Subject: [PATCH 30/31] add kernel_timeout_internal target --- .../absl/system.absl.synchronization.BUILD | 15 +++++++++++++++ diff --git a/recipe/patches/0031-work-around-for-warning-that-clang-falsely-treats-as.patch b/recipe/patches/0031-work-around-for-warning-that-clang-falsely-treats-as.patch new file mode 100644 index 00000000..2d53da3d --- /dev/null +++ b/recipe/patches/0031-work-around-for-warning-that-clang-falsely-treats-as.patch @@ -0,0 +1,24 @@ +From 099a94b037a71f718117684466d68602a6c606a1 Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Sun, 19 May 2024 20:52:35 +1100 +Subject: [PATCH 31/31] work around for warning that clang falsely treats as + error + +see https://github.com/llvm/llvm-project/issues/92630 +--- + .bazelrc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.bazelrc b/.bazelrc +index 315669e7930..7452644639c 100644 +--- a/.bazelrc ++++ b/.bazelrc +@@ -311,7 +311,7 @@ build:ios --noenable_platform_specific_config + build:android --copt=-w + build:ios --copt=-w + build:linux --host_copt=-w +-build:macos --copt=-w ++build:macos --copt=-w -Wno-c++11-narrowing + build:windows --copt=/W0 + build:windows --host_copt=/W0 + From 82738ae795c9816c9ebb0d953b0a6f35d1c713d6 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 21 May 2024 22:04:17 +0200 Subject: [PATCH 48/48] Fix patch --- ...1-work-around-for-warning-that-clang-falsely-treats-as.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/patches/0031-work-around-for-warning-that-clang-falsely-treats-as.patch b/recipe/patches/0031-work-around-for-warning-that-clang-falsely-treats-as.patch index 2d53da3d..00d57c51 100644 --- a/recipe/patches/0031-work-around-for-warning-that-clang-falsely-treats-as.patch +++ b/recipe/patches/0031-work-around-for-warning-that-clang-falsely-treats-as.patch @@ -18,7 +18,7 @@ index 315669e7930..7452644639c 100644 build:ios --copt=-w build:linux --host_copt=-w -build:macos --copt=-w -+build:macos --copt=-w -Wno-c++11-narrowing ++build:macos --copt=-w --copt=-Wno-c++11-narrowing build:windows --copt=/W0 build:windows --host_copt=/W0
VariantStatus
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.10.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.11.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.12.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.12cuda_compiler_versionNonecxx_compiler_version12python3.9.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.9.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.10.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.10.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.11.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.11.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.12.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.12.____cpython - variant + variant
linux_64_c_compiler_version12c_stdlib_version2.17cuda_compiler_version12.0cxx_compiler_version12python3.9.____cpythonlinux_64_c_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.9.____cpython - variant + variant