Skip to content

Commit 1b9fb1b

Browse files
[Bazel] Mirror project reorganization (#2547)
Updates Bazel build to mirror project reorganization from #2542. GHA: https://github.com/sjain-stanford/torch-mlir/actions/runs/6744430250/job/18334262852
1 parent 3caddd2 commit 1b9fb1b

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

utils/bazel/torch-mlir-overlay/BUILD.bazel

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -544,16 +544,15 @@ cc_library(
544544
],
545545
)
546546

547-
# External dialects
548547
td_library(
549548
name = "TorchMLIRTMTensorOpsTdFiles",
550549
srcs = [
551-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.td",
552-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorBase.td",
553-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorInterfaces.td",
554-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.td",
550+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.td",
551+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorBase.td",
552+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorInterfaces.td",
553+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.td",
555554
],
556-
includes = ["externals/llvm-external-projects/torch-mlir-dialects/include"],
555+
includes = ["include"],
557556
deps = [
558557
"@llvm-project//mlir:ControlFlowInterfacesTdFiles",
559558
"@llvm-project//mlir:OpBaseTdFiles",
@@ -563,85 +562,85 @@ td_library(
563562

564563
gentbl_cc_library(
565564
name = "TorchMLIRTMTensorInterfacesIncGen",
566-
strip_include_prefix = "externals/llvm-external-projects/torch-mlir-dialects/include",
565+
strip_include_prefix = "include",
567566
tbl_outs = [
568567
(
569568
["-gen-op-interface-decls"],
570-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOpInterfaces.h.inc",
569+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOpInterfaces.h.inc",
571570
),
572571
(
573572
["-gen-op-interface-defs"],
574-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOpInterfaces.cpp.inc",
573+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOpInterfaces.cpp.inc",
575574
),
576575
(
577576
["-gen-type-interface-decls"],
578-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorTypeInterfaces.h.inc",
577+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorTypeInterfaces.h.inc",
579578
),
580579
(
581580
["-gen-type-interface-defs"],
582-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorTypeInterfaces.cpp.inc",
581+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorTypeInterfaces.cpp.inc",
583582
),
584583
],
585584
tblgen = "@llvm-project//mlir:mlir-tblgen",
586-
td_file = "externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorInterfaces.td",
585+
td_file = "include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorInterfaces.td",
587586
deps = [
588587
":TorchMLIRTMTensorOpsTdFiles",
589588
],
590589
)
591590

592591
gentbl_cc_library(
593592
name = "TorchMLIRTMTensorScalarLoopOpInterfaceIncGen",
594-
strip_include_prefix = "externals/llvm-external-projects/torch-mlir-dialects/include",
593+
strip_include_prefix = "include",
595594
tbl_outs = [
596595
(
597596
["-gen-op-interface-decls"],
598-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.h.inc",
597+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.h.inc",
599598
),
600599
(
601600
["-gen-op-interface-defs"],
602-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.cpp.inc",
601+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.cpp.inc",
603602
),
604603
],
605604
tblgen = "@llvm-project//mlir:mlir-tblgen",
606-
td_file = "externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.td",
605+
td_file = "include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.td",
607606
deps = [
608607
":TorchMLIRTMTensorOpsTdFiles",
609608
],
610609
)
611610

612611
gentbl_cc_library(
613612
name = "TorchMLIRTMTensorOpsIncGen",
614-
strip_include_prefix = "externals/llvm-external-projects/torch-mlir-dialects/include",
613+
strip_include_prefix = "include",
615614
tbl_outs = [
616615
(
617616
["-gen-op-decls"],
618-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.h.inc",
617+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.h.inc",
619618
),
620619
(
621620
["-gen-op-defs"],
622-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.cpp.inc",
621+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.cpp.inc",
623622
),
624623
(
625624
["-gen-typedef-decls"],
626-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorTypes.h.inc",
625+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorTypes.h.inc",
627626
),
628627
(
629628
[
630629
"-gen-dialect-decls",
631630
"-dialect=tm_tensor",
632631
],
633-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorDialect.h.inc",
632+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorDialect.h.inc",
634633
),
635634
(
636635
[
637636
"-gen-dialect-defs",
638637
"-dialect=tm_tensor",
639638
],
640-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorDialect.cpp.inc",
639+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorDialect.cpp.inc",
641640
),
642641
],
643642
tblgen = "@llvm-project//mlir:mlir-tblgen",
644-
td_file = "externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.td",
643+
td_file = "include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.td",
645644
deps = [
646645
":TorchMLIRTMTensorOpsTdFiles",
647646
],
@@ -650,18 +649,18 @@ gentbl_cc_library(
650649
cc_library(
651650
name = "TorchMLIRTMTensorDialect",
652651
srcs = [
653-
"externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/IR/ScalarLoopOpInterface.cpp",
654-
"externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/IR/TMTensorDialect.cpp",
655-
"externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/IR/TMTensorInterfaces.cpp",
656-
"externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/IR/TMTensorOps.cpp",
652+
"lib/Dialect/TMTensor/IR/ScalarLoopOpInterface.cpp",
653+
"lib/Dialect/TMTensor/IR/TMTensorDialect.cpp",
654+
"lib/Dialect/TMTensor/IR/TMTensorInterfaces.cpp",
655+
"lib/Dialect/TMTensor/IR/TMTensorOps.cpp",
657656
],
658657
hdrs = [
659-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.h",
660-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorDialect.h",
661-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorInterfaces.h",
662-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.h",
658+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/ScalarLoopOpInterface.h",
659+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorDialect.h",
660+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorInterfaces.h",
661+
"include/torch-mlir-dialects/Dialect/TMTensor/IR/TMTensorOps.h",
663662
],
664-
strip_include_prefix = "externals/llvm-external-projects/torch-mlir-dialects/include",
663+
strip_include_prefix = "include",
665664
deps = [
666665
":TorchMLIRTMTensorInterfacesIncGen",
667666
":TorchMLIRTMTensorOpsIncGen",
@@ -678,7 +677,7 @@ cc_library(
678677
td_library(
679678
name = "TorchMLIRTMTensorTransformsPassesTdFiles",
680679
srcs = [
681-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.td",
680+
"include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.td",
682681
],
683682
deps = [
684683
"@llvm-project//mlir:OpBaseTdFiles",
@@ -688,23 +687,23 @@ td_library(
688687

689688
gentbl_cc_library(
690689
name = "TorchMLIRTMTensorTransformsPassesIncGen",
691-
strip_include_prefix = "externals/llvm-external-projects/torch-mlir-dialects/include",
690+
strip_include_prefix = "include",
692691
tbl_outs = [
693692
(
694693
["-gen-pass-decls"],
695-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.h.inc",
694+
"include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.h.inc",
696695
),
697696
(
698697
["-gen-pass-capi-header"],
699-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.h.cpi.inc",
698+
"include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.h.cpi.inc",
700699
),
701700
(
702701
["-gen-pass-capi-impl"],
703-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.cpi.cpp.inc",
702+
"include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.cpi.cpp.inc",
704703
),
705704
],
706705
tblgen = "@llvm-project//mlir:mlir-tblgen",
707-
td_file = "externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.td",
706+
td_file = "include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.td",
708707
deps = [
709708
":TorchMLIRTMTensorTransformsPassesTdFiles",
710709
],
@@ -713,15 +712,15 @@ gentbl_cc_library(
713712
cc_library(
714713
name = "TorchMLIRTMTensorPasses",
715714
srcs = [
716-
"externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/Bufferize.cpp",
717-
"externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/ConvertToLoops.cpp",
718-
"externals/llvm-external-projects/torch-mlir-dialects/lib/Dialect/TMTensor/Transforms/Passes.cpp",
715+
"lib/Dialect/TMTensor/Transforms/Bufferize.cpp",
716+
"lib/Dialect/TMTensor/Transforms/ConvertToLoops.cpp",
717+
"lib/Dialect/TMTensor/Transforms/Passes.cpp",
719718
],
720719
hdrs = [
721-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/Transforms/PassDetail.h",
722-
"externals/llvm-external-projects/torch-mlir-dialects/include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.h",
720+
"include/torch-mlir-dialects/Dialect/TMTensor/Transforms/PassDetail.h",
721+
"include/torch-mlir-dialects/Dialect/TMTensor/Transforms/Passes.h",
723722
],
724-
strip_include_prefix = "externals/llvm-external-projects/torch-mlir-dialects/include",
723+
strip_include_prefix = "include",
725724
deps = [
726725
":TorchMLIRTMTensorDialect",
727726
":TorchMLIRTMTensorTransformsPassesIncGen",
@@ -800,6 +799,7 @@ cc_library(
800799
hdrs = [
801800
"include/torch-mlir/InitAll.h",
802801
],
802+
copts = ["-DTORCH_MLIR_ENABLE_REFBACKEND"],
803803
strip_include_prefix = "include",
804804
deps = [
805805
":TorchMLIRConversionPasses",

utils/bazel/torch-mlir-overlay/test/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ expand_template(
2222
"\"@LLVM_TOOLS_DIR@\"": "os.path.join(os.environ['TEST_SRCDIR'], 'llvm-project', 'llvm')",
2323
# All disabled, but required to substituted because they are not in quotes.
2424
"@MLIR_ENABLE_BINDINGS_PYTHON@": "0",
25-
"@TORCH_MLIR_ENABLE_JIT_IR_IMPORTER@": "0",
2625
"@TORCH_MLIR_ENABLE_STABLEHLO@": "0",
26+
"@TORCH_MLIR_ENABLE_REFBACKEND@": "1",
2727
},
2828
template = "lit.site.cfg.py.in",
2929
)

0 commit comments

Comments
 (0)