From 8dfe166688e26fa996716430281f8bdec6f02639 Mon Sep 17 00:00:00 2001 From: sgligorijevicTT <189116645+sgligorijevicTT@users.noreply.github.com> Date: Tue, 28 Jan 2025 10:41:49 +0000 Subject: [PATCH 1/2] Uplift mlir; add shardy to dependencies --- src/common/CMakeLists.txt | 4 ++++ third_party/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index bcc3b88a..1a49878e 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -40,8 +40,10 @@ target_include_directories(TTPJRTCommon PUBLIC ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir/include ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir/runtime/include ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir-build/stablehlo/ + ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir-build/shardy/ ${TTMLIR_TOOLCHAIN_DIR}/include ${TTMLIR_TOOLCHAIN_DIR}/src/stablehlo + ${TTMLIR_TOOLCHAIN_DIR}/src/shardy ) set(STABLEHLO_LIBS @@ -98,6 +100,8 @@ StablehloReferenceAxes StablehloReferenceNumPy StablehloReferenceScope StablehloReferenceValue +SdyDialect +SdyRegister ) target_link_libraries(TTPJRTCommon PUBLIC diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 342853cf..91889475 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TT_MLIR_VERSION "ad93092841542d104b8bacba6b92d97678ccd94e") +set(TT_MLIR_VERSION "73efb5cd3e25215d3ee23c5af39c0b5dfe200a28") set(LOGURU_VERSION "4adaa185883e3c04da25913579c451d3c32cfac1") if (TOOLCHAIN STREQUAL "ON") From 5749c6afb916fc1f78d09d6b1d48ce18e9d8864d Mon Sep 17 00:00:00 2001 From: sgligorijevicTT <189116645+sgligorijevicTT@users.noreply.github.com> Date: Tue, 28 Jan 2025 14:47:15 +0000 Subject: [PATCH 2/2] Downgrade uplift to lastest working; reorder dirs and libs --- src/common/CMakeLists.txt | 8 ++++---- third_party/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 1a49878e..42d8eed6 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -39,11 +39,11 @@ target_include_directories(TTPJRTCommon PUBLIC ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir-build/include/ttmlir/Target/Common ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir/include ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir/runtime/include - ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir-build/stablehlo/ ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir-build/shardy/ + ${PROJECT_SOURCE_DIR}/third_party/tt-mlir/src/tt-mlir-build/stablehlo/ ${TTMLIR_TOOLCHAIN_DIR}/include - ${TTMLIR_TOOLCHAIN_DIR}/src/stablehlo ${TTMLIR_TOOLCHAIN_DIR}/src/shardy + ${TTMLIR_TOOLCHAIN_DIR}/src/stablehlo ) set(STABLEHLO_LIBS @@ -65,6 +65,8 @@ ChloOps Version VhloOps VhloTypes +SdyDialect +SdyRegister StablehloOps StablehloRegister StablehloReferenceToken @@ -100,8 +102,6 @@ StablehloReferenceAxes StablehloReferenceNumPy StablehloReferenceScope StablehloReferenceValue -SdyDialect -SdyRegister ) target_link_libraries(TTPJRTCommon PUBLIC diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 91889475..b0ddd8b2 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # -set(TT_MLIR_VERSION "73efb5cd3e25215d3ee23c5af39c0b5dfe200a28") +set(TT_MLIR_VERSION "e581e6a815de6b0ce3c4ceedc70620d19be29969") set(LOGURU_VERSION "4adaa185883e3c04da25913579c451d3c32cfac1") if (TOOLCHAIN STREQUAL "ON")