Merge pull request #5878 from not-jenni:main-to-google PiperOrigin-RevId: 373687352

diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt
index e03cfe7..a7ecc5a 100644
--- a/SUBMODULE_VERSIONS.txt
+++ b/SUBMODULE_VERSIONS.txt

@@ -7,14 +7,14 @@
 9c5ff8e6e5a2fb264a27ea7ed0e16a5b10430f36 third_party/llvm-bazel
 b7a11274f90f07537e2151fa4424db257ff9a950 third_party/llvm-project
 679d7183b657a24f48d16de1fcefb20d7cd1f6a2 third_party/mlir-emitc
-a2c9b3c9d734889e14afb3558b73526699047da3 third_party/mlir-hlo
+d2cc74317c312d5679cf7465e79c63349dcf5207 third_party/mlir-hlo
 2b2bd45bbf9be04fd22ece5cc1f54679202e9257 third_party/pffft
 d8c7ee00a687ac369e62e2032514a93a9b413502 third_party/pybind11
 2887692065c38ef6617f423feafc6b69dd0a0681 third_party/ruy
 685f86471e9d26b3eb7676695a2e2cefb4551ae9 third_party/spirv_cross
 f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
 b42009b3b9d4ca35bc703f5310eedc74f584be58 third_party/stblib
-247bc59c5ab6db6f6f86c75b19342847e512b1d0 third_party/tensorflow
+befd1fa2a19bc116f42e4f0eef607d78deadcfb2 third_party/tensorflow
 f03b677ffa0fd96fcf859c32e79b740fac7dd59e third_party/tracy
 9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
 3528e2aed3e8808f33e1e7d63eeb1560456a605a third_party/vulkan_memory_allocator

diff --git a/third_party/cuda/README.txt b/third_party/cuda/README.txt
deleted file mode 100644
index be1490c..0000000
--- a/third_party/cuda/README.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-This folder contains a subset of CUDA SDK headers needed to build IREE.
-It also contains libdevice.10.bc llvm moddule used to import __nv* function
-during cuda kernel compilation.
\ No newline at end of file

diff --git a/third_party/cuda/UPDATING.md b/third_party/cuda/UPDATING.md
deleted file mode 100644
index 39f9331..0000000
--- a/third_party/cuda/UPDATING.md
+++ /dev/null

@@ -1,13 +0,0 @@
-Those headers come from CUDA SDK.
-
-To update, install CUDA SDK locally:
-```
-sudo apt-get install cuda
-```
-
-Copy cuda.h, version.txt and libdevice.10.bc:
-```
-cp /usr/local/cuda/include/cuda.h ./include/
-cp /usr/local/cuda/version.txt  .
-cp /usr/local/cuda/nvvm/libdevice/libdevice.10.bc ./nvvm/libdevice/
-```

diff --git a/third_party/cuda/nvvm/libdevice/libdevice.10.bc b/third_party/cuda/nvvm/libdevice/libdevice.10.bc
deleted file mode 100644
index 897c8c9..0000000
--- a/third_party/cuda/nvvm/libdevice/libdevice.10.bc
+++ /dev/null
Binary files differ

diff --git a/third_party/cuda/LICENSE b/third_party/cuda_headers/LICENSE
similarity index 100%
rename from third_party/cuda/LICENSE
rename to third_party/cuda_headers/LICENSE


diff --git a/third_party/cuda_headers/README.txt b/third_party/cuda_headers/README.txt
new file mode 100644
index 0000000..b437210
--- /dev/null
+++ b/third_party/cuda_headers/README.txt

@@ -0,0 +1 @@
+This folder contains a subset of CUDA SDK headers needed to build IREE.
\ No newline at end of file

diff --git a/third_party/cuda_headers/UPDATING.md b/third_party/cuda_headers/UPDATING.md
new file mode 100644
index 0000000..4f0382e
--- /dev/null
+++ b/third_party/cuda_headers/UPDATING.md

@@ -0,0 +1,12 @@
+Those headers come from CUDA SDK.
+
+To update, install CUDA SDK locally:
+```
+sudo apt-get install cuda
+```
+
+Copy cuda.h and version.txt:
+```
+cp /usr/local/cuda/include/cuda.h .
+cp /usr/local/cuda/version.txt  .
+```

diff --git a/third_party/cuda/include/cuda.h b/third_party/cuda_headers/cuda.h
similarity index 100%
rename from third_party/cuda/include/cuda.h
rename to third_party/cuda_headers/cuda.h


diff --git a/third_party/cuda/version.txt b/third_party/cuda_headers/version.txt
similarity index 100%
rename from third_party/cuda/version.txt
rename to third_party/cuda_headers/version.txt


diff --git a/third_party/mlir-hlo b/third_party/mlir-hlo
index a2c9b3c..d2cc743 160000
--- a/third_party/mlir-hlo
+++ b/third_party/mlir-hlo

@@ -1 +1 @@
-Subproject commit a2c9b3c9d734889e14afb3558b73526699047da3
+Subproject commit d2cc74317c312d5679cf7465e79c63349dcf5207

diff --git a/third_party/tensorflow b/third_party/tensorflow
index 247bc59..befd1fa 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow

@@ -1 +1 @@
-Subproject commit 247bc59c5ab6db6f6f86c75b19342847e512b1d0
+Subproject commit befd1fa2a19bc116f42e4f0eef607d78deadcfb2