From 13a449af7581294870be3c2c29d28c941dbad636 Mon Sep 17 00:00:00 2001 From: Sandeep Dasgupta Date: Thu, 3 Oct 2024 07:09:04 -0700 Subject: [PATCH] [HLO Componentization] Create hlo/builder sub-component (Phase II). This CL takes care of 1. Migrating external projects dependencies from xla/client --> xla/hlo/builder Phase I takes care of 1. Migrating xla/translate --> xla/hlo/translate 2. Setting up build aliases in xla/translate ensuring external dependencies are still satisfied. PiperOrigin-RevId: 681863279 --- xla/service/BUILD | 112 +++++++++--------- xla/service/bitcast_dtypes_expander.cc | 10 +- xla/service/cholesky_expander.cc | 14 +-- xla/service/cholesky_expander.h | 2 +- .../dynamic_dimension_inference_test.cc | 2 +- xla/service/dynamic_padder.cc | 2 +- xla/service/dynamic_padder_test.cc | 2 +- xla/service/eigh_expander.cc | 16 +-- xla/service/eigh_expander.h | 2 +- xla/service/hlo_cost_analysis_test.cc | 6 +- xla/service/hlo_creation_utils.cc | 6 +- xla/service/hlo_runner_pjrt.cc | 2 +- xla/service/local_service.cc | 2 +- xla/service/local_service.h | 2 +- xla/service/local_service_utils.cc | 2 +- xla/service/local_service_utils.h | 2 +- xla/service/qr_expander.cc | 16 +-- xla/service/qr_expander.h | 4 +- xla/service/rng_bit_generator_expander.cc | 4 +- xla/service/rng_expander.cc | 4 +- xla/service/service.h | 2 +- xla/service/shape_inference_test.cc | 2 +- xla/service/topk_rewriter.cc | 4 +- xla/service/transpose_folding_test.cc | 2 +- xla/service/tree_reduction_rewriter.cc | 2 +- xla/service/triangular_solve_expander.cc | 12 +- xla/service/triangular_solve_expander.h | 2 +- 27 files changed, 119 insertions(+), 119 deletions(-) diff --git a/xla/service/BUILD b/xla/service/BUILD index 1f92ccc1df0a6..949ba4dddd7b3 100644 --- a/xla/service/BUILD +++ b/xla/service/BUILD @@ -778,7 +778,7 @@ xla_cc_test( "//xla:test", "//xla:test_helpers", "//xla:xla_data_proto_cc", - "//xla/client:padding", + "//xla/hlo/builder:padding", "//xla/hlo/ir:hlo", "//xla/tests:xla_internal_test_main", # fixdeps: keep "@com_google_absl//absl/log", @@ -1413,7 +1413,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/evaluator:hlo_evaluator", "//xla/hlo/ir:hlo", "//xla/hlo/ir:hlo_module_group", @@ -1451,7 +1451,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/stream_executor", "//xla/stream_executor:device_memory_allocator", "@com_google_absl//absl/status:statusor", @@ -1478,7 +1478,7 @@ cc_library( "//xla:xla_data_proto_cc", "//xla:xla_proto_cc", "//xla/client:executable_build_options", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/hlo/ir:hlo", "@com_google_absl//absl/log:check", "@com_google_absl//absl/status:statusor", @@ -2390,9 +2390,9 @@ cc_library( "//xla:status_macros", "//xla:util", "//xla:xla_data_proto_cc", - "//xla/client:xla_builder", - "//xla/client:xla_computation", - "//xla/client/lib:comparators", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder:xla_computation", + "//xla/hlo/builder/lib:comparators", "//xla/hlo/ir:hlo", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/log", @@ -2579,12 +2579,12 @@ cc_library( ":op_expander_pass", "//xla:shape_util", "//xla:util", - "//xla/client:xla_builder", - "//xla/client:xla_computation", - "//xla/client/lib:constants", - "//xla/client/lib:math", - "//xla/client/lib:matrix", - "//xla/client/lib:slicing", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder:xla_computation", + "//xla/hlo/builder/lib:constants", + "//xla/hlo/builder/lib:math", + "//xla/hlo/builder/lib:matrix", + "//xla/hlo/builder/lib:slicing", "//xla/hlo/ir:hlo", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status:statusor", @@ -2622,13 +2622,13 @@ cc_library( "//xla:shape_util", "//xla:status_macros", "//xla:util", - "//xla/client:xla_builder", - "//xla/client/lib:arithmetic", - "//xla/client/lib:constants", - "//xla/client/lib:loops", - "//xla/client/lib:math", - "//xla/client/lib:matrix", - "//xla/client/lib:slicing", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder/lib:arithmetic", + "//xla/hlo/builder/lib:constants", + "//xla/hlo/builder/lib:loops", + "//xla/hlo/builder/lib:math", + "//xla/hlo/builder/lib:matrix", + "//xla/hlo/builder/lib:slicing", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status:statusor", "@tsl//tsl/platform:errors", @@ -2645,14 +2645,14 @@ cc_library( "//xla:shape_util", "//xla:status_macros", "//xla:util", - "//xla/client:xla_builder", - "//xla/client/lib:arithmetic", - "//xla/client/lib:constants", - "//xla/client/lib:loops", - "//xla/client/lib:math", - "//xla/client/lib:matrix", - "//xla/client/lib:qr", - "//xla/client/lib:slicing", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder/lib:arithmetic", + "//xla/hlo/builder/lib:constants", + "//xla/hlo/builder/lib:loops", + "//xla/hlo/builder/lib:math", + "//xla/hlo/builder/lib:matrix", + "//xla/hlo/builder/lib:qr", + "//xla/hlo/builder/lib:slicing", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status:statusor", "@tsl//tsl/platform:errors", @@ -2700,14 +2700,14 @@ cc_library( "//xla:shape_util", "//xla:status_macros", "//xla:util", - "//xla/client:xla_builder", - "//xla/client/lib:arithmetic", - "//xla/client/lib:comparators", - "//xla/client/lib:constants", - "//xla/client/lib:loops", - "//xla/client/lib:math", - "//xla/client/lib:matrix", - "//xla/client/lib:slicing", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder/lib:arithmetic", + "//xla/hlo/builder/lib:comparators", + "//xla/hlo/builder/lib:constants", + "//xla/hlo/builder/lib:loops", + "//xla/hlo/builder/lib:math", + "//xla/hlo/builder/lib:matrix", + "//xla/hlo/builder/lib:slicing", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status:statusor", "@tsl//tsl/platform:errors", @@ -2854,7 +2854,7 @@ cc_library( "//xla:shape_util", "//xla:util", "//xla:xla_data_proto_cc", - "//xla/client:padding", + "//xla/hlo/builder:padding", "//xla/hlo/ir:hlo", "//xla/hlo/pass:hlo_pass", "@com_google_absl//absl/algorithm:container", @@ -3078,11 +3078,11 @@ cc_library( "//xla:status_macros", "//xla:types", "//xla:xla_data_proto_cc", - "//xla/client:xla_builder", - "//xla/client:xla_computation", - "//xla/client/lib:arithmetic", - "//xla/client/lib:broadcast", - "//xla/client/lib:constants", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder:xla_computation", + "//xla/hlo/builder/lib:arithmetic", + "//xla/hlo/builder/lib:broadcast", + "//xla/hlo/builder/lib:constants", "//xla/hlo/ir:hlo", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/container:flat_hash_map", @@ -4357,7 +4357,7 @@ cc_library( "//xla:util", "//xla:window_util", "//xla:xla_data_proto_cc", - "//xla/client:xla_builder", + "//xla/hlo/builder:xla_builder", "//xla/hlo/ir:hlo", "//xla/hlo/pass:hlo_pass", "//xla/tsl/lib/monitoring:gauge", @@ -4399,7 +4399,7 @@ xla_test( "//xla:test_helpers", "//xla:util", "//xla:xla_data_proto_cc", - "//xla/client:xla_builder", + "//xla/hlo/builder:xla_builder", "//xla/hlo/ir:hlo", "//xla/hlo/utils:hlo_matchers", "//xla/tests:client_library_test_base", @@ -4434,7 +4434,7 @@ xla_cc_test( "//xla:test", "//xla:test_helpers", "//xla:xla_data_proto_cc", - "//xla/client:xla_builder", + "//xla/hlo/builder:xla_builder", "//xla/hlo/ir:hlo", "//xla/hlo/utils:hlo_matchers", "//xla/tests:filecheck", @@ -4635,9 +4635,9 @@ xla_cc_test( "//xla/client", "//xla/client:client_library", "//xla/client:local_client", - "//xla/client:padding", - "//xla/client:xla_builder", - "//xla/client:xla_computation", + "//xla/hlo/builder:padding", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder:xla_computation", "//xla/hlo/ir:hlo", "//xla/tests:hlo_test_base", "//xla/tests:xla_internal_test_main", @@ -6138,7 +6138,7 @@ xla_cc_test( "//xla:test", "//xla:test_helpers", "//xla:xla_data_proto_cc", - "//xla/client:xla_builder", + "//xla/hlo/builder:xla_builder", "//xla/hlo/ir:hlo", "//xla/hlo/utils:hlo_matchers", "//xla/service/gpu:ir_emission_utils", @@ -6300,7 +6300,7 @@ cc_library( "//xla:shape_util", "//xla:status_macros", "//xla:util", - "//xla/client:xla_computation", + "//xla/hlo/builder:xla_computation", "//xla/hlo/ir:hlo", "//xla/pjrt:host_memory_spaces", "//xla/pjrt:pjrt_client", @@ -7473,8 +7473,8 @@ cc_library( ":op_expander_pass", "//xla:literal_util", "//xla:shape_util", - "//xla/client:xla_builder", - "//xla/client/lib:prng", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder/lib:prng", ], ) @@ -7487,8 +7487,8 @@ cc_library( "//xla:shape_util", "//xla:util", "//xla:xla_data_proto_cc", - "//xla/client:xla_builder", - "//xla/client/lib:prng", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder/lib:prng", "//xla/hlo/ir:hlo", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status:statusor", @@ -7600,8 +7600,8 @@ cc_library( ":pattern_matcher", "//xla:shape_util", "//xla:util", - "//xla/client:xla_builder", - "//xla/client/lib:comparators", + "//xla/hlo/builder:xla_builder", + "//xla/hlo/builder/lib:comparators", "//xla/hlo/ir:hlo", "//xla/hlo/pass:hlo_pass", "@com_google_absl//absl/algorithm:container", diff --git a/xla/service/bitcast_dtypes_expander.cc b/xla/service/bitcast_dtypes_expander.cc index 6a5d12c25c32f..44269471f8cb5 100644 --- a/xla/service/bitcast_dtypes_expander.cc +++ b/xla/service/bitcast_dtypes_expander.cc @@ -16,11 +16,11 @@ limitations under the License. #include "xla/service/bitcast_dtypes_expander.h" #include "absl/strings/str_format.h" -#include "xla/client/lib/arithmetic.h" -#include "xla/client/lib/broadcast.h" -#include "xla/client/lib/constants.h" -#include "xla/client/xla_builder.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/lib/arithmetic.h" +#include "xla/hlo/builder/lib/broadcast.h" +#include "xla/hlo/builder/lib/constants.h" +#include "xla/hlo/builder/xla_builder.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_clone_context.h" #include "xla/hlo/ir/hlo_computation.h" #include "xla/hlo/ir/hlo_instruction.h" diff --git a/xla/service/cholesky_expander.cc b/xla/service/cholesky_expander.cc index d70e0211103ff..0946f30a21ea6 100644 --- a/xla/service/cholesky_expander.cc +++ b/xla/service/cholesky_expander.cc @@ -19,13 +19,13 @@ limitations under the License. #include #include "absl/status/statusor.h" -#include "xla/client/lib/arithmetic.h" -#include "xla/client/lib/constants.h" -#include "xla/client/lib/loops.h" -#include "xla/client/lib/math.h" -#include "xla/client/lib/matrix.h" -#include "xla/client/lib/slicing.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/lib/arithmetic.h" +#include "xla/hlo/builder/lib/constants.h" +#include "xla/hlo/builder/lib/loops.h" +#include "xla/hlo/builder/lib/math.h" +#include "xla/hlo/builder/lib/matrix.h" +#include "xla/hlo/builder/lib/slicing.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/literal.h" #include "xla/primitive_util.h" #include "xla/shape_util.h" diff --git a/xla/service/cholesky_expander.h b/xla/service/cholesky_expander.h index 3178d36e949b1..421538101f92d 100644 --- a/xla/service/cholesky_expander.h +++ b/xla/service/cholesky_expander.h @@ -17,7 +17,7 @@ limitations under the License. #define XLA_SERVICE_CHOLESKY_EXPANDER_H_ #include "absl/container/flat_hash_map.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/service/op_expander_pass.h" namespace xla { diff --git a/xla/service/dynamic_dimension_inference_test.cc b/xla/service/dynamic_dimension_inference_test.cc index 9dc9de161aa4b..6ea74b9c5be46 100644 --- a/xla/service/dynamic_dimension_inference_test.cc +++ b/xla/service/dynamic_dimension_inference_test.cc @@ -15,7 +15,7 @@ limitations under the License. #include "xla/service/dynamic_dimension_inference.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/hlo/ir/hlo_casting_utils.h" #include "xla/hlo/ir/hlo_computation.h" #include "xla/hlo/ir/hlo_instruction.h" diff --git a/xla/service/dynamic_padder.cc b/xla/service/dynamic_padder.cc index 8d5b6005fb384..16973b8e60dee 100644 --- a/xla/service/dynamic_padder.cc +++ b/xla/service/dynamic_padder.cc @@ -32,8 +32,8 @@ limitations under the License. #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "xla/client/xla_builder.h" #include "xla/comparison_util.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/hlo/ir/dfs_hlo_visitor_with_default.h" #include "xla/hlo/ir/dynamic_parameter_binding.h" #include "xla/hlo/ir/hlo_casting_utils.h" diff --git a/xla/service/dynamic_padder_test.cc b/xla/service/dynamic_padder_test.cc index 972bc38ae8c40..0245fcd2c08aa 100644 --- a/xla/service/dynamic_padder_test.cc +++ b/xla/service/dynamic_padder_test.cc @@ -26,8 +26,8 @@ limitations under the License. #include "absl/status/statusor.h" #include "absl/strings/str_replace.h" #include "absl/types/span.h" -#include "xla/client/xla_builder.h" #include "xla/error_spec.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/hlo/ir/hlo_computation.h" #include "xla/hlo/ir/hlo_instruction.h" #include "xla/hlo/ir/hlo_module.h" diff --git a/xla/service/eigh_expander.cc b/xla/service/eigh_expander.cc index e95b268c1f3d8..635f01b8ba8c3 100644 --- a/xla/service/eigh_expander.cc +++ b/xla/service/eigh_expander.cc @@ -24,14 +24,14 @@ limitations under the License. #include #include "absl/status/statusor.h" -#include "xla/client/lib/arithmetic.h" -#include "xla/client/lib/comparators.h" -#include "xla/client/lib/constants.h" -#include "xla/client/lib/loops.h" -#include "xla/client/lib/math.h" -#include "xla/client/lib/matrix.h" -#include "xla/client/lib/slicing.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/lib/arithmetic.h" +#include "xla/hlo/builder/lib/comparators.h" +#include "xla/hlo/builder/lib/constants.h" +#include "xla/hlo/builder/lib/loops.h" +#include "xla/hlo/builder/lib/math.h" +#include "xla/hlo/builder/lib/matrix.h" +#include "xla/hlo/builder/lib/slicing.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/literal_util.h" #include "xla/primitive_util.h" #include "xla/shape_util.h" diff --git a/xla/service/eigh_expander.h b/xla/service/eigh_expander.h index 074e09305354d..03b8d8688b90a 100644 --- a/xla/service/eigh_expander.h +++ b/xla/service/eigh_expander.h @@ -17,7 +17,7 @@ limitations under the License. #define XLA_SERVICE_EIGH_EXPANDER_H_ #include "absl/container/flat_hash_map.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/service/op_expander_pass.h" namespace xla { diff --git a/xla/service/hlo_cost_analysis_test.cc b/xla/service/hlo_cost_analysis_test.cc index 4bac5768a2d54..aaedc6c314681 100644 --- a/xla/service/hlo_cost_analysis_test.cc +++ b/xla/service/hlo_cost_analysis_test.cc @@ -24,9 +24,9 @@ limitations under the License. #include "xla/client/client.h" #include "xla/client/client_library.h" #include "xla/client/local_client.h" -#include "xla/client/padding.h" -#include "xla/client/xla_builder.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/padding.h" +#include "xla/hlo/builder/xla_builder.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_instruction.h" #include "xla/hlo/ir/hlo_module.h" #include "xla/service/hlo_parser.h" diff --git a/xla/service/hlo_creation_utils.cc b/xla/service/hlo_creation_utils.cc index a94e23d21066e..0aeda8e186d99 100644 --- a/xla/service/hlo_creation_utils.cc +++ b/xla/service/hlo_creation_utils.cc @@ -31,10 +31,10 @@ limitations under the License. #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "xla/client/lib/comparators.h" -#include "xla/client/xla_builder.h" -#include "xla/client/xla_computation.h" #include "xla/comparison_util.h" +#include "xla/hlo/builder/lib/comparators.h" +#include "xla/hlo/builder/xla_builder.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_clone_context.h" #include "xla/hlo/ir/hlo_instruction.h" #include "xla/hlo/ir/hlo_module.h" diff --git a/xla/service/hlo_runner_pjrt.cc b/xla/service/hlo_runner_pjrt.cc index 0047ccd428819..e409261bdb5d1 100644 --- a/xla/service/hlo_runner_pjrt.cc +++ b/xla/service/hlo_runner_pjrt.cc @@ -26,7 +26,7 @@ limitations under the License. #include "absl/status/status.h" #include "absl/status/statusor.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/pjrt/host_memory_spaces.h" diff --git a/xla/service/local_service.cc b/xla/service/local_service.cc index 0d89b2712ca04..d2e2fa8ad947f 100644 --- a/xla/service/local_service.cc +++ b/xla/service/local_service.cc @@ -23,7 +23,7 @@ limitations under the License. #include "absl/strings/str_format.h" #include "absl/types/span.h" #include "xla/client/executable_build_options.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/service/backend.h" #include "xla/service/compiler.h" #include "xla/service/computation_layout.h" diff --git a/xla/service/local_service.h b/xla/service/local_service.h index 4b9112386d4e0..be7eee43e0c6e 100644 --- a/xla/service/local_service.h +++ b/xla/service/local_service.h @@ -22,7 +22,7 @@ limitations under the License. #include "absl/status/statusor.h" #include "absl/types/span.h" #include "xla/client/executable_build_options.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/service/backend.h" #include "xla/service/compiler.h" #include "xla/service/executable.h" diff --git a/xla/service/local_service_utils.cc b/xla/service/local_service_utils.cc index 9c0be82ab8860..d6f6ce4f0280b 100644 --- a/xla/service/local_service_utils.cc +++ b/xla/service/local_service_utils.cc @@ -23,7 +23,7 @@ limitations under the License. #include "absl/strings/str_format.h" #include "absl/types/span.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_opcode.h" #include "xla/service/backend.h" #include "xla/service/hlo.pb.h" diff --git a/xla/service/local_service_utils.h b/xla/service/local_service_utils.h index ecfd832f2b85a..d17300c0c7e68 100644 --- a/xla/service/local_service_utils.h +++ b/xla/service/local_service_utils.h @@ -21,7 +21,7 @@ limitations under the License. #include "absl/status/statusor.h" #include "absl/types/span.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/service/backend.h" #include "xla/service/hlo_module_config.h" diff --git a/xla/service/qr_expander.cc b/xla/service/qr_expander.cc index 4f79769d7c6bf..94cbe5ccf5c46 100644 --- a/xla/service/qr_expander.cc +++ b/xla/service/qr_expander.cc @@ -19,14 +19,14 @@ limitations under the License. #include #include "absl/status/statusor.h" -#include "xla/client/lib/arithmetic.h" -#include "xla/client/lib/constants.h" -#include "xla/client/lib/loops.h" -#include "xla/client/lib/math.h" -#include "xla/client/lib/matrix.h" -#include "xla/client/lib/qr.h" -#include "xla/client/lib/slicing.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/lib/arithmetic.h" +#include "xla/hlo/builder/lib/constants.h" +#include "xla/hlo/builder/lib/loops.h" +#include "xla/hlo/builder/lib/math.h" +#include "xla/hlo/builder/lib/matrix.h" +#include "xla/hlo/builder/lib/qr.h" +#include "xla/hlo/builder/lib/slicing.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/literal.h" #include "xla/primitive_util.h" #include "xla/shape_util.h" diff --git a/xla/service/qr_expander.h b/xla/service/qr_expander.h index d4818f644d137..af35fe04aa460 100644 --- a/xla/service/qr_expander.h +++ b/xla/service/qr_expander.h @@ -17,8 +17,8 @@ limitations under the License. #define XLA_SERVICE_QR_EXPANDER_H_ #include "absl/container/flat_hash_map.h" -#include "xla/client/lib/qr.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/lib/qr.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/service/op_expander_pass.h" namespace xla { diff --git a/xla/service/rng_bit_generator_expander.cc b/xla/service/rng_bit_generator_expander.cc index 0d78762f47b96..5e4b1efdf0a80 100644 --- a/xla/service/rng_bit_generator_expander.cc +++ b/xla/service/rng_bit_generator_expander.cc @@ -16,8 +16,8 @@ limitations under the License. #include "xla/service/rng_bit_generator_expander.h" #include "absl/status/statusor.h" -#include "xla/client/lib/prng.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/lib/prng.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/hlo/ir/hlo_casting_utils.h" #include "xla/hlo/ir/hlo_computation.h" #include "xla/hlo/ir/hlo_instruction.h" diff --git a/xla/service/rng_expander.cc b/xla/service/rng_expander.cc index cbc5a1d4549db..41fd96ee4f986 100644 --- a/xla/service/rng_expander.cc +++ b/xla/service/rng_expander.cc @@ -17,8 +17,8 @@ limitations under the License. #include -#include "xla/client/lib/prng.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/lib/prng.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/literal_util.h" #include "xla/primitive_util.h" #include "xla/service/hlo_creation_utils.h" diff --git a/xla/service/service.h b/xla/service/service.h index 3fd7f227c362e..e11de13de1947 100644 --- a/xla/service/service.h +++ b/xla/service/service.h @@ -24,9 +24,9 @@ limitations under the License. #include "absl/status/statusor.h" #include "absl/types/span.h" -#include "xla/client/xla_computation.h" #include "xla/debug_options_flags.h" #include "xla/executable_run_options.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_module.h" #include "xla/service/allocation_tracker.h" #include "xla/service/backend.h" diff --git a/xla/service/shape_inference_test.cc b/xla/service/shape_inference_test.cc index 6c2cf78ab0245..45c1082f460f6 100644 --- a/xla/service/shape_inference_test.cc +++ b/xla/service/shape_inference_test.cc @@ -30,7 +30,7 @@ limitations under the License. #include "absl/strings/string_view.h" #include "absl/strings/substitute.h" #include "absl/types/span.h" -#include "xla/client/padding.h" +#include "xla/hlo/builder/padding.h" #include "xla/hlo/ir/hlo_instructions.h" #include "xla/hlo/ir/hlo_opcode.h" #include "xla/service/hlo_parser.h" diff --git a/xla/service/topk_rewriter.cc b/xla/service/topk_rewriter.cc index bb65d436acedb..57ed7cac23fce 100644 --- a/xla/service/topk_rewriter.cc +++ b/xla/service/topk_rewriter.cc @@ -23,8 +23,8 @@ limitations under the License. #include "absl/algorithm/container.h" #include "absl/container/flat_hash_set.h" -#include "xla/client/lib/comparators.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/lib/comparators.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/hlo/ir/dfs_hlo_visitor_with_default.h" #include "xla/hlo/ir/hlo_casting_utils.h" #include "xla/hlo/ir/hlo_computation.h" diff --git a/xla/service/transpose_folding_test.cc b/xla/service/transpose_folding_test.cc index 1dd4f0c361bad..31a17d7842917 100644 --- a/xla/service/transpose_folding_test.cc +++ b/xla/service/transpose_folding_test.cc @@ -20,7 +20,7 @@ limitations under the License. #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/hlo/ir/hlo_computation.h" #include "xla/hlo/ir/hlo_instruction.h" #include "xla/hlo/ir/hlo_module.h" diff --git a/xla/service/tree_reduction_rewriter.cc b/xla/service/tree_reduction_rewriter.cc index 45a87836f786a..77eed07a2d560 100644 --- a/xla/service/tree_reduction_rewriter.cc +++ b/xla/service/tree_reduction_rewriter.cc @@ -23,7 +23,7 @@ limitations under the License. #include "absl/algorithm/container.h" #include "absl/status/statusor.h" #include "absl/strings/str_join.h" -#include "xla/client/padding.h" +#include "xla/hlo/builder/padding.h" #include "xla/hlo/ir/dfs_hlo_visitor_with_default.h" #include "xla/hlo/ir/hlo_instruction.h" #include "xla/hlo/ir/hlo_module.h" diff --git a/xla/service/triangular_solve_expander.cc b/xla/service/triangular_solve_expander.cc index c61dc148c0ec3..1c319842057b0 100644 --- a/xla/service/triangular_solve_expander.cc +++ b/xla/service/triangular_solve_expander.cc @@ -25,12 +25,12 @@ limitations under the License. #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/types/span.h" -#include "xla/client/lib/constants.h" -#include "xla/client/lib/math.h" -#include "xla/client/lib/matrix.h" -#include "xla/client/lib/slicing.h" -#include "xla/client/xla_builder.h" -#include "xla/client/xla_computation.h" +#include "xla/hlo/builder/lib/constants.h" +#include "xla/hlo/builder/lib/math.h" +#include "xla/hlo/builder/lib/matrix.h" +#include "xla/hlo/builder/lib/slicing.h" +#include "xla/hlo/builder/xla_builder.h" +#include "xla/hlo/builder/xla_computation.h" #include "xla/hlo/ir/hlo_clone_context.h" #include "xla/hlo/ir/hlo_computation.h" #include "xla/hlo/ir/hlo_opcode.h" diff --git a/xla/service/triangular_solve_expander.h b/xla/service/triangular_solve_expander.h index 0ccbcf1cf7cea..a5ff486498481 100644 --- a/xla/service/triangular_solve_expander.h +++ b/xla/service/triangular_solve_expander.h @@ -17,7 +17,7 @@ limitations under the License. #define XLA_SERVICE_TRIANGULAR_SOLVE_EXPANDER_H_ #include "absl/container/flat_hash_map.h" -#include "xla/client/xla_builder.h" +#include "xla/hlo/builder/xla_builder.h" #include "xla/service/op_expander_pass.h" namespace xla {