Skip to content

Commit 2c90fe2

Browse files
hawkinspGoogle-ML-Automation
authored andcommitted
Reorder C++ imports.
PiperOrigin-RevId: 738774175
1 parent 4d6f15f commit 2c90fe2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+307
-324
lines changed

examples/jax_cpp/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ limitations under the License.
4141
#include <string>
4242
#include <vector>
4343

44-
#include "third_party/absl/status/statusor.h"
44+
#include "absl/status/statusor.h"
4545
#include "xla/hlo/builder/xla_computation.h"
4646
#include "xla/hlo/ir/hlo_module.h"
4747
#include "xla/literal.h"

jaxlib/gpu/vendor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ limitations under the License.
2929
#include "third_party/gpus/cuda/include/cublas_v2.h"
3030
#include "third_party/gpus/cuda/include/cuda.h"
3131
#include "third_party/gpus/cuda/include/cuda_fp8.h"
32-
#include "third_party/gpus/cuda/include/cuda_runtime_api.h"
32+
#include "cuda_runtime_api.h"
3333
#include "third_party/gpus/cuda/include/cufft.h"
3434
#include "third_party/gpus/cuda/include/cusolverDn.h"
3535
#include "third_party/gpus/cuda/include/cusolver_common.h"

jaxlib/mlir/_mlir_libs/mosaic_gpu_ext.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ limitations under the License.
1616
#include <cstdint>
1717
#include <vector>
1818

19+
#include "nanobind/nanobind.h"
1920
#include "mlir-c/IR.h"
2021
#include "mlir/Bindings/Python/NanobindAdaptors.h" // IWYU pragma: keep
21-
#include "nanobind/nanobind.h"
2222
#include "jaxlib/mosaic/dialect/gpu/integrations/c/attributes.h"
2323
#include "jaxlib/mosaic/dialect/gpu/integrations/c/gpu_dialect.h"
2424

jaxlib/mlir/_mlir_libs/register_jax_dialects.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// This module is called by mlir/__init__.py during initialization.
33
#include <nanobind/nanobind.h>
44

5+
#include "shardy/integrations/c/passes.h"
56
#include "mlir-c/Dialect/Arith.h"
67
#include "mlir-c/Dialect/Func.h"
78
#include "mlir-c/Dialect/GPU.h"
@@ -14,10 +15,8 @@
1415
#include "mlir-c/Dialect/Vector.h"
1516
#include "mlir-c/Transforms.h"
1617
#include "mlir/Bindings/Python/NanobindAdaptors.h"
17-
#include "shardy/integrations/c/passes.h"
1818
#include "jaxlib/mosaic/gpu/integrations/c/passes.h"
1919

20-
2120
namespace nb = nanobind;
2221

2322
#define REGISTER_DIALECT(name) \

jaxlib/mlir/_mlir_libs/triton_ext.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ limitations under the License.
1515

1616
#include <optional>
1717

18+
#include "nanobind/nanobind.h"
1819
#include "mlir-c/IR.h"
1920
#include "mlir/Bindings/Python/NanobindAdaptors.h"
20-
#include "nanobind/nanobind.h"
2121
#include "jaxlib/triton/triton_dialect_capi.h"
2222

2323
namespace nb = nanobind;

jaxlib/mosaic/dialect/gpu/mosaic_gpu.cc

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ limitations under the License.
1818
#include <cstdint>
1919
#include <vector>
2020

21+
#include "absl/algorithm/container.h"
22+
#include "absl/status/status.h"
23+
#include "absl/status/statusor.h"
24+
#include "absl/strings/str_cat.h"
25+
#include "absl/strings/string_view.h"
2126
#include "llvm/ADT/STLExtras.h"
2227
#include "llvm/ADT/TypeSwitch.h" // IWYU pragma: keep
2328
#include "llvm/Support/Casting.h"
@@ -32,7 +37,9 @@ limitations under the License.
3237
#include "mlir/Dialect/SCF/Utils/Utils.h"
3338
#include "mlir/IR/Builders.h"
3439
#include "mlir/IR/BuiltinAttributes.h"
40+
#include "mlir/IR/BuiltinTypeInterfaces.h"
3541
#include "mlir/IR/BuiltinTypes.h"
42+
#include "mlir/IR/Diagnostics.h"
3643
#include "mlir/IR/Dialect.h"
3744
#include "mlir/IR/DialectImplementation.h" // IWYU pragma: keep
3845
#include "mlir/IR/ImplicitLocOpBuilder.h"
@@ -43,14 +50,6 @@ limitations under the License.
4350
#include "mlir/IR/Value.h"
4451
#include "mlir/IR/ValueRange.h"
4552
#include "mlir/Support/LLVM.h"
46-
#include "absl/algorithm/container.h"
47-
#include "absl/status/status.h"
48-
#include "absl/status/statusor.h"
49-
#include "absl/strings/str_cat.h"
50-
#include "absl/strings/string_view.h"
51-
#include "mlir/include/mlir/IR/BuiltinTypeInterfaces.h"
52-
#include "mlir/include/mlir/IR/BuiltinTypes.h"
53-
#include "mlir/include/mlir/IR/Diagnostics.h"
5453
#include "tsl/platform/statusor.h"
5554

5655
// Generated definitions.

jaxlib/mosaic/dialect/gpu/mosaic_gpu.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ limitations under the License.
1919
#include <cstdint>
2020
#include <string>
2121

22+
#include "absl/status/status.h"
23+
#include "absl/strings/string_view.h"
2224
#include "llvm/ADT/StringRef.h"
2325
#include "llvm/Support/raw_ostream.h"
2426
#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
@@ -28,8 +30,6 @@ limitations under the License.
2830
#include "mlir/Interfaces/InferTypeOpInterface.h"
2931
#include "mlir/Interfaces/SideEffectInterfaces.h"
3032
#include "mlir/Support/LLVM.h"
31-
#include "absl/status/status.h"
32-
#include "absl/strings/string_view.h"
3333

3434
// Generated definitions.
3535
#include "jaxlib/mosaic/dialect/gpu/mosaic_gpu_dialect.h.inc" // IWYU pragma: keep

jaxlib/mosaic/dialect/gpu/mosaic_gpu_test.cc

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ limitations under the License.
2525
#include "absl/status/status.h"
2626
#include "absl/status/statusor.h"
2727
#include "absl/strings/string_view.h"
28-
#include "llvm/include/llvm/ADT/ArrayRef.h"
29-
#include "llvm/include/llvm/ADT/SmallVector.h"
30-
#include "mlir/include/mlir/Conversion/LLVMCommon/MemRefBuilder.h"
31-
#include "mlir/include/mlir/Conversion/LLVMCommon/StructBuilder.h"
32-
#include "mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h"
33-
#include "mlir/include/mlir/Dialect/Func/IR/FuncOps.h"
34-
#include "mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h"
35-
#include "mlir/include/mlir/Dialect/MemRef/IR/MemRef.h"
36-
#include "mlir/include/mlir/Dialect/SCF/Utils/Utils.h"
37-
#include "mlir/include/mlir/IR/Builders.h"
38-
#include "mlir/include/mlir/IR/BuiltinOps.h"
39-
#include "mlir/include/mlir/IR/Diagnostics.h"
40-
#include "mlir/include/mlir/IR/MLIRContext.h"
41-
#include "mlir/include/mlir/IR/OwningOpRef.h"
42-
#include "mlir/include/mlir/IR/Types.h"
43-
#include "mlir/include/mlir/IR/Value.h"
44-
#include "mlir/include/mlir/IR/Verifier.h"
45-
#include "mlir/include/mlir/Interfaces/DataLayoutInterfaces.h"
46-
#include "mlir/include/mlir/Support/LLVM.h"
28+
#include "llvm/ADT/ArrayRef.h"
29+
#include "llvm/ADT/SmallVector.h"
30+
#include "mlir/Conversion/LLVMCommon/MemRefBuilder.h"
31+
#include "mlir/Conversion/LLVMCommon/StructBuilder.h"
32+
#include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h"
33+
#include "mlir/Dialect/Func/IR/FuncOps.h"
34+
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
35+
#include "mlir/Dialect/MemRef/IR/MemRef.h"
36+
#include "mlir/Dialect/SCF/Utils/Utils.h"
37+
#include "mlir/IR/Builders.h"
38+
#include "mlir/IR/BuiltinOps.h"
39+
#include "mlir/IR/Diagnostics.h"
40+
#include "mlir/IR/MLIRContext.h"
41+
#include "mlir/IR/OwningOpRef.h"
42+
#include "mlir/IR/Types.h"
43+
#include "mlir/IR/Value.h"
44+
#include "mlir/IR/Verifier.h"
45+
#include "mlir/Interfaces/DataLayoutInterfaces.h"
46+
#include "mlir/Support/LLVM.h"
4747
#include "tsl/platform/errors.h"
4848

4949
namespace mosaic_gpu {

jaxlib/mosaic/dialect/tpu/array_util.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ limitations under the License.
1919

2020
#include "absl/log/check.h"
2121
#include "absl/types/span.h"
22-
#include "llvm/include/llvm/ADT/STLExtras.h"
23-
#include "mlir/include/mlir/Support/LLVM.h"
22+
#include "llvm/ADT/STLExtras.h"
23+
#include "mlir/Support/LLVM.h"
2424

2525
namespace mlir::tpu::internal {
2626

jaxlib/mosaic/dialect/tpu/array_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020

2121
#include "absl/log/check.h"
2222
#include "absl/types/span.h"
23-
#include "mlir/include/mlir/Support/LLVM.h"
23+
#include "mlir/Support/LLVM.h"
2424
#include "jaxlib/mosaic/dialect/tpu/util.h"
2525
#include "xla/array.h"
2626

0 commit comments

Comments
 (0)