update tt-metal

marty1885 · Jan 18, 2025 · 1e74d5a · 1e74d5a
1 parent 2323e8a
commit 1e74d5a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/ggml/src/ggml-metalium/CMakeLists.txt b/ggml/src/ggml-metalium/CMakeLists.txt
@@ -26,6 +26,7 @@ target_include_directories(ggml-metalium PRIVATE
     # Metalium
     $ENV{TT_METAL_HOME}
     $ENV{TT_METAL_HOME}/tt_metal
+    $ENV{TT_METAL_HOME}/tt_metal/api
     $ENV{TT_METAL_HOME}/tt_metal/third_party/umd
     $ENV{TT_METAL_HOME}/tt_metal/third_party/umd/device/
     $ENV{TT_METAL_HOME}/tt_metal/third_party/umd/device/api
@@ -41,9 +42,8 @@ target_include_directories(ggml-metalium PRIVATE
     $ENV{TT_METAL_HOME}/tt_metal/include
 
     # TTNN
+    $ENV{TT_METAL_HOME}/ttnn
     $ENV{TT_METAL_HOME}/ttnn/cpp
-    $ENV{TT_METAL_HOME}/ttnn/cpp/ttnn/deprecated/
-    $ENV{TT_METAL_HOME}/tt_eager
     $ENV{TT_METAL_HOME}/tt_metal/third_party/magic_enum
 
     # Metalium extra includes

diff --git a/ggml/src/ggml-metalium/ggml-metalium.cpp b/ggml/src/ggml-metalium/ggml-metalium.cpp
@@ -1,16 +1,10 @@
-#include "common/base_types.hpp"
-#include "common/bfloat16.hpp"
-#include "common/constants.hpp"
-#include "common/logger.hpp"
 #include "ggml-backend-impl.h"
 #include "ggml-backend.h"
 #include "ggml.h"
 #include "ggml-impl.h"
 #include "ggml-cpu.h"
 #include "ggml-metalium.h"
 
-#include "host_api.hpp"
-#include "impl/dispatch/command_queue.hpp"
 #include "ttnn/operations/core/compute_kernel/compute_kernel_config.hpp"
 #include "ttnn/operations/eltwise/binary/binary_composite.hpp"
 #include "ttnn/operations/eltwise/unary/unary.hpp"
@@ -50,8 +44,8 @@
 #include <ttnn/operations/data_movement/repeat/repeat.hpp>
 #include <ttnn/operations/data_movement/concat/concat.hpp>
 #include <ttnn/operations/copy.hpp>
-#include <tt_metal/detail/persistent_kernel_cache.hpp>
 #include <ttnn/operations/normalization/softmax/softmax.hpp>
+#include <tt-metalium/persistent_kernel_cache.hpp>
 
 
 #include <memory>

diff --git a/ggml/src/ggml-metalium/metalium-pch.hpp b/ggml/src/ggml-metalium/metalium-pch.hpp
@@ -1,18 +1,12 @@
 #include <unistd.h>
 #ifdef __cplusplus
-#include "common/base_types.hpp"
-#include "common/bfloat16.hpp"
-#include "common/constants.hpp"
-#include "common/logger.hpp"
 #include "ggml-backend-impl.h"
 #include "ggml-backend.h"
 #include "ggml.h"
 #include "ggml-impl.h"
 #include "ggml-cpu.h"
 #include "ggml-metalium.h"
 
-#include "host_api.hpp"
-#include "impl/dispatch/command_queue.hpp"
 #include "ttnn/operations/core/compute_kernel/compute_kernel_config.hpp"
 #include "ttnn/operations/eltwise/binary/binary_composite.hpp"
 #include "ttnn/operations/eltwise/unary/unary.hpp"
@@ -52,7 +46,6 @@
 #include <ttnn/operations/data_movement/repeat/repeat.hpp>
 #include <ttnn/operations/data_movement/concat/concat.hpp>
 #include <ttnn/operations/copy.hpp>
-#include <tt_metal/detail/persistent_kernel_cache.hpp>
 #include <ttnn/operations/normalization/softmax/softmax.hpp>