diff --git a/xla/hlo/experimental/auto_sharding/BUILD b/xla/hlo/experimental/auto_sharding/BUILD index bfdde9ed76bbd..ade737608da33 100644 --- a/xla/hlo/experimental/auto_sharding/BUILD +++ b/xla/hlo/experimental/auto_sharding/BUILD @@ -320,7 +320,7 @@ cc_library( srcs = ["metrics.cc"], hdrs = ["metrics.h"], compatible_with = get_compatible_with_libtpu_portable(), - deps = ["@tsl//tsl/lib/monitoring:counter"], + deps = ["//xla/tsl/lib/monitoring:counter"], ) xla_cc_binary( diff --git a/xla/hlo/experimental/auto_sharding/metrics.cc b/xla/hlo/experimental/auto_sharding/metrics.cc index 0c52981cf2df9..0300fa7ff0442 100644 --- a/xla/hlo/experimental/auto_sharding/metrics.cc +++ b/xla/hlo/experimental/auto_sharding/metrics.cc @@ -18,7 +18,7 @@ limitations under the License. #include #include -#include "tsl/lib/monitoring/counter.h" +#include "xla/tsl/lib/monitoring/counter.h" namespace xla { namespace metrics { diff --git a/xla/pjrt/BUILD b/xla/pjrt/BUILD index cf80c63478cd8..e45c96655a1ff 100644 --- a/xla/pjrt/BUILD +++ b/xla/pjrt/BUILD @@ -349,12 +349,12 @@ xla_cc_test( ":pjrt_compiler", ":pjrt_device_description", "//xla/client:xla_computation", + "//xla/tsl/lib/monitoring:cell_reader", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/log", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", - "@tsl//tsl/lib/monitoring:cell_reader", "@tsl//tsl/platform:status_matchers", ], ) @@ -435,10 +435,10 @@ cc_library( srcs = ["metrics.cc"], hdrs = ["metrics.h"], deps = [ + "//xla/tsl/lib/monitoring:counter", + "//xla/tsl/lib/monitoring:gauge", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/strings", - "@tsl//tsl/lib/monitoring:counter", - "@tsl//tsl/lib/monitoring:gauge", ], ) diff --git a/xla/pjrt/gpu/BUILD b/xla/pjrt/gpu/BUILD index 8f199bbad65d8..ac490a10dfe9d 100644 --- a/xla/pjrt/gpu/BUILD +++ b/xla/pjrt/gpu/BUILD @@ -292,9 +292,9 @@ cc_library( srcs = ["gpu_metrics.cc"], hdrs = ["gpu_metrics.h"], deps = [ + "//xla/tsl/lib/monitoring:gauge", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:string_view", - "@tsl//tsl/lib/monitoring:gauge", ], ) diff --git a/xla/pjrt/gpu/gpu_metrics.cc b/xla/pjrt/gpu/gpu_metrics.cc index 56cc0dc6861b8..7cc5f63bff5bc 100644 --- a/xla/pjrt/gpu/gpu_metrics.cc +++ b/xla/pjrt/gpu/gpu_metrics.cc @@ -18,7 +18,7 @@ limitations under the License. #include #include "absl/strings/str_cat.h" -#include "tsl/lib/monitoring/gauge.h" +#include "xla/tsl/lib/monitoring/gauge.h" namespace xla { namespace { diff --git a/xla/pjrt/metrics.cc b/xla/pjrt/metrics.cc index add1aac679c98..2268261aa244c 100644 --- a/xla/pjrt/metrics.cc +++ b/xla/pjrt/metrics.cc @@ -17,8 +17,8 @@ limitations under the License. #include -#include "tsl/lib/monitoring/counter.h" -#include "tsl/lib/monitoring/gauge.h" +#include "xla/tsl/lib/monitoring/counter.h" +#include "xla/tsl/lib/monitoring/gauge.h" namespace xla { namespace { diff --git a/xla/pjrt/metrics.h b/xla/pjrt/metrics.h index 602886b740ef6..e9df0d3ed5364 100644 --- a/xla/pjrt/metrics.h +++ b/xla/pjrt/metrics.h @@ -18,7 +18,7 @@ limitations under the License. #include "absl/base/attributes.h" #include "absl/strings/string_view.h" -#include "tsl/lib/monitoring/counter.h" +#include "xla/tsl/lib/monitoring/counter.h" // Simplified version of tensorflow/core/framework/metrics.h for JAX. diff --git a/xla/pjrt/pjrt_compiler_test.cc b/xla/pjrt/pjrt_compiler_test.cc index d73bba22f8277..454e44f07b8fa 100644 --- a/xla/pjrt/pjrt_compiler_test.cc +++ b/xla/pjrt/pjrt_compiler_test.cc @@ -30,7 +30,7 @@ limitations under the License. #include "xla/pjrt/metrics.h" #include "xla/pjrt/pjrt_client.h" #include "xla/pjrt/pjrt_device_description.h" -#include "tsl/lib/monitoring/cell_reader.h" +#include "xla/tsl/lib/monitoring/cell_reader.h" #include "tsl/platform/status_matchers.h" namespace xla { diff --git a/xla/service/BUILD b/xla/service/BUILD index 959606abb44b5..cfd224730cd0b 100644 --- a/xla/service/BUILD +++ b/xla/service/BUILD @@ -4216,6 +4216,7 @@ cc_library( "//xla/client:xla_builder", "//xla/hlo/ir:hlo", "//xla/hlo/pass:hlo_pass", + "//xla/tsl/lib/monitoring:gauge", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/functional:function_ref", @@ -4226,7 +4227,6 @@ cc_library( "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", "@com_google_absl//absl/types:span", - "@tsl//tsl/lib/monitoring:gauge", "@tsl//tsl/platform:errors", "@tsl//tsl/platform:statusor", ], diff --git a/xla/service/dynamic_padder.cc b/xla/service/dynamic_padder.cc index 5aa8639a4e41c..8d5b6005fb384 100644 --- a/xla/service/dynamic_padder.cc +++ b/xla/service/dynamic_padder.cc @@ -54,10 +54,10 @@ limitations under the License. #include "xla/shape.h" #include "xla/shape_util.h" #include "xla/status_macros.h" +#include "xla/tsl/lib/monitoring/gauge.h" #include "xla/util.h" #include "xla/window_util.h" #include "xla/xla_data.pb.h" -#include "tsl/lib/monitoring/gauge.h" #include "tsl/platform/errors.h" #include "tsl/platform/statusor.h" diff --git a/xla/service/gpu/BUILD b/xla/service/gpu/BUILD index ad89a46c852e0..3fc11e3bb7296 100644 --- a/xla/service/gpu/BUILD +++ b/xla/service/gpu/BUILD @@ -1571,6 +1571,7 @@ cc_library( "//xla/stream_executor:semantic_version", "//xla/translate/hlo_to_mhlo:hlo_utils", "//xla/translate/mhlo_to_hlo:location_exporter", + "//xla/tsl/lib/monitoring:counter", "//xla:autotune_results_proto_cc", "//xla:debug_options_flags", "//xla:shape_util", @@ -1579,7 +1580,6 @@ cc_library( "//xla:util", "//xla:xla_data_proto_cc", "//xla:xla_proto_cc", - "@tsl//tsl/lib/monitoring:counter", "@tsl//tsl/platform:blocking_counter", "@tsl//tsl/platform:casts", "@tsl//tsl/platform:env", @@ -2617,9 +2617,9 @@ cc_library( srcs = ["metrics.cc"], hdrs = ["metrics.h"], deps = [ - "@tsl//tsl/lib/monitoring:counter", - "@tsl//tsl/lib/monitoring:gauge", - "@tsl//tsl/lib/monitoring:sampler", + "//xla/tsl/lib/monitoring:counter", + "//xla/tsl/lib/monitoring:gauge", + "//xla/tsl/lib/monitoring:sampler", ], ) diff --git a/xla/service/gpu/metrics.cc b/xla/service/gpu/metrics.cc index 7f1056e40a12b..87f7452639a14 100644 --- a/xla/service/gpu/metrics.cc +++ b/xla/service/gpu/metrics.cc @@ -17,9 +17,9 @@ limitations under the License. #include -#include "tsl/lib/monitoring/counter.h" -#include "tsl/lib/monitoring/gauge.h" -#include "tsl/lib/monitoring/sampler.h" +#include "xla/tsl/lib/monitoring/counter.h" +#include "xla/tsl/lib/monitoring/gauge.h" +#include "xla/tsl/lib/monitoring/sampler.h" namespace xla { namespace { diff --git a/xla/tsl/distributed_runtime/coordination/BUILD b/xla/tsl/distributed_runtime/coordination/BUILD index 00764e3f94d43..7072143074b72 100644 --- a/xla/tsl/distributed_runtime/coordination/BUILD +++ b/xla/tsl/distributed_runtime/coordination/BUILD @@ -145,6 +145,7 @@ tsl_gpu_library( ":coordination_service_error_util", "//xla/tsl/distributed_runtime:call_options", "//xla/tsl/framework:cancellation", + "//xla/tsl/lib/monitoring:gauge", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/functional:bind_front", "@com_google_absl//absl/log", @@ -154,7 +155,6 @@ tsl_gpu_library( "@com_google_absl//absl/strings", "@com_google_absl//absl/synchronization", "@com_google_absl//absl/time", - "@tsl//tsl/lib/monitoring:gauge", "@tsl//tsl/platform:env", "@tsl//tsl/platform:random", "@tsl//tsl/platform:status", diff --git a/xla/tsl/distributed_runtime/coordination/coordination_service_agent.cc b/xla/tsl/distributed_runtime/coordination/coordination_service_agent.cc index a7d85df79ce30..4290fba754f88 100644 --- a/xla/tsl/distributed_runtime/coordination/coordination_service_agent.cc +++ b/xla/tsl/distributed_runtime/coordination/coordination_service_agent.cc @@ -44,7 +44,7 @@ limitations under the License. #include "xla/tsl/distributed_runtime/coordination/coordination_client.h" #include "xla/tsl/distributed_runtime/coordination/coordination_service_error_util.h" #include "xla/tsl/framework/cancellation.h" -#include "tsl/lib/monitoring/gauge.h" +#include "xla/tsl/lib/monitoring/gauge.h" #include "tsl/platform/env.h" #include "tsl/platform/random.h" #include "tsl/platform/status.h" diff --git a/xla/tsl/distributed_runtime/preemption/BUILD b/xla/tsl/distributed_runtime/preemption/BUILD index e51c3f444ce03..36d94706db102 100644 --- a/xla/tsl/distributed_runtime/preemption/BUILD +++ b/xla/tsl/distributed_runtime/preemption/BUILD @@ -54,6 +54,7 @@ cc_library( ":preemption_notifier", "//xla/tsl/distributed_runtime:call_options", "//xla/tsl/distributed_runtime/coordination:coordination_service_agent", + "//xla/tsl/lib/monitoring:gauge", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/log", "@com_google_absl//absl/memory", @@ -62,7 +63,6 @@ cc_library( "@com_google_absl//absl/strings", "@com_google_absl//absl/synchronization", "@com_google_absl//absl/time", - "@tsl//tsl/lib/monitoring:gauge", "@tsl//tsl/platform:env", "@tsl//tsl/platform:statusor", "@tsl//tsl/protobuf:coordination_service_proto_cc", diff --git a/xla/tsl/distributed_runtime/preemption/preemption_sync_manager.cc b/xla/tsl/distributed_runtime/preemption/preemption_sync_manager.cc index 00845e5001b7f..ee85f70e04b77 100644 --- a/xla/tsl/distributed_runtime/preemption/preemption_sync_manager.cc +++ b/xla/tsl/distributed_runtime/preemption/preemption_sync_manager.cc @@ -36,7 +36,7 @@ limitations under the License. #include "xla/tsl/distributed_runtime/call_options.h" #include "xla/tsl/distributed_runtime/coordination/coordination_service_agent.h" #include "xla/tsl/distributed_runtime/preemption/preemption_notifier.h" -#include "tsl/lib/monitoring/gauge.h" +#include "xla/tsl/lib/monitoring/gauge.h" #include "tsl/platform/env.h" #include "tsl/platform/statusor.h" #include "tsl/protobuf/coordination_service.pb.h" diff --git a/xla/tsl/framework/BUILD b/xla/tsl/framework/BUILD index 1465aee97a739..bcdd68b47e618 100644 --- a/xla/tsl/framework/BUILD +++ b/xla/tsl/framework/BUILD @@ -317,7 +317,7 @@ cc_library( srcs = ["metrics.cc"], hdrs = ["metrics.h"], deps = [ - "@tsl//tsl/lib/monitoring:counter", + "//xla/tsl/lib/monitoring:counter", ], ) diff --git a/xla/tsl/framework/metrics.cc b/xla/tsl/framework/metrics.cc index 7aec3545a29a9..10317ac0b20fe 100644 --- a/xla/tsl/framework/metrics.cc +++ b/xla/tsl/framework/metrics.cc @@ -17,7 +17,7 @@ limitations under the License. #include -#include "tsl/lib/monitoring/counter.h" +#include "xla/tsl/lib/monitoring/counter.h" namespace tsl { namespace metrics { diff --git a/third_party/tsl/tsl/lib/monitoring/BUILD b/xla/tsl/lib/monitoring/BUILD similarity index 67% rename from third_party/tsl/tsl/lib/monitoring/BUILD rename to xla/tsl/lib/monitoring/BUILD index e5cea3f63825b..8e409b93817d8 100644 --- a/third_party/tsl/tsl/lib/monitoring/BUILD +++ b/xla/tsl/lib/monitoring/BUILD @@ -1,9 +1,9 @@ -load("@xla//xla/tsl:tsl.bzl", "internal_visibility") -load("@xla//xla/tsl:tsl.default.bzl", "filegroup") load( - "//tsl/platform:rules_cc.bzl", + "@tsl//tsl/platform:rules_cc.bzl", "cc_library", ) +load("//xla/tsl:tsl.bzl", "internal_visibility") +load("//xla/tsl:tsl.default.bzl", "filegroup") package( # copybara:uncomment default_applicable_licenses = ["//tensorflow:license"], @@ -15,16 +15,16 @@ package( # tensorflow/core/platform:monitoring depends on this package "//tensorflow/core/platform:__subpackages__", # tensorflow/compiler/xla/pjrt:metrics depends on this package - "@xla//xla/pjrt:__subpackages__", - "@xla//xla/service/gpu:__subpackages__", + "//xla/pjrt:__subpackages__", + "//xla/service/gpu:__subpackages__", # tensorflow/compiler/mlir/tfrt:tf_jitrt depends on this package "//tensorflow/compiler/mlir/tfrt:__subpackages__", - "@xla//xla/stream_executor:__subpackages__", - "@xla//xla/hlo/experimental:__subpackages__", + "//xla/stream_executor:__subpackages__", + "//xla/hlo/experimental:__subpackages__", "//tensorflow/core/lib/monitoring:__subpackages__", - "@xla//xla/service:__subpackages__", - "@xla//xla/tsl/framework:__subpackages__", - "@xla//xla/tsl/distributed_runtime:__subpackages__", + "//xla/service:__subpackages__", + "//xla/tsl/framework:__subpackages__", + "//xla/tsl/distributed_runtime:__subpackages__", "//tensorflow/compiler/mlir/tf2xla:__subpackages__", "//tensorflow_serving/model_servers:__subpackages__", ]), @@ -37,13 +37,13 @@ cc_library( deps = [ ":collection_registry", ":metric_def", - "//tsl/platform", - "//tsl/platform:logging", - "//tsl/platform:macros", - "//tsl/platform:mutex", - "//tsl/platform:status", - "//tsl/platform:thread_annotations", - "//tsl/platform:types", + "@tsl//tsl/platform", + "@tsl//tsl/platform:logging", + "@tsl//tsl/platform:macros", + "@tsl//tsl/platform:mutex", + "@tsl//tsl/platform:status", + "@tsl//tsl/platform:thread_annotations", + "@tsl//tsl/platform:types", ], ) @@ -55,12 +55,12 @@ cc_library( deps = [ ":collection_registry", ":metric_def", - "//tsl/platform", - "//tsl/platform:macros", - "//tsl/platform:mutex", - "//tsl/platform:status", - "//tsl/platform:thread_annotations", - "//tsl/platform:types", + "@tsl//tsl/platform", + "@tsl//tsl/platform:macros", + "@tsl//tsl/platform:mutex", + "@tsl//tsl/platform:status", + "@tsl//tsl/platform:thread_annotations", + "@tsl//tsl/platform:types", ], ) @@ -71,16 +71,16 @@ cc_library( deps = [ ":collection_registry", ":metric_def", - "//tsl/platform", - "//tsl/platform:macros", - "//tsl/platform:mutex", - "//tsl/platform:status", - "//tsl/platform:thread_annotations", - "//tsl/platform:types", - "//tsl/protobuf:histogram_proto_cc", + "//xla/tsl/lib/histogram", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", - "@xla//xla/tsl/lib/histogram", + "@tsl//tsl/platform", + "@tsl//tsl/platform:macros", + "@tsl//tsl/platform:mutex", + "@tsl//tsl/platform:status", + "@tsl//tsl/platform:thread_annotations", + "@tsl//tsl/platform:types", + "@tsl//tsl/protobuf:histogram_proto_cc", ], ) @@ -90,7 +90,7 @@ cc_library( "types.h", ], deps = [ - "//tsl/platform:types", + "@tsl//tsl/platform:types", ], ) @@ -100,9 +100,9 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":types", - "//tsl/platform:stringpiece", - "//tsl/platform:types", - "//tsl/protobuf:histogram_proto_cc", + "@tsl//tsl/platform:stringpiece", + "@tsl//tsl/platform:types", + "@tsl//tsl/protobuf:histogram_proto_cc", ], ) @@ -115,15 +115,15 @@ cc_library( ":collected_metrics", ":metric_def", ":types", - "//tsl/platform", - "//tsl/platform:env", - "//tsl/platform:logging", - "//tsl/platform:macros", - "//tsl/platform:mutex", - "//tsl/platform:stringpiece", - "//tsl/platform:thread_annotations", - "//tsl/platform:types", - "//tsl/protobuf:histogram_proto_cc", + "@tsl//tsl/platform", + "@tsl//tsl/platform:env", + "@tsl//tsl/platform:logging", + "@tsl//tsl/platform:macros", + "@tsl//tsl/platform:mutex", + "@tsl//tsl/platform:stringpiece", + "@tsl//tsl/platform:thread_annotations", + "@tsl//tsl/platform:types", + "@tsl//tsl/protobuf:histogram_proto_cc", ], ) @@ -135,7 +135,7 @@ cc_library( deps = [ ":metric_def", ":types", - "//tsl/protobuf:histogram_proto_cc", + "@tsl//tsl/protobuf:histogram_proto_cc", ], ) @@ -163,14 +163,14 @@ cc_library( ":collection_registry", ":metric_def", ":test_utils", - "//tsl/platform:errors", - "//tsl/platform:status", - "//tsl/platform:statusor", - "//tsl/platform:types", "@com_google_absl//absl/log", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", + "@tsl//tsl/platform:errors", + "@tsl//tsl/platform:status", + "@tsl//tsl/platform:statusor", + "@tsl//tsl/platform:types", ], ) @@ -182,14 +182,14 @@ cc_library( ":collection_registry", ":metric_def", ":types", - "//tsl/platform", - "//tsl/platform:env_time", - "//tsl/platform:macros", - "//tsl/platform:mutex", - "//tsl/platform:status", - "//tsl/platform:thread_annotations", - "//tsl/platform:types", "@com_google_absl//absl/status", + "@tsl//tsl/platform", + "@tsl//tsl/platform:env_time", + "@tsl//tsl/platform:macros", + "@tsl//tsl/platform:mutex", + "@tsl//tsl/platform:status", + "@tsl//tsl/platform:thread_annotations", + "@tsl//tsl/platform:types", ], ) @@ -201,12 +201,12 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":types", - "//tsl/platform:errors", - "//tsl/platform:statusor", - "//tsl/protobuf:histogram_proto_cc", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", + "@tsl//tsl/platform:errors", + "@tsl//tsl/platform:statusor", + "@tsl//tsl/protobuf:histogram_proto_cc", ], ) @@ -216,8 +216,8 @@ cc_library( "timed.h", ], deps = [ - "//tsl/platform:env_time", - "//tsl/platform:types", + "@tsl//tsl/platform:env_time", + "@tsl//tsl/platform:types", ], ) diff --git a/third_party/tsl/tsl/lib/monitoring/cell_reader-inl.cc b/xla/tsl/lib/monitoring/cell_reader-inl.cc similarity index 95% rename from third_party/tsl/tsl/lib/monitoring/cell_reader-inl.cc rename to xla/tsl/lib/monitoring/cell_reader-inl.cc index 954857f63254e..6f7f21d4b7732 100644 --- a/third_party/tsl/tsl/lib/monitoring/cell_reader-inl.cc +++ b/xla/tsl/lib/monitoring/cell_reader-inl.cc @@ -12,7 +12,7 @@ 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 "tsl/lib/monitoring/cell_reader-inl.h" +#include "xla/tsl/lib/monitoring/cell_reader-inl.h" #include #include @@ -23,10 +23,10 @@ limitations under the License. #include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_join.h" -#include "tsl/lib/monitoring/collected_metrics.h" -#include "tsl/lib/monitoring/collection_registry.h" -#include "tsl/lib/monitoring/metric_def.h" -#include "tsl/lib/monitoring/test_utils.h" +#include "xla/tsl/lib/monitoring/collected_metrics.h" +#include "xla/tsl/lib/monitoring/collection_registry.h" +#include "xla/tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/test_utils.h" #include "tsl/platform/errors.h" #include "tsl/platform/statusor.h" #include "tsl/platform/types.h" diff --git a/third_party/tsl/tsl/lib/monitoring/cell_reader-inl.h b/xla/tsl/lib/monitoring/cell_reader-inl.h similarity index 93% rename from third_party/tsl/tsl/lib/monitoring/cell_reader-inl.h rename to xla/tsl/lib/monitoring/cell_reader-inl.h index d14e8a4ef9418..e58b1ee9698da 100644 --- a/third_party/tsl/tsl/lib/monitoring/cell_reader-inl.h +++ b/xla/tsl/lib/monitoring/cell_reader-inl.h @@ -12,8 +12,8 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_CELL_READER_INL_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_CELL_READER_INL_H_ +#ifndef XLA_TSL_LIB_MONITORING_CELL_READER_INL_H_ +#define XLA_TSL_LIB_MONITORING_CELL_READER_INL_H_ #include #include @@ -24,9 +24,9 @@ limitations under the License. #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "tsl/lib/monitoring/collected_metrics.h" -#include "tsl/lib/monitoring/metric_def.h" -#include "tsl/lib/monitoring/test_utils.h" +#include "xla/tsl/lib/monitoring/collected_metrics.h" +#include "xla/tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/test_utils.h" #include "tsl/platform/errors.h" #include "tsl/platform/status.h" #include "tsl/platform/statusor.h" @@ -135,4 +135,4 @@ bool GetDelta(const bool& a, const bool& b); } // namespace monitoring } // namespace tsl -#endif // TENSORFLOW_TSL_LIB_MONITORING_CELL_READER_INL_H_ +#endif // XLA_TSL_LIB_MONITORING_CELL_READER_INL_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/cell_reader.h b/xla/tsl/lib/monitoring/cell_reader.h similarity index 95% rename from third_party/tsl/tsl/lib/monitoring/cell_reader.h rename to xla/tsl/lib/monitoring/cell_reader.h index 76870f80abc4d..782eb5bfd9347 100644 --- a/third_party/tsl/tsl/lib/monitoring/cell_reader.h +++ b/xla/tsl/lib/monitoring/cell_reader.h @@ -12,8 +12,8 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_CELL_READER_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_CELL_READER_H_ +#ifndef XLA_TSL_LIB_MONITORING_CELL_READER_H_ +#define XLA_TSL_LIB_MONITORING_CELL_READER_H_ #include #include @@ -21,9 +21,9 @@ limitations under the License. #include #include "absl/container/flat_hash_map.h" -#include "tsl/lib/monitoring/cell_reader-inl.h" -#include "tsl/lib/monitoring/collected_metrics.h" -#include "tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/cell_reader-inl.h" +#include "xla/tsl/lib/monitoring/collected_metrics.h" +#include "xla/tsl/lib/monitoring/metric_def.h" namespace tsl { namespace monitoring { @@ -163,4 +163,4 @@ ValueType CellReader::Delta(const LabelType&... labels) { } // namespace monitoring } // namespace tsl -#endif // TENSORFLOW_TSL_LIB_MONITORING_CELL_READER_H_ +#endif // XLA_TSL_LIB_MONITORING_CELL_READER_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/collected_metrics.h b/xla/tsl/lib/monitoring/collected_metrics.h similarity index 95% rename from third_party/tsl/tsl/lib/monitoring/collected_metrics.h rename to xla/tsl/lib/monitoring/collected_metrics.h index ba67299b57a95..48b655c2a8a2b 100644 --- a/third_party/tsl/tsl/lib/monitoring/collected_metrics.h +++ b/xla/tsl/lib/monitoring/collected_metrics.h @@ -17,16 +17,16 @@ limitations under the License. // These are to be used only by the CollectionRegistry and exporters which // collect metrics using the CollectionRegistry. -#ifndef TENSORFLOW_TSL_LIB_MONITORING_COLLECTED_METRICS_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_COLLECTED_METRICS_H_ +#ifndef XLA_TSL_LIB_MONITORING_COLLECTED_METRICS_H_ +#define XLA_TSL_LIB_MONITORING_COLLECTED_METRICS_H_ #include #include #include #include -#include "tsl/lib/monitoring/metric_def.h" -#include "tsl/lib/monitoring/types.h" +#include "xla/tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/types.h" #include "tsl/protobuf/histogram.pb.h" namespace tsl { @@ -154,4 +154,4 @@ struct CollectedMetrics { } // namespace monitoring } // namespace tsl -#endif // TENSORFLOW_TSL_LIB_MONITORING_COLLECTED_METRICS_H_ +#endif // XLA_TSL_LIB_MONITORING_COLLECTED_METRICS_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/collection_registry.cc b/xla/tsl/lib/monitoring/collection_registry.cc similarity index 96% rename from third_party/tsl/tsl/lib/monitoring/collection_registry.cc rename to xla/tsl/lib/monitoring/collection_registry.cc index 1e1b15d6825ad..90ce825e4a4db 100644 --- a/third_party/tsl/tsl/lib/monitoring/collection_registry.cc +++ b/xla/tsl/lib/monitoring/collection_registry.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tsl/lib/monitoring/collection_registry.h" +#include "xla/tsl/lib/monitoring/collection_registry.h" -#include "tsl/lib/monitoring/collected_metrics.h" -#include "tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/collected_metrics.h" +#include "xla/tsl/lib/monitoring/metric_def.h" #include "tsl/platform/env.h" #include "tsl/platform/mutex.h" #include "tsl/platform/stringpiece.h" diff --git a/third_party/tsl/tsl/lib/monitoring/collection_registry.h b/xla/tsl/lib/monitoring/collection_registry.h similarity index 97% rename from third_party/tsl/tsl/lib/monitoring/collection_registry.h rename to xla/tsl/lib/monitoring/collection_registry.h index 8d554991b522c..46e93e5c2e46f 100644 --- a/third_party/tsl/tsl/lib/monitoring/collection_registry.h +++ b/xla/tsl/lib/monitoring/collection_registry.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_COLLECTION_REGISTRY_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_COLLECTION_REGISTRY_H_ +#ifndef XLA_TSL_LIB_MONITORING_COLLECTION_REGISTRY_H_ +#define XLA_TSL_LIB_MONITORING_COLLECTION_REGISTRY_H_ namespace tensorflow { namespace monitoring { namespace test_util { @@ -34,7 +34,7 @@ class CollectionRegistryTestAccess; #include #include -#include "tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/metric_def.h" #include "tsl/platform/macros.h" namespace tsl { @@ -107,9 +107,9 @@ class CollectionRegistry { #include #include -#include "tsl/lib/monitoring/collected_metrics.h" -#include "tsl/lib/monitoring/metric_def.h" -#include "tsl/lib/monitoring/types.h" +#include "xla/tsl/lib/monitoring/collected_metrics.h" +#include "xla/tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/types.h" #include "tsl/platform/env.h" #include "tsl/platform/logging.h" #include "tsl/platform/macros.h" @@ -516,4 +516,4 @@ class ExporterRegistration { #endif // IS_MOBILE_PLATFORM -#endif // TENSORFLOW_TSL_LIB_MONITORING_COLLECTION_REGISTRY_H_ +#endif // XLA_TSL_LIB_MONITORING_COLLECTION_REGISTRY_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/counter.h b/xla/tsl/lib/monitoring/counter.h similarity index 96% rename from third_party/tsl/tsl/lib/monitoring/counter.h rename to xla/tsl/lib/monitoring/counter.h index 6f0169fe1f65c..e219512e2d679 100644 --- a/third_party/tsl/tsl/lib/monitoring/counter.h +++ b/xla/tsl/lib/monitoring/counter.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_COUNTER_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_COUNTER_H_ +#ifndef XLA_TSL_LIB_MONITORING_COUNTER_H_ +#define XLA_TSL_LIB_MONITORING_COUNTER_H_ // clang-format off // Required for IS_MOBILE_PLATFORM @@ -84,8 +84,8 @@ class Counter { #include #include -#include "tsl/lib/monitoring/collection_registry.h" -#include "tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/collection_registry.h" +#include "xla/tsl/lib/monitoring/metric_def.h" #include "tsl/platform/logging.h" #include "tsl/platform/macros.h" #include "tsl/platform/mutex.h" @@ -244,4 +244,4 @@ CounterCell* Counter::GetCell(const Labels&... labels) } // namespace tsl #endif // IS_MOBILE_PLATFORM -#endif // TENSORFLOW_TSL_LIB_MONITORING_COUNTER_H_ +#endif // XLA_TSL_LIB_MONITORING_COUNTER_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/gauge.h b/xla/tsl/lib/monitoring/gauge.h similarity index 97% rename from third_party/tsl/tsl/lib/monitoring/gauge.h rename to xla/tsl/lib/monitoring/gauge.h index b600d98ab1126..eac1ea94249c1 100644 --- a/third_party/tsl/tsl/lib/monitoring/gauge.h +++ b/xla/tsl/lib/monitoring/gauge.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_GAUGE_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_GAUGE_H_ +#ifndef XLA_TSL_LIB_MONITORING_GAUGE_H_ +#define XLA_TSL_LIB_MONITORING_GAUGE_H_ // clang-format off // Required for IS_MOBILE_PLATFORM @@ -100,8 +100,8 @@ class Gauge { #include #include -#include "tsl/lib/monitoring/collection_registry.h" -#include "tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/collection_registry.h" +#include "xla/tsl/lib/monitoring/metric_def.h" #include "tsl/platform/macros.h" #include "tsl/platform/mutex.h" #include "tsl/platform/status.h" @@ -336,4 +336,4 @@ GaugeCell* Gauge::GetCell( } // namespace tsl #endif // IS_MOBILE_PLATFORM -#endif // TENSORFLOW_TSL_LIB_MONITORING_GAUGE_H_ +#endif // XLA_TSL_LIB_MONITORING_GAUGE_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/metric_def.h b/xla/tsl/lib/monitoring/metric_def.h similarity index 96% rename from third_party/tsl/tsl/lib/monitoring/metric_def.h rename to xla/tsl/lib/monitoring/metric_def.h index b23ea3c79060f..05a1c44da5b9a 100644 --- a/third_party/tsl/tsl/lib/monitoring/metric_def.h +++ b/xla/tsl/lib/monitoring/metric_def.h @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_METRIC_DEF_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_METRIC_DEF_H_ +#ifndef XLA_TSL_LIB_MONITORING_METRIC_DEF_H_ +#define XLA_TSL_LIB_MONITORING_METRIC_DEF_H_ #include #include #include #include -#include "tsl/lib/monitoring/types.h" +#include "xla/tsl/lib/monitoring/types.h" #include "tsl/platform/stringpiece.h" #include "tsl/platform/types.h" #include "tsl/protobuf/histogram.pb.h" @@ -182,4 +182,4 @@ class MetricDef : public AbstractMetricDef { } // namespace monitoring } // namespace tsl -#endif // TENSORFLOW_TSL_LIB_MONITORING_METRIC_DEF_H_ +#endif // XLA_TSL_LIB_MONITORING_METRIC_DEF_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/percentile_sampler.cc b/xla/tsl/lib/monitoring/percentile_sampler.cc similarity index 97% rename from third_party/tsl/tsl/lib/monitoring/percentile_sampler.cc rename to xla/tsl/lib/monitoring/percentile_sampler.cc index 01801ebc45384..46e71d1d30a51 100644 --- a/third_party/tsl/tsl/lib/monitoring/percentile_sampler.cc +++ b/xla/tsl/lib/monitoring/percentile_sampler.cc @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tsl/lib/monitoring/percentile_sampler.h" +#include "xla/tsl/lib/monitoring/percentile_sampler.h" #include #include #include -#include "tsl/lib/monitoring/types.h" +#include "xla/tsl/lib/monitoring/types.h" #include "tsl/platform/env_time.h" #include "tsl/platform/macros.h" #include "tsl/platform/mutex.h" diff --git a/third_party/tsl/tsl/lib/monitoring/percentile_sampler.h b/xla/tsl/lib/monitoring/percentile_sampler.h similarity index 95% rename from third_party/tsl/tsl/lib/monitoring/percentile_sampler.h rename to xla/tsl/lib/monitoring/percentile_sampler.h index c7bc522b86d5d..d419eb1934c5c 100644 --- a/third_party/tsl/tsl/lib/monitoring/percentile_sampler.h +++ b/xla/tsl/lib/monitoring/percentile_sampler.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_PERCENTILE_SAMPLER_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_PERCENTILE_SAMPLER_H_ +#ifndef XLA_TSL_LIB_MONITORING_PERCENTILE_SAMPLER_H_ +#define XLA_TSL_LIB_MONITORING_PERCENTILE_SAMPLER_H_ // clang-format off // Required for IS_MOBILE_PLATFORM @@ -27,11 +27,11 @@ limitations under the License. // platforms. #ifdef IS_MOBILE_PLATFORM -#include "tsl/platform/status.h" -#include "tsl/lib/monitoring/collection_registry.h" -#include "tsl/lib/monitoring/metric_def.h" -#include "tsl/lib/monitoring/types.h" +#include "xla/tsl/lib/monitoring/collection_registry.h" +#include "xla/tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/types.h" #include "tsl/platform/macros.h" +#include "tsl/platform/status.h" namespace tsl { namespace monitoring { @@ -85,12 +85,12 @@ PercentileSampler* PercentileSampler::New( #include #include -#include "tsl/platform/status.h" -#include "tsl/lib/monitoring/collection_registry.h" -#include "tsl/lib/monitoring/metric_def.h" -#include "tsl/lib/monitoring/types.h" +#include "xla/tsl/lib/monitoring/collection_registry.h" +#include "xla/tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/types.h" #include "tsl/platform/macros.h" #include "tsl/platform/mutex.h" +#include "tsl/platform/status.h" #include "tsl/platform/thread_annotations.h" namespace tsl { @@ -291,4 +291,4 @@ PercentileSamplerCell* PercentileSampler::GetCell( } // namespace tsl #endif // IS_MOBILE_PLATFORM -#endif // TENSORFLOW_TSL_LIB_MONITORING_PERCENTILE_SAMPLER_H_ +#endif // XLA_TSL_LIB_MONITORING_PERCENTILE_SAMPLER_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/sampler.cc b/xla/tsl/lib/monitoring/sampler.cc similarity index 98% rename from third_party/tsl/tsl/lib/monitoring/sampler.cc rename to xla/tsl/lib/monitoring/sampler.cc index 444eb707c350f..6ee26bc5ee01c 100644 --- a/third_party/tsl/tsl/lib/monitoring/sampler.cc +++ b/xla/tsl/lib/monitoring/sampler.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tsl/lib/monitoring/sampler.h" +#include "xla/tsl/lib/monitoring/sampler.h" // clang-format off // Required for IS_MOBILE_PLATFORM diff --git a/third_party/tsl/tsl/lib/monitoring/sampler.h b/xla/tsl/lib/monitoring/sampler.h similarity index 97% rename from third_party/tsl/tsl/lib/monitoring/sampler.h rename to xla/tsl/lib/monitoring/sampler.h index e17f3cdae00d9..34e7d79b9cced 100644 --- a/third_party/tsl/tsl/lib/monitoring/sampler.h +++ b/xla/tsl/lib/monitoring/sampler.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_SAMPLER_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_SAMPLER_H_ +#ifndef XLA_TSL_LIB_MONITORING_SAMPLER_H_ +#define XLA_TSL_LIB_MONITORING_SAMPLER_H_ // clang-format off // Required for IS_MOBILE_PLATFORM @@ -28,7 +28,7 @@ limitations under the License. #include -#include "tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/metric_def.h" #include "tsl/platform/macros.h" #include "tsl/platform/status.h" #include "tsl/platform/types.h" @@ -123,8 +123,8 @@ class Sampler { #include #include "xla/tsl/lib/histogram/histogram.h" -#include "tsl/lib/monitoring/collection_registry.h" -#include "tsl/lib/monitoring/metric_def.h" +#include "xla/tsl/lib/monitoring/collection_registry.h" +#include "xla/tsl/lib/monitoring/metric_def.h" #include "tsl/platform/macros.h" #include "tsl/platform/mutex.h" #include "tsl/platform/status.h" @@ -335,4 +335,4 @@ SamplerCell* Sampler::GetCell(const Labels&... labels) } // namespace tsl #endif // IS_MOBILE_PLATFORM -#endif // TENSORFLOW_TSL_LIB_MONITORING_SAMPLER_H_ +#endif // XLA_TSL_LIB_MONITORING_SAMPLER_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/test_utils.cc b/xla/tsl/lib/monitoring/test_utils.cc similarity index 97% rename from third_party/tsl/tsl/lib/monitoring/test_utils.cc rename to xla/tsl/lib/monitoring/test_utils.cc index b23afdfc5f144..b895ead9d0b92 100644 --- a/third_party/tsl/tsl/lib/monitoring/test_utils.cc +++ b/xla/tsl/lib/monitoring/test_utils.cc @@ -12,7 +12,7 @@ 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 "tsl/lib/monitoring/test_utils.h" +#include "xla/tsl/lib/monitoring/test_utils.h" #include #include @@ -20,7 +20,7 @@ limitations under the License. #include "absl/algorithm/container.h" #include "absl/status/statusor.h" #include "absl/strings/str_join.h" -#include "tsl/lib/monitoring/types.h" +#include "xla/tsl/lib/monitoring/types.h" #include "tsl/platform/errors.h" #include "tsl/protobuf/histogram.pb.h" diff --git a/third_party/tsl/tsl/lib/monitoring/test_utils.h b/xla/tsl/lib/monitoring/test_utils.h similarity index 93% rename from third_party/tsl/tsl/lib/monitoring/test_utils.h rename to xla/tsl/lib/monitoring/test_utils.h index ad7ed63d60336..d761c9d27ce03 100644 --- a/third_party/tsl/tsl/lib/monitoring/test_utils.h +++ b/xla/tsl/lib/monitoring/test_utils.h @@ -12,13 +12,13 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_TEST_UTILS_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_TEST_UTILS_H_ +#ifndef XLA_TSL_LIB_MONITORING_TEST_UTILS_H_ +#define XLA_TSL_LIB_MONITORING_TEST_UTILS_H_ #include #include "absl/status/statusor.h" -#include "tsl/lib/monitoring/types.h" +#include "xla/tsl/lib/monitoring/types.h" #include "tsl/platform/statusor.h" #include "tsl/protobuf/histogram.pb.h" @@ -92,4 +92,4 @@ class Percentiles final { } // namespace monitoring } // namespace tsl -#endif // TENSORFLOW_TSL_LIB_MONITORING_TEST_UTILS_H_ +#endif // XLA_TSL_LIB_MONITORING_TEST_UTILS_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/timed.h b/xla/tsl/lib/monitoring/timed.h similarity index 90% rename from third_party/tsl/tsl/lib/monitoring/timed.h rename to xla/tsl/lib/monitoring/timed.h index 176e49eacf0a3..732971aa171a1 100644 --- a/third_party/tsl/tsl/lib/monitoring/timed.h +++ b/xla/tsl/lib/monitoring/timed.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_TIMED_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_TIMED_H_ +#ifndef XLA_TSL_LIB_MONITORING_TIMED_H_ +#define XLA_TSL_LIB_MONITORING_TIMED_H_ #include "tsl/platform/env_time.h" @@ -45,4 +45,4 @@ Timed MakeTimed(T* cell, double scale = 1e-6) { } // namespace monitoring } // namespace tsl -#endif // TENSORFLOW_TSL_LIB_MONITORING_TIMED_H_ +#endif // XLA_TSL_LIB_MONITORING_TIMED_H_ diff --git a/third_party/tsl/tsl/lib/monitoring/types.h b/xla/tsl/lib/monitoring/types.h similarity index 90% rename from third_party/tsl/tsl/lib/monitoring/types.h rename to xla/tsl/lib/monitoring/types.h index 3386b1e2be311..7a0358c52bd90 100644 --- a/third_party/tsl/tsl/lib/monitoring/types.h +++ b/xla/tsl/lib/monitoring/types.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_TSL_LIB_MONITORING_TYPES_H_ -#define TENSORFLOW_TSL_LIB_MONITORING_TYPES_H_ +#ifndef XLA_TSL_LIB_MONITORING_TYPES_H_ +#define XLA_TSL_LIB_MONITORING_TYPES_H_ #include #include @@ -53,4 +53,4 @@ struct Percentiles { } // namespace monitoring } // namespace tsl -#endif // TENSORFLOW_TSL_LIB_MONITORING_TYPES_H_ +#endif // XLA_TSL_LIB_MONITORING_TYPES_H_