From db273b20940d1efebd0288e287399c834f22a97b Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 8 Apr 2024 19:13:23 +0200 Subject: [PATCH] Rebase patches --- recipe/meta.yaml | 2 +- .../patches/0001-Allow-for-custom-CUDA-build.patch | 8 ++++---- ...la-Support-third-party-build-of-boringssl.patch | 14 ++++++-------- ...ers.patch => 0003-xla-Fix-abseil-headers.patch} | 13 +++++-------- 4 files changed, 16 insertions(+), 21 deletions(-) rename recipe/patches/{0001-xla-Fix-abseil-headers.patch => 0003-xla-Fix-abseil-headers.patch} (91%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 54a7f0d5..69ee7493 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: patches: - patches/0001-Allow-for-custom-CUDA-build.patch - patches/0002-xla-Support-third-party-build-of-boringssl.patch - - patches/0001-xla-Fix-abseil-headers.patch + - patches/0003-xla-Fix-abseil-headers.patch build: number: {{ number }} diff --git a/recipe/patches/0001-Allow-for-custom-CUDA-build.patch b/recipe/patches/0001-Allow-for-custom-CUDA-build.patch index ec3a448e..d9000019 100644 --- a/recipe/patches/0001-Allow-for-custom-CUDA-build.patch +++ b/recipe/patches/0001-Allow-for-custom-CUDA-build.patch @@ -1,17 +1,17 @@ -From 17365058809e185821f928813d79c61ac0a4bcaf Mon Sep 17 00:00:00 2001 +From a84f2ee59e00f67b2c774fd8ed5b0c47a4674bb4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 8 Oct 2023 19:34:34 +0200 -Subject: [PATCH 1/2] Allow for custom CUDA build +Subject: [PATCH 1/3] Allow for custom CUDA build --- build/build.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/build.py b/build/build.py -index 41994c4..51d2ddc 100755 +index dfdf33e..fe1da3c 100755 --- a/build/build.py +++ b/build/build.py -@@ -251,6 +251,11 @@ def write_bazelrc(*, python_bin_path, remote_build, +@@ -299,6 +299,11 @@ def write_bazelrc(*, python_bin_path, remote_build, f.write("build --action_env TF_CUDA_PATHS=\"{tf_cuda_paths}\"\n" .format(tf_cuda_paths=",".join(tf_cuda_paths))) if cuda_version: diff --git a/recipe/patches/0002-xla-Support-third-party-build-of-boringssl.patch b/recipe/patches/0002-xla-Support-third-party-build-of-boringssl.patch index e82955d5..b98a2250 100644 --- a/recipe/patches/0002-xla-Support-third-party-build-of-boringssl.patch +++ b/recipe/patches/0002-xla-Support-third-party-build-of-boringssl.patch @@ -1,12 +1,12 @@ -From 3eadf03384f6967042a8f5c48c541cafbf784132 Mon Sep 17 00:00:00 2001 +From 38cf9f3970339cd4095bc72222bca3e5ceca5b39 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 14 Dec 2023 17:06:15 +0100 -Subject: [PATCH 2/2] xla: Support third-party build of boringssl +Subject: [PATCH 2/3] xla: Support third-party build of boringssl --- ...pport-third-party-build-of-boringssl.patch | 54 +++++++++++++++++++ - third_party/xla/workspace.bzl | 5 +- - 2 files changed, 58 insertions(+), 1 deletion(-) + third_party/xla/workspace.bzl | 3 ++ + 2 files changed, 57 insertions(+) create mode 100644 third_party/xla/0001-Support-third-party-build-of-boringssl.patch diff --git a/third_party/xla/0001-Support-third-party-build-of-boringssl.patch b/third_party/xla/0001-Support-third-party-build-of-boringssl.patch @@ -70,16 +70,14 @@ index 0000000..1f11444 +2.43.0 + diff --git a/third_party/xla/workspace.bzl b/third_party/xla/workspace.bzl -index a6f972c..456a0a8 100644 +index 0d46f9c..3980740 100644 --- a/third_party/xla/workspace.bzl +++ b/third_party/xla/workspace.bzl -@@ -29,7 +29,10 @@ def repo(): +@@ -29,6 +29,9 @@ def repo(): sha256 = XLA_SHA256, strip_prefix = "xla-{commit}".format(commit = XLA_COMMIT), urls = tf_mirror_urls("https://github.com/openxla/xla/archive/{commit}.tar.gz".format(commit = XLA_COMMIT)), -- patch_file = ["//third_party/xla:log.patch"], + patch_file = [ -+ "//third_party/xla:log.patch", + "//third_party/xla:0001-Support-third-party-build-of-boringssl.patch", + ], ) diff --git a/recipe/patches/0001-xla-Fix-abseil-headers.patch b/recipe/patches/0003-xla-Fix-abseil-headers.patch similarity index 91% rename from recipe/patches/0001-xla-Fix-abseil-headers.patch rename to recipe/patches/0003-xla-Fix-abseil-headers.patch index 3d1a18b8..b6ceefb2 100644 --- a/recipe/patches/0001-xla-Fix-abseil-headers.patch +++ b/recipe/patches/0003-xla-Fix-abseil-headers.patch @@ -1,7 +1,7 @@ -From f14f07e11324414f007b9aa3dfc125c4dbb357f0 Mon Sep 17 00:00:00 2001 +From 40da1eab3aa4fa49a8d4b80f897610c680cd1ef3 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 11 Feb 2024 20:18:13 +0100 -Subject: [PATCH] xla: Fix abseil headers +Subject: [PATCH 3/3] xla: Fix abseil headers --- third_party/xla/0001-Fix-abseil-headers.patch | 47 +++++++++++++++++++ @@ -63,17 +63,14 @@ index 0000000..41f411e +2.43.0 + diff --git a/third_party/xla/workspace.bzl b/third_party/xla/workspace.bzl -index 456a0a8..a1bc834 100644 +index 3980740..78ac6c7 100644 --- a/third_party/xla/workspace.bzl +++ b/third_party/xla/workspace.bzl -@@ -32,6 +32,7 @@ def repo(): +@@ -31,6 +31,7 @@ def repo(): + urls = tf_mirror_urls("https://github.com/openxla/xla/archive/{commit}.tar.gz".format(commit = XLA_COMMIT)), patch_file = [ - "//third_party/xla:log.patch", "//third_party/xla:0001-Support-third-party-build-of-boringssl.patch", + "//third_party/xla:0001-Fix-abseil-headers.patch", ], ) --- -2.39.3 (Apple Git-145) -