diff --git a/third_party/xla/xla/pjrt/BUILD b/third_party/xla/xla/pjrt/BUILD index 2c5b3c54ed7b11..a8f4117e2722f1 100644 --- a/third_party/xla/xla/pjrt/BUILD +++ b/third_party/xla/xla/pjrt/BUILD @@ -212,7 +212,7 @@ cc_library( "//xla:shape_util", "//xla:util", "//xla:xla_data_proto_cc", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/hlo/ir:hlo", "//xla/service:computation_placer_hdr", "//xla/service:hlo_cost_analysis", @@ -245,8 +245,8 @@ cc_library( "//xla:shape_util", "//xla:test", "//xla:xla_data_proto_cc", - "//xla/client:xla_builder", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder:xla_computation", "//xla/service:hlo_parser", "//xla/tests:literal_test_util", "@com_google_absl//absl/status:statusor", @@ -330,7 +330,7 @@ cc_library( ":metrics", ":pjrt_device_description", ":pjrt_executable", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/log", "@com_google_absl//absl/status", @@ -350,7 +350,7 @@ xla_cc_test( ":pjrt_client", ":pjrt_compiler", ":pjrt_device_description", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/tsl/lib/monitoring:cell_reader", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/log", @@ -382,7 +382,7 @@ cc_library( "//xla:util", "//xla:xla_data_proto_cc", "//xla/client:executable_build_options", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/hlo/ir:hlo", "//xla/service:computation_placer", "//xla/service:hlo_proto_cc", @@ -503,7 +503,7 @@ cc_library( "//xla:xla_data_proto_cc", "//xla/client:executable_build_options", "//xla/client:local_client", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/hlo/ir:hlo", "//xla/pjrt/distributed:protocol_proto_cc", "//xla/service:compiler", @@ -562,7 +562,7 @@ xla_cc_test( "//xla:test", "//xla:xla_data_proto_cc", "//xla/client:client_library", - "//xla/client:xla_builder", + "//xla/hlo/builder:xla_builder", "//xla/service:cpu_plugin", "//xla/service:platform_util", "//xla/tsl/concurrency:async_value", @@ -597,7 +597,7 @@ cc_library( deps = [ "//xla:debug_options_flags", "//xla:util", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/hlo/translate/mhlo_to_hlo:mlir_hlo_to_hlo", "//xla/mlir/utils:error_util", "//xla/mlir_hlo:hlo_dialect_registration", @@ -789,7 +789,7 @@ cc_library( "//xla:util", "//xla:xla_data_proto_cc", "//xla:xla_proto_cc", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/hlo/ir:hlo", "//xla/hlo/translate/mhlo_to_hlo:mlir_hlo_to_hlo", "//xla/mlir_hlo:mhlo_passes", @@ -841,7 +841,7 @@ xla_cc_test( ":pjrt_executable", "//xla:literal_util", "//xla:shape_util", - "//xla/client:xla_builder", + "//xla/hlo/builder:xla_builder", "//xla/pjrt/c:pjrt_c_api_cpu_internal", "//xla/tests:literal_test_util", "//xla/tsl/lib/core:status_test_util", @@ -866,7 +866,7 @@ cc_library( "//xla:literal", "//xla:shape_util", "//xla:util", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/hlo/ir:hlo", "//xla/service:computation_placer_hdr", "//xla/service:hlo_cost_analysis", diff --git a/third_party/xla/xla/pjrt/mlir_to_hlo.h b/third_party/xla/xla/pjrt/mlir_to_hlo.h index bb75bffe03d617..662c03c61fae8f 100644 --- a/third_party/xla/xla/pjrt/mlir_to_hlo.h +++ b/third_party/xla/xla/pjrt/mlir_to_hlo.h @@ -19,7 +19,7 @@ limitations under the License. #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "mlir/IR/BuiltinOps.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" namespace xla { diff --git a/third_party/xla/xla/pjrt/pjrt_c_api_client.cc b/third_party/xla/xla/pjrt/pjrt_c_api_client.cc index 6dce722517c4b7..81c250b14c5b1f 100644 --- a/third_party/xla/xla/pjrt/pjrt_c_api_client.cc +++ b/third_party/xla/xla/pjrt/pjrt_c_api_client.cc @@ -41,7 +41,7 @@ limitations under the License. #include "mlir/IR/OwningOpRef.h" #include "mlir/Pass/PassManager.h" #include "mlir/Support/LogicalResult.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_module.h" #include "xla/hlo/translate/mhlo_to_hlo/mlir_hlo_to_hlo.h" #include "xla/layout.h" diff --git a/third_party/xla/xla/pjrt/pjrt_c_api_client.h b/third_party/xla/xla/pjrt/pjrt_c_api_client.h index 5973462c06cbe5..7f2a48e68c0f91 100644 --- a/third_party/xla/xla/pjrt/pjrt_c_api_client.h +++ b/third_party/xla/xla/pjrt/pjrt_c_api_client.h @@ -37,7 +37,7 @@ limitations under the License. #include "absl/synchronization/mutex.h" #include "absl/types/span.h" #include "mlir/IR/BuiltinOps.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_module.h" #include "xla/layout.h" #include "xla/literal.h" diff --git a/third_party/xla/xla/pjrt/pjrt_c_api_client_test.cc b/third_party/xla/xla/pjrt/pjrt_c_api_client_test.cc index 4dbdd5d03af4cb..646e613d3a68cb 100644 --- a/third_party/xla/xla/pjrt/pjrt_c_api_client_test.cc +++ b/third_party/xla/xla/pjrt/pjrt_c_api_client_test.cc @@ -24,7 +24,7 @@ limitations under the License. #include #include #include "absl/status/status.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/literal_util.h" #include "xla/pjrt/c/pjrt_c_api_cpu_internal.h" #include "xla/pjrt/pjrt_api.h" diff --git a/third_party/xla/xla/pjrt/pjrt_client.h b/third_party/xla/xla/pjrt/pjrt_client.h index c278332dd74f8f..020392e4ded4ea 100644 --- a/third_party/xla/xla/pjrt/pjrt_client.h +++ b/third_party/xla/xla/pjrt/pjrt_client.h @@ -41,7 +41,7 @@ limitations under the License. #include "absl/synchronization/notification.h" #include "absl/types/span.h" #include "mlir/IR/BuiltinOps.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/layout.h" #include "xla/literal.h" #include "xla/pjrt/pjrt_common.h" diff --git a/third_party/xla/xla/pjrt/pjrt_client_test.cc b/third_party/xla/xla/pjrt/pjrt_client_test.cc index cdaadf57295ca5..239baaba6fb936 100644 --- a/third_party/xla/xla/pjrt/pjrt_client_test.cc +++ b/third_party/xla/xla/pjrt/pjrt_client_test.cc @@ -25,8 +25,8 @@ limitations under the License. #include "absl/status/statusor.h" #include "absl/synchronization/blocking_counter.h" #include "absl/types/span.h" -#include "xla/client/xla_builder.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_builder.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/pjrt/pjrt_client.h" #include "xla/service/hlo_parser.h" #include "xla/shape.h" diff --git a/third_party/xla/xla/pjrt/pjrt_compiler.h b/third_party/xla/xla/pjrt/pjrt_compiler.h index b60bc95b378b8b..3e5a158391383b 100644 --- a/third_party/xla/xla/pjrt/pjrt_compiler.h +++ b/third_party/xla/xla/pjrt/pjrt_compiler.h @@ -26,7 +26,7 @@ limitations under the License. #include "absl/status/statusor.h" #include "absl/strings/string_view.h" #include "mlir/IR/BuiltinOps.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/pjrt/pjrt_device_description.h" #include "xla/pjrt/pjrt_executable.h" #include "tsl/platform/fingerprint.h" diff --git a/third_party/xla/xla/pjrt/pjrt_compiler_test.cc b/third_party/xla/xla/pjrt/pjrt_compiler_test.cc index 454e44f07b8fa0..7fdf22efbc1426 100644 --- a/third_party/xla/xla/pjrt/pjrt_compiler_test.cc +++ b/third_party/xla/xla/pjrt/pjrt_compiler_test.cc @@ -26,7 +26,7 @@ limitations under the License. #include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/pjrt/metrics.h" #include "xla/pjrt/pjrt_client.h" #include "xla/pjrt/pjrt_device_description.h" diff --git a/third_party/xla/xla/pjrt/pjrt_stream_executor_client.cc b/third_party/xla/xla/pjrt/pjrt_stream_executor_client.cc index b60ae0e257ac6c..672d76adb125bb 100644 --- a/third_party/xla/xla/pjrt/pjrt_stream_executor_client.cc +++ b/third_party/xla/xla/pjrt/pjrt_stream_executor_client.cc @@ -97,8 +97,8 @@ limitations under the License. #include "mlir/IR/BuiltinOps.h" #include "xla/client/executable_build_options.h" #include "xla/client/local_client.h" -#include "xla/client/xla_computation.h" #include "xla/executable_run_options.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/layout.h" #include "xla/literal.h" #include "xla/pjrt/distributed/protocol.pb.h" diff --git a/third_party/xla/xla/pjrt/pjrt_stream_executor_client.h b/third_party/xla/xla/pjrt/pjrt_stream_executor_client.h index eb800367fda308..583d86830b71f3 100644 --- a/third_party/xla/xla/pjrt/pjrt_stream_executor_client.h +++ b/third_party/xla/xla/pjrt/pjrt_stream_executor_client.h @@ -43,8 +43,8 @@ limitations under the License. #include "mlir/IR/BuiltinOps.h" #include "xla/client/executable_build_options.h" #include "xla/client/local_client.h" -#include "xla/client/xla_computation.h" #include "xla/executable_run_options.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_module.h" #include "xla/layout.h" #include "xla/literal.h" diff --git a/third_party/xla/xla/pjrt/pjrt_stream_executor_client_test.cc b/third_party/xla/xla/pjrt/pjrt_stream_executor_client_test.cc index 2fa381df57290a..a25125ceb9a2c6 100644 --- a/third_party/xla/xla/pjrt/pjrt_stream_executor_client_test.cc +++ b/third_party/xla/xla/pjrt/pjrt_stream_executor_client_test.cc @@ -24,7 +24,7 @@ limitations under the License. #include "absl/functional/any_invocable.h" #include "absl/synchronization/mutex.h" #include "xla/client/client_library.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/literal.h" #include "xla/literal_comparison.h" #include "xla/literal_util.h" diff --git a/third_party/xla/xla/pjrt/tf_pjrt_client.h b/third_party/xla/xla/pjrt/tf_pjrt_client.h index ac457ea392bc02..65858cec8c9e7f 100644 --- a/third_party/xla/xla/pjrt/tf_pjrt_client.h +++ b/third_party/xla/xla/pjrt/tf_pjrt_client.h @@ -34,7 +34,7 @@ limitations under the License. #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" #include "absl/types/span.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_module.h" #include "xla/layout.h" #include "xla/literal.h" diff --git a/third_party/xla/xla/pjrt/utils.cc b/third_party/xla/xla/pjrt/utils.cc index 2f5bc314919c37..3bc88b6a36dfe7 100644 --- a/third_party/xla/xla/pjrt/utils.cc +++ b/third_party/xla/xla/pjrt/utils.cc @@ -41,7 +41,7 @@ limitations under the License. #include "mlir/IR/BuiltinAttributes.h" #include "mlir/Support/LLVM.h" #include "xla/client/executable_build_options.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_computation.h" #include "xla/hlo/ir/hlo_input_output_alias_config.h" #include "xla/hlo/ir/hlo_opcode.h" diff --git a/third_party/xla/xla/pjrt/utils.h b/third_party/xla/xla/pjrt/utils.h index 95d2f8aec3e6c3..d6aa862876fec9 100644 --- a/third_party/xla/xla/pjrt/utils.h +++ b/third_party/xla/xla/pjrt/utils.h @@ -30,7 +30,7 @@ limitations under the License. #include "absl/types/span.h" #include "mlir/IR/BuiltinOps.h" #include "xla/client/executable_build_options.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_module.h" #include "xla/pjrt/layout_mode.h" #include "xla/service/computation_placer.h"