Update users of moved TSL headers to use new location in XLA

This gets rid of any problems arising from TF's direct use of headers (see changes in `tensorflow/{c,core}`) such that all other users can be handled with automated changes. PiperOrigin-RevId: 713676354
google · Jan 9, 2025 · ee9efea · ee9efea
1 parent 55dee14
commit ee9efea
Show file tree

Hide file tree

Showing 90 changed files with 303 additions and 301 deletions.
diff --git a/tsl/platform/BUILD b/tsl/platform/BUILD
diff --git a/tsl/platform/abi.cc b/tsl/platform/abi.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 #include "tsl/platform/abi.h"
 
-#include "tsl/platform/types.h"
+#include "xla/tsl/platform/types.h"
 
 #if defined(_MSC_VER)
 #include <windows.h>

diff --git a/tsl/platform/abi.h b/tsl/platform/abi.h
@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <string>
 
-#include "tsl/platform/types.h"
+#include "xla/tsl/platform/types.h"
 
 namespace tsl {
 namespace port {

diff --git a/tsl/platform/abi_test.cc b/tsl/platform/abi_test.cc
@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <typeinfo>
 
-#include "tsl/platform/test.h"
+#include "xla/tsl/platform/test.h"
 
 namespace tsl {
 

diff --git a/tsl/platform/base64.cc b/tsl/platform/base64.cc
@@ -19,10 +19,10 @@ limitations under the License.
 #include <memory>
 
 #include "absl/status/status.h"
-#include "tsl/platform/errors.h"
-#include "tsl/platform/macros.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/macros.h"
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/stringpiece.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 namespace {

diff --git a/tsl/platform/base64.h b/tsl/platform/base64.h
@@ -19,7 +19,7 @@ limitations under the License.
 #include <string>
 
 #include "absl/status/status.h"
-#include "tsl/platform/status.h"
+#include "xla/tsl/platform/status.h"
 #include "tsl/platform/stringpiece.h"
 
 namespace tsl {

diff --git a/tsl/platform/blocking_counter.h b/tsl/platform/blocking_counter.h
@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <atomic>
 
-#include "tsl/platform/logging.h"
+#include "xla/tsl/platform/logging.h"
 #include "tsl/platform/mutex.h"
 
 namespace tsl {

diff --git a/tsl/platform/coding.cc b/tsl/platform/coding.cc
@@ -15,10 +15,10 @@ limitations under the License.
 
 #include "tsl/platform/coding.h"
 
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/byte_order.h"
 #include "tsl/platform/stringpiece.h"
 #include "tsl/platform/tstring.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 namespace core {

diff --git a/tsl/platform/coding.h b/tsl/platform/coding.h
@@ -21,9 +21,9 @@ limitations under the License.
 #ifndef TENSORFLOW_TSL_PLATFORM_CODING_H_
 #define TENSORFLOW_TSL_PLATFORM_CODING_H_
 
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/stringpiece.h"
 #include "tsl/platform/tstring.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 namespace core {

diff --git a/tsl/platform/cpu_info.cc b/tsl/platform/cpu_info.cc
@@ -16,9 +16,9 @@ limitations under the License.
 #include "tsl/platform/cpu_info.h"
 
 #include "absl/base/call_once.h"
-#include "tsl/platform/logging.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/platform.h"
-#include "tsl/platform/types.h"
 #if defined(PLATFORM_IS_X86)
 #include <mutex>  // NOLINT
 #endif

diff --git a/tsl/platform/cpu_info_test.cc b/tsl/platform/cpu_info_test.cc
@@ -16,7 +16,7 @@ limitations under the License.
 
 #include "tsl/platform/cpu_info.h"
 
-#include "tsl/platform/test.h"
+#include "xla/tsl/platform/test.h"
 
 namespace tsl {
 

diff --git a/tsl/platform/criticality_test.cc b/tsl/platform/criticality_test.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 #include "tsl/platform/criticality.h"
 
-#include "tsl/platform/test.h"
+#include "xla/tsl/platform/test.h"
 
 namespace tsl {
 namespace criticality {

diff --git a/tsl/platform/ctstring_test.cc b/tsl/platform/ctstring_test.cc
@@ -18,8 +18,8 @@ limitations under the License.
 #include <memory>
 #include <string>
 
+#include "xla/tsl/platform/test.h"
 #include "tsl/platform/ctstring_internal.h"
-#include "tsl/platform/test.h"
 
 static const char kLongString[] =
     "abcdefghij"

diff --git a/tsl/platform/demangle.h b/tsl/platform/demangle.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_TSL_PLATFORM_DEMANGLE_H_
 #define TENSORFLOW_TSL_PLATFORM_DEMANGLE_H_
 
-#include "tsl/platform/types.h"
+#include "xla/tsl/platform/types.h"
 
 namespace tsl {
 namespace port {

diff --git a/tsl/platform/denormal.h b/tsl/platform/denormal.h
@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_TSL_PLATFORM_DENORMAL_H_
 #define TENSORFLOW_TSL_PLATFORM_DENORMAL_H_
 
-#include "tsl/platform/macros.h"
+#include "xla/tsl/platform/macros.h"
 
 namespace tsl {
 namespace port {

diff --git a/tsl/platform/denormal_test.cc b/tsl/platform/denormal_test.cc
@@ -18,7 +18,7 @@ limitations under the License.
 #include <cstring>
 #include <limits>
 
-#include "tsl/platform/test.h"
+#include "xla/tsl/platform/test.h"
 
 namespace tsl {
 namespace port {

diff --git a/tsl/platform/fingerprint.h b/tsl/platform/fingerprint.h
@@ -16,9 +16,9 @@ limitations under the License.
 #ifndef TENSORFLOW_TSL_PLATFORM_FINGERPRINT_H_
 #define TENSORFLOW_TSL_PLATFORM_FINGERPRINT_H_
 
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/platform.h"
 #include "tsl/platform/stringpiece.h"
-#include "tsl/platform/types.h"
 
 #if TSL_IS_IN_OSS
 #define USE_OSS_FARMHASH

diff --git a/tsl/platform/fingerprint_test.cc b/tsl/platform/fingerprint_test.cc
@@ -17,8 +17,8 @@ limitations under the License.
 
 #include <unordered_set>
 
-#include "tsl/platform/test.h"
-#include "tsl/platform/types.h"
+#include "xla/tsl/platform/test.h"
+#include "xla/tsl/platform/types.h"
 
 namespace tsl {
 namespace {

diff --git a/tsl/platform/hash.cc b/tsl/platform/hash.cc
@@ -17,9 +17,9 @@ limitations under the License.
 
 #include <string.h>
 
-#include "tsl/platform/macros.h"
+#include "xla/tsl/platform/macros.h"
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/raw_coding.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 

diff --git a/tsl/platform/hash.h b/tsl/platform/hash.h
@@ -24,8 +24,8 @@ limitations under the License.
 #include <functional>
 #include <string>
 
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/stringpiece.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 

diff --git a/tsl/platform/hash_test.cc b/tsl/platform/hash_test.cc
@@ -13,14 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include "tsl/platform/hash.h"
+
 #include <map>
 #include <unordered_map>
 #include <vector>
 
-#include "tsl/platform/hash.h"
-#include "tsl/platform/logging.h"
-#include "tsl/platform/test.h"
-#include "tsl/platform/test_benchmark.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/test.h"
+#include "xla/tsl/platform/test_benchmark.h"
 
 namespace tsl {
 

diff --git a/tsl/platform/host_info.h b/tsl/platform/host_info.h
@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <cstdint>
 
-#include "tsl/platform/types.h"
+#include "xla/tsl/platform/types.h"
 
 namespace tsl {
 namespace port {

diff --git a/tsl/platform/human_readable_json.h b/tsl/platform/human_readable_json.h
@@ -20,8 +20,8 @@ limitations under the License.
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/protobuf.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 

diff --git a/tsl/platform/integral_types_test.cc b/tsl/platform/integral_types_test.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tsl/platform/test.h"
-#include "tsl/platform/types.h"
+#include "xla/tsl/platform/test.h"
+#include "xla/tsl/platform/types.h"
 
 namespace tsl {
 namespace {

diff --git a/tsl/platform/intrusive_ptr_test.cc b/tsl/platform/intrusive_ptr_test.cc
@@ -15,8 +15,8 @@ limitations under the License.
 
 #include "tsl/platform/intrusive_ptr.h"
 
+#include "xla/tsl/platform/test.h"
 #include "tsl/platform/refcount.h"
-#include "tsl/platform/test.h"
 
 namespace tsl {
 namespace core {

diff --git a/tsl/platform/mem.h b/tsl/platform/mem.h
@@ -17,9 +17,9 @@ limitations under the License.
 #define TENSORFLOW_TSL_PLATFORM_MEM_H_
 
 // TODO(cwhipkey): remove this when callers use annotations directly.
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/dynamic_annotations.h"
 #include "tsl/platform/platform.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 namespace port {

diff --git a/tsl/platform/mutex_test.cc b/tsl/platform/mutex_test.cc
@@ -15,8 +15,8 @@ limitations under the License.
 
 #include "tsl/platform/mutex.h"
 
-#include "tsl/platform/test.h"
-#include "tsl/platform/threadpool.h"
+#include "xla/tsl/platform/test.h"
+#include "xla/tsl/platform/threadpool.h"
 
 namespace tsl {
 namespace {

diff --git a/tsl/platform/net_test.cc b/tsl/platform/net_test.cc
@@ -15,8 +15,8 @@ limitations under the License.
 
 #include "tsl/platform/net.h"
 
-#include "tsl/platform/logging.h"
-#include "tsl/platform/test.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/test.h"
 
 namespace tsl {
 namespace internal {

diff --git a/tsl/platform/null_file_system.h b/tsl/platform/null_file_system.h
@@ -20,9 +20,9 @@ limitations under the License.
 #include <string>
 #include <vector>
 
-#include "tsl/platform/env.h"
-#include "tsl/platform/file_system.h"
-#include "tsl/platform/file_system_helper.h"
+#include "xla/tsl/platform/env.h"
+#include "xla/tsl/platform/file_system.h"
+#include "xla/tsl/platform/file_system_helper.h"
 
 namespace tsl {
 

diff --git a/tsl/platform/numa.h b/tsl/platform/numa.h
@@ -16,8 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_TSL_PLATFORM_NUMA_H_
 #define TENSORFLOW_TSL_PLATFORM_NUMA_H_
 
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/platform.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 namespace port {

diff --git a/tsl/platform/numa_test.cc b/tsl/platform/numa_test.cc
@@ -15,8 +15,8 @@ limitations under the License.
 
 #include "tsl/platform/numa.h"
 
-#include "tsl/platform/logging.h"
-#include "tsl/platform/test.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/test.h"
 
 namespace tsl {
 namespace internal {

diff --git a/tsl/platform/numbers.cc b/tsl/platform/numbers.cc
@@ -30,10 +30,10 @@ limitations under the License.
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "tsl/platform/logging.h"
-#include "tsl/platform/macros.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/macros.h"
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/stringprintf.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 

diff --git a/tsl/platform/numbers.h b/tsl/platform/numbers.h
@@ -22,8 +22,8 @@ limitations under the License.
 
 #include "absl/base/macros.h"
 #include "absl/strings/numbers.h"
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/stringpiece.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 namespace strings {

diff --git a/tsl/platform/numbers_test.cc b/tsl/platform/numbers_test.cc
@@ -19,8 +19,8 @@ limitations under the License.
 #include <string>
 
 #include "absl/strings/str_cat.h"
-#include "tsl/platform/test.h"
-#include "tsl/platform/types.h"
+#include "xla/tsl/platform/test.h"
+#include "xla/tsl/platform/types.h"
 
 namespace tsl {
 namespace strings {

diff --git a/tsl/platform/path.cc b/tsl/platform/path.cc
@@ -30,13 +30,13 @@ limitations under the License.
 #include <vector>
 
 #include "absl/algorithm/container.h"
-#include "tsl/platform/logging.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/mutex.h"
 #include "tsl/platform/scanner.h"
 #include "tsl/platform/str_util.h"
 #include "tsl/platform/strcat.h"
 #include "tsl/platform/stringpiece.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 namespace io {

diff --git a/tsl/platform/path.h b/tsl/platform/path.h
@@ -18,8 +18,8 @@ limitations under the License.
 
 #include <string>
 
+#include "xla/tsl/platform/types.h"
 #include "tsl/platform/stringpiece.h"
-#include "tsl/platform/types.h"
 
 namespace tsl {
 namespace io {

diff --git a/tsl/platform/path_test.cc b/tsl/platform/path_test.cc
@@ -17,9 +17,9 @@ limitations under the License.
 
 #include <string>
 
-#include "tsl/platform/env.h"
+#include "xla/tsl/platform/env.h"
+#include "xla/tsl/platform/test.h"
 #include "tsl/platform/stringpiece.h"
-#include "tsl/platform/test.h"
 
 namespace tsl {
 namespace io {