From a2b525b41e7f37f899144ace54d14a1849a2b18e Mon Sep 17 00:00:00 2001 From: "Patrick J. LoPresti" Date: Thu, 3 Apr 2025 10:44:00 -0700 Subject: [PATCH] Adapt commit 5467ee9 from XLA to TensorFlow. TensorFlow has a build failure with newer CUDA. The problem has been fixed in XLA (openxla/xla#16095 and TensorFlow commit 5457ee9). This change adapts this commit to tensorflow/core/kernels/gpu_prim.h. Fixes #90562. --- WORKSPACE.rej | 20 +++++++++++++ tensorflow/core/kernels/gpu_prim.h | 13 ++++---- .../toolchains/python/python_repo.bzl.rej | 11 +++++++ tensorflow/workspace2.bzl.rej | 16 ++++++++++ ...rosstool_wrapper_driver_is_not_gcc.tpl.rej | 11 +++++++ .../gpus/find_cuda_config.py.gz.base64.rej | 4 +++ third_party/gpus/find_cuda_config.py.rej | 30 +++++++++++++++++++ 7 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 WORKSPACE.rej create mode 100644 tensorflow/tools/toolchains/python/python_repo.bzl.rej create mode 100644 tensorflow/workspace2.bzl.rej create mode 100644 third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl.rej create mode 100644 third_party/gpus/find_cuda_config.py.gz.base64.rej create mode 100644 third_party/gpus/find_cuda_config.py.rej diff --git a/WORKSPACE.rej b/WORKSPACE.rej new file mode 100644 index 0000000000000000000000000000000000000000..691861743b07fa78b391a9a00c1c23bf04356298 --- /dev/null +++ b/WORKSPACE.rej @@ -0,0 +1,20 @@ +--- WORKSPACE ++++ WORKSPACE +@@ -14,11 +14,14 @@ http_archive( + + http_archive( + name = "rules_python", +- sha256 = "84aec9e21cc56fbc7f1335035a71c850d1b9b5cc6ff497306f84cced9a769841", +- strip_prefix = "rules_python-0.23.1", +- url = "https://github.com/bazelbuild/rules_python/releases/download/0.23.1/rules_python-0.23.1.tar.gz", ++ sha256 = "cfa6957832ae0e0c7ee2ccf455a888a291e8419ed8faf45f4420dd7414d5dd96", ++ strip_prefix = "rules_python-fe33a4582c37499f3caeb49a07a78fc7948a8949", ++ url = "https://github.com/bazelbuild/rules_python/archive/fe33a4582c37499f3caeb49a07a78fc7948a8949.tar.gz" + ) + ++load("@rules_python//python:repositories.bzl", "py_repositories") ++py_repositories() ++ + load("@rules_python//python:repositories.bzl", "python_register_toolchains") + load( + "//tensorflow/tools/toolchains/python:python_repo.bzl", diff --git a/tensorflow/core/kernels/gpu_prim.h b/tensorflow/core/kernels/gpu_prim.h index bef22b50ada12c7068b47ba86af47c49f14c9bfc..f80bd54d4a177982add215c2ca92ed03214a9d34 100644 --- a/tensorflow/core/kernels/gpu_prim.h +++ b/tensorflow/core/kernels/gpu_prim.h @@ -44,10 +44,9 @@ __device__ __forceinline__ void ThreadStoreVolatilePtr( Eigen::numext::bit_cast(val); } -template <> -__device__ __forceinline__ Eigen::half ThreadLoadVolatilePointer( - Eigen::half *ptr, Int2Type /*is_primitive*/) { - uint16_t result = *reinterpret_cast(ptr); +__device__ __forceinline__ Eigen::half ThreadLoadVolatilePointer( + const Eigen::half *ptr, Int2Type /*is_primitive*/) { + uint16_t result = *reinterpret_cast(ptr); return Eigen::numext::bit_cast(result); } @@ -59,10 +58,8 @@ __device__ __forceinline__ void ThreadStoreVolatilePtr( Eigen::numext::bit_cast(val); } -template <> -__device__ __forceinline__ Eigen::bfloat16 -ThreadLoadVolatilePointer(Eigen::bfloat16 *ptr, - Int2Type /*is_primitive*/) { +__device__ __forceinline__ Eigen::bfloat16 ThreadLoadVolatilePointer( + Eigen::bfloat16 *ptr, Int2Type /*is_primitive*/) { uint16_t result = *reinterpret_cast(ptr); return Eigen::numext::bit_cast(result); } diff --git a/tensorflow/tools/toolchains/python/python_repo.bzl.rej b/tensorflow/tools/toolchains/python/python_repo.bzl.rej new file mode 100644 index 0000000000000000000000000000000000000000..e1cfed2d0180fe08e57f1c3b1ae76b43a331668d --- /dev/null +++ b/tensorflow/tools/toolchains/python/python_repo.bzl.rej @@ -0,0 +1,11 @@ +--- tensorflow/tools/toolchains/python/python_repo.bzl ++++ tensorflow/tools/toolchains/python/python_repo.bzl +@@ -4,7 +4,7 @@ Can be set via build parameter "--repo_env=TF_PYTHON_VERSION=3.10" + Defaults to 3.10. + """ + +-VERSIONS = ["3.9", "3.10", "3.11"] ++VERSIONS = ["3.9", "3.10", "3.11", "3.12"] + DEFAULT_VERSION = "3.10" + WARNING = """ + TF_PYTHON_VERSION variable was not set correctly, using default version. {} Python diff --git a/tensorflow/workspace2.bzl.rej b/tensorflow/workspace2.bzl.rej new file mode 100644 index 0000000000000000000000000000000000000000..d00de54f0ba13b18f890eaad1360eb5c2aa05b6d --- /dev/null +++ b/tensorflow/workspace2.bzl.rej @@ -0,0 +1,16 @@ +--- tensorflow/workspace2.bzl ++++ tensorflow/workspace2.bzl +@@ -713,10 +713,10 @@ def _tf_repositories(): + tf_http_archive( + name = "cython", + build_file = "//third_party:cython.BUILD", +- sha256 = "08dbdb6aa003f03e65879de8f899f87c8c718cd874a31ae9c29f8726da2f5ab0", +- strip_prefix = "cython-3.0.0a11", ++ sha256 = "0c2eae8a4ceab7955be1e11a4ddc5dcc3aa06ce22ad594262f1555b9d10667f0", ++ strip_prefix = "cython-3.0.3", + system_build_file = "//third_party/systemlibs:cython.BUILD", +- urls = tf_mirror_urls("https://github.com/cython/cython/archive/3.0.0a11.tar.gz"), ++ urls = tf_mirror_urls("https://github.com/cython/cython/archive/3.0.3.tar.gz"), + ) + + # LINT.IfChange diff --git a/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl.rej b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl.rej new file mode 100644 index 0000000000000000000000000000000000000000..763f48a36626bebae9b308529e38f83596d62cf4 --- /dev/null +++ b/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl.rej @@ -0,0 +1,11 @@ +--- third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl ++++ third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl +@@ -221,7 +221,7 @@ def InvokeNvcc(argv, log=False): + # Unfortunately, there are other options that have -c prefix too. + # So allowing only those look like C/C++ files. + src_files = [f for f in src_files if +- re.search('\.cpp$|\.cc$|\.c$|\.cxx$|\.C$', f)] ++ re.search('\\.cpp$|\\.cc$|\\.c$|\\.cxx$|\\.C$', f)] + srcs = ' '.join(src_files) + out = ' -o ' + out_file[0] + diff --git a/third_party/gpus/find_cuda_config.py.gz.base64.rej b/third_party/gpus/find_cuda_config.py.gz.base64.rej new file mode 100644 index 0000000000000000000000000000000000000000..2ead537766632341bb51b7b44d44cd075de37174 --- /dev/null +++ b/third_party/gpus/find_cuda_config.py.gz.base64.rej @@ -0,0 +1,4 @@ +--- third_party/gpus/find_cuda_config.py.gz.base64 ++++ third_party/gpus/find_cuda_config.py.gz.base64 +@@ -1 +1 @@ +-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 \ No newline at end of file diff --git a/third_party/gpus/find_cuda_config.py.rej b/third_party/gpus/find_cuda_config.py.rej new file mode 100644 index 0000000000000000000000000000000000000000..30146d40ca2e14cdfd157d89c3bd7661311313a6 --- /dev/null +++ b/third_party/gpus/find_cuda_config.py.rej @@ -0,0 +1,30 @@ +--- third_party/gpus/find_cuda_config.py ++++ third_party/gpus/find_cuda_config.py +@@ -121,7 +121,7 @@ def _at_least_version(actual_version, required_version): + def _get_header_version(path, name): + """Returns preprocessor defines in C header file.""" + for line in io.open(path, "r", encoding="utf-8").readlines(): +- match = re.match("\s*#\s*define %s\s+(\d+)" % name, line) ++ match = re.match("\\s*#\\s*define %s\\s+(\\d+)" % name, line) + if match: + return match.group(1) + return "" +@@ -260,7 +260,8 @@ def _find_cuda_config(base_paths, required_version): + cuda_library_path = _find_library(base_paths, "cudart", cuda_version) + + def get_nvcc_version(path): +- pattern = "Cuda compilation tools, release \d+\.\d+, V(\d+\.\d+\.\d+)" ++ # HACK FIXME ++ pattern = "Cuda compilation tools, release \\d+\\.\\d+, V(\\d+\\.\\d+\\.\\d+)" + for line in subprocess.check_output([path, "--version"]).splitlines(): + match = re.match(pattern, line.decode("ascii")) + if match: +@@ -549,7 +550,7 @@ def _get_legacy_path(env_name, default=[]): + paths. Detect those and return '/usr', otherwise forward to _list_from_env(). + """ + if env_name in os.environ: +- match = re.match("^(/[^/ ]*)+/lib/\w+-linux-gnu/?$", os.environ[env_name]) ++ match = re.match("^(/[^/ ]*)+/lib/\\w+-linux-gnu/?$", os.environ[env_name]) + if match: + return [match.group(1)] + return _list_from_env(env_name, default)