From c86135d737af19099465c0dc80b5558956ed5ca4 Mon Sep 17 00:00:00 2001 From: Vladimir Milosevic <157983820+vmilosevic@users.noreply.github.com> Date: Fri, 7 Feb 2025 18:50:53 +0100 Subject: [PATCH] Uplift third_party/tt-metal to b552fb8ae14236777983e3521a312dd78432f0e1 2025-02-07 (#2139) This PR uplifts the third_party/tt-metal to the b552fb8ae14236777983e3521a312dd78432f0e1 - Update include locations for small_vector after metal commit b552fb8ae1 --------- Co-authored-by: kmabeeTT <118925087+kmabeeTT@users.noreply.github.com> Co-authored-by: brataTT --- lib/OpModel/TTNN/Conversion.cpp | 2 +- lib/OpModel/TTNN/MetalHeaders.h | 2 +- runtime/lib/ttnn/runtime.cpp | 2 +- third_party/CMakeLists.txt | 2 +- tools/ttnn-standalone/ttnn-precompiled.hpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/OpModel/TTNN/Conversion.cpp b/lib/OpModel/TTNN/Conversion.cpp index b31a454b0a..3b88c4ccab 100644 --- a/lib/OpModel/TTNN/Conversion.cpp +++ b/lib/OpModel/TTNN/Conversion.cpp @@ -39,7 +39,7 @@ getDataType(const mlir::tt::ttnn::TTNNLayoutAttr layout) { } ::ttnn::Shape getShape(const ::llvm::ArrayRef shape) { - ::tt::tt_metal::SmallVector small_vector_shape; + ::tt::stl::SmallVector small_vector_shape; for (const auto &dim : shape) { small_vector_shape.push_back(static_cast(dim)); } diff --git a/lib/OpModel/TTNN/MetalHeaders.h b/lib/OpModel/TTNN/MetalHeaders.h index 2f2635692c..98bfe78e37 100644 --- a/lib/OpModel/TTNN/MetalHeaders.h +++ b/lib/OpModel/TTNN/MetalHeaders.h @@ -56,6 +56,7 @@ #include "tt-metalium/core_coord.hpp" #include "tt-metalium/device_impl.hpp" #include "tt-metalium/host_api.hpp" +#include "tt-metalium/small_vector.hpp" #include "ttnn/graph/graph_processor.hpp" #include "ttnn/graph/graph_query_op_constraints.hpp" #include "ttnn/graph/graph_query_op_runtime.hpp" @@ -64,7 +65,6 @@ #include "ttnn/operations/eltwise/unary/unary.hpp" #include "ttnn/operations/matmul/matmul.hpp" #include "ttnn/operations/normalization/softmax/softmax.hpp" -#include "ttnn/tensor/shape/small_vector.hpp" #include "ttnn/tensor/tensor.hpp" #include "ttnn/tensor/tensor_spec.hpp" #include "ttnn/tensor/types.hpp" diff --git a/runtime/lib/ttnn/runtime.cpp b/runtime/lib/ttnn/runtime.cpp index fd21da03b6..13c1cf67e7 100644 --- a/runtime/lib/ttnn/runtime.cpp +++ b/runtime/lib/ttnn/runtime.cpp @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 +#include "tt-metalium/small_vector.hpp" #include "tt/runtime/detail/common.h" #include "tt/runtime/detail/debug.h" #include "tt/runtime/detail/logger.h" @@ -12,7 +13,6 @@ #include "tt/runtime/utils.h" #include "ttmlir/Target/TTNN/Target.h" #include "ttmlir/Version.h" -#include "ttnn/tensor/shape/small_vector.hpp" #include "ttnn/tensor/types.hpp" namespace tt::runtime::ttnn { diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 7c5e24badf..962bb4b178 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -1,6 +1,6 @@ include(ExternalProject) -set(TT_METAL_VERSION "b093594aa5fc01f7c008a0b5ffddbcf2713bd8f7") +set(TT_METAL_VERSION "b552fb8ae14236777983e3521a312dd78432f0e1") if ("$ENV{ARCH_NAME}" STREQUAL "grayskull") set(ARCH_NAME "grayskull") diff --git a/tools/ttnn-standalone/ttnn-precompiled.hpp b/tools/ttnn-standalone/ttnn-precompiled.hpp index 2ac615fbc9..629d119776 100644 --- a/tools/ttnn-standalone/ttnn-precompiled.hpp +++ b/tools/ttnn-standalone/ttnn-precompiled.hpp @@ -23,10 +23,10 @@ #include "operations/moreh/moreh_cumsum/moreh_cumsum.hpp" #include "operations/normalization/softmax/softmax.hpp" #include "operations/reduction/generic/generic_reductions.hpp" -#include "tensor/shape/small_vector.hpp" #include "tensor/tensor.hpp" #include "tensor/types.hpp" #include "tt-metalium/bfloat16.hpp" +#include "tt-metalium/small_vector.hpp" #include "types.hpp" // ANCHOR_END: standalone_includes