Merge pull request #74 from Xilinx/matthias.in-tree

Allow in-tree build with torch
Xilinx · Aug 23, 2024 · 74c643d · 74c643d
2 parents 0a198e5 + 4974ae6
commit 74c643d
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,6 +89,12 @@ else()
 
   list(APPEND CMAKE_MODULE_PATH ${MLIR_MAIN_SRC_DIR}/cmake/modules)
   list(APPEND CMAKE_MODULE_PATH ${LLVM_MAIN_SRC_DIR}/cmake)
+
+  if (MLIR_XTEN_ENABLE_TORCH)
+    set(TORCH_MLIR_INCLUDE_DIRS
+      ${LLVM_EXTERNAL_TORCH_MLIR_SOURCE_DIR}/include
+      ${LLVM_BINARY_DIR}/tools/torch-mlir/include)
+  endif()
 endif()
 
 # Define the default arguments to use with 'lit', and an option for the user to
@@ -113,7 +119,6 @@ include_directories(${XTEN_SOURCE_DIR}/include)
 include_directories(${XTEN_BINARY_DIR}/include)
 
 if(MLIR_XTEN_ENABLE_TORCH)
-  # TORCH_MLIR
   include_directories(${TORCH_MLIR_INCLUDE_DIRS})
 endif()
 

diff --git a/include/xten/Dialect/XTenNN/IR/XTenNNOps.h b/include/xten/Dialect/XTenNN/IR/XTenNNOps.h
@@ -13,7 +13,6 @@
 #ifndef XTENNNOPS_H
 #define XTENNNOPS_H
 
-#include "mlir/Dialect/Bufferization/IR/Bufferization.h"
 #include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/OpDefinition.h"

diff --git a/lib/Conversion/CMakeLists.txt b/lib/Conversion/CMakeLists.txt
@@ -7,26 +7,34 @@
 # (c) Copyright 2021 Xilinx, Inc. All Rights reserved.
 # (c) Copyright 2022 - 2024 Advanced Micro Devices, Inc. All Rights reserved.
 if(MLIR_XTEN_ENABLE_TORCH)
-    set(XTENNNTOTORCH XTenNNToTorch.cpp)
+    set(TorchSrc XTenNNToTorch.cpp)
+    set(TorchLib TorchMLIRTorchDialect TorchMLIRTorchConversionPasses)
 endif()
 
 add_mlir_library(XTenConversionPasses
   Passes.cpp
   TosaToXTenNN.cpp
   XTenNNToTosa.cpp
   XTenNNToLinalg.cpp
-  ${XTENNNTOTORCH}
+  ${TorchSrc}
 
   PARTIAL_SOURCES_INTENDED
 
   DEPENDS
   XTenConversionIncGen
-  MLIRLinalgOpsIncGen
 
   LINK_COMPONENTS
   Core
 
   LINK_LIBS PUBLIC
+  MLIRAffineDialect
+  MLIRFuncDialect
+  MLIRLinalgDialect
+  MLIRMemRefDialect
+  MLIRTosaDialect
+  MLIRVectorDialect
+  XTenNNDialect
+  ${TorchLib}
 )
 
 if(MLIR_XTEN_ENABLE_TORCH)

diff --git a/lib/Conversion/PassDetail.h b/lib/Conversion/PassDetail.h
@@ -15,7 +15,7 @@
 #define XTEN_CONVERSION_PASSDETAIL_H
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
-#include "mlir/Dialect/Bufferization/IR/Bufferization.h"
+#include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/Tosa/IR/TosaOps.h"

diff --git a/lib/Conversion/XTenNNToLinalg.cpp b/lib/Conversion/XTenNNToLinalg.cpp
@@ -4,12 +4,10 @@
 #include "mlir/Dialect/Complex/IR/Complex.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
 #include "mlir/Dialect/Linalg/IR/Linalg.h"
-#include "mlir/Dialect/Linalg/Transforms/Transforms.h"
 #include "mlir/Dialect/Linalg/Utils/Utils.h"
 #include "mlir/Dialect/Math/IR/Math.h"
 #include "mlir/Dialect/SCF/IR/SCF.h"
 #include "mlir/Dialect/Shape/IR/Shape.h"
-#include "mlir/Dialect/SparseTensor/IR/SparseTensor.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/Dialect/Tosa/Utils/ConversionUtils.h"
 #include "mlir/IR/Operation.h"

diff --git a/lib/Dialect/XTenNN/IR/CMakeLists.txt b/lib/Dialect/XTenNN/IR/CMakeLists.txt
@@ -15,7 +15,5 @@ add_mlir_dialect_library(XTenNNDialect
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRPass
-  MLIRTransforms
   XTenNNInterfaces
 )
diff --git a/lib/Dialect/XTenNN/Transforms/CMakeLists.txt b/lib/Dialect/XTenNN/Transforms/CMakeLists.txt
@@ -19,5 +19,6 @@ add_mlir_dialect_library(XTenNNTransforms
   MLIRPass
   MLIRTransforms
   MLIRFuncDialect
+  MLIRTosaDialect
   XTenNNDialect
-)
+)
diff --git a/lib/Transform/CMakeLists.txt b/lib/Transform/CMakeLists.txt
@@ -13,5 +13,9 @@ add_mlir_library(XTenTransformPasses
 
  DEPENDS
  XTenTransformIncGen
- MLIRLinalgDialect
+
+ LINK_LIBS
+ PUBLIC
+ XTenNNDialect
+ MLIRFuncDialect
 )
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -24,21 +24,10 @@ set_target_properties(_xten PROPERTIES PREFIX "")
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS)
 
-if(MLIR_XTEN_ENABLE_TORCH)
-  set(torch_libs
-    TorchMLIRTorchDialect
-    TorchMLIRTorchConversionDialect
-    TorchMLIRTorchConversionPasses
-    TorchMLIRTorchUtils
-    TorchMLIRConversionUtils
-  )
-endif()
-
 target_link_libraries(_xten
   PRIVATE
   XTenTransformPasses
   XTenConversionPasses
-  ${torch_libs}
   ${Python3_LIBRARIES}
   ${dialect_libs}
   ${conversion_libs}