#10531: Move ops from ttnn/op_library to ttnn/operations/core (#10558)

* #10531: Remove op_library from ttnn. Remove ttnn/cpp/ttnn with ttnn includes
tenstorrent · Jul 23, 2024 · b9aa2a4 · b9aa2a4
1 parent 00324ac
commit b9aa2a4
Show file tree

Hide file tree

Showing 81 changed files with 117 additions and 115 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -116,7 +116,7 @@ ttnn/cpp/ttnn/experimental/tt_dnn/op_library/operation_history.*pp @arakhmati @e
 ttnn/cpp/ttnn/experimental/tt_dnn/op_library/operation.*pp @arakhmati @eyonland @cfjchu @xanderchin
 ttnn/cpp/ttnn/experimental/tt_dnn/op_library/run_operation.*pp @arakhmati @eyonland @cfjchu @xanderchin
 ttnn/cpp/ttnn/experimental/tt_dnn/op_library/program_cache.*pp @arakhmati @eyonland @cfjchu @xanderchin
-ttnn/cpp/ttnn/experimental/tensor/ @arakhmati @eyonland @cfjchu @xanderchin
+ttnn/cpp/ttnn/tensor/ @arakhmati @eyonland @cfjchu @xanderchin
 
 # eager - python api
 # **/tt_lib/

diff --git a/tests/tt_eager/integration_tests/test_bert.cpp b/tests/tt_eager/integration_tests/test_bert.cpp
@@ -7,13 +7,13 @@
 #include "ttnn/tensor/host_buffer/types.hpp"
 #include "ttnn/tensor/tensor.hpp"
 #include "ttnn/operation.hpp"
-#include "ttnn/cpp/ttnn/operations/normalization/softmax/softmax.hpp"
+#include "ttnn/operations/normalization/softmax/softmax.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/transformer_tms/transformer_tms.hpp"
 #include "tt_metal/common/constants.hpp"
 #include "tt_metal/host_api.hpp"
 #include "tt_numpy/functions.hpp"
 #include "ttnn/operations/matmul/matmul.hpp"
-#include "ttnn/cpp/ttnn/operations/normalization/layernorm/layernorm.hpp"
+#include "ttnn/operations/normalization/layernorm/layernorm.hpp"
 #include "ttnn/operations/eltwise/binary/binary.hpp"
 #include "ttnn/operations/experimental/transformer/transformer.hpp"
 

diff --git a/tests/tt_eager/ops/test_average_pool.cpp b/tests/tt_eager/ops/test_average_pool.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "ttnn/cpp/ttnn/operations/pool/avgpool/avg_pool.hpp"
+#include "ttnn/operations/pool/avgpool/avg_pool.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/auto_format.hpp"
 #include "tt_dnn/op_library/auto_format.hpp"
 #include "tt_numpy/functions.hpp"

diff --git a/tests/tt_eager/ops/test_pad_op.cpp b/tests/tt_eager/ops/test_pad_op.cpp
@@ -8,7 +8,7 @@
 #include "ttnn/tensor/host_buffer/types.hpp"
 #include "ttnn/tensor/tensor.hpp"
 #include "ttnn/operation.hpp"
-#include "ttnn/cpp/ttnn/operations/data_movement/pad/pad.hpp"
+#include "ttnn/operations/data_movement/pad/pad.hpp"
 #include "tt_metal/host_api.hpp"
 #include "tt_numpy/functions.hpp"
 

diff --git a/...ernels/dataflow/unit_tests/erisc/eth_l1_forward_local_chip_data_looping_multi_channel.cpp b/...ernels/dataflow/unit_tests/erisc/eth_l1_forward_local_chip_data_looping_multi_channel.cpp
@@ -7,7 +7,7 @@
 
 #include "dataflow_api.h"
 #include "debug/dprint.h"
-#include "ttnn/cpp/ttnn/experimental/tt_dnn/op_library/ccl/edm/erisc_async_datamover.hpp"
+#include "ttnn/experimental/tt_dnn/op_library/ccl/edm/erisc_async_datamover.hpp"
 
 #define ENABLE_L1_BUFFER_OVERLAP 0
 // #define ENABLE_L1_BUFFER_OVERLAP 1

diff --git a/.../tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_non_blocking_receive_fwd_to_dram.cpp b/.../tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_non_blocking_receive_fwd_to_dram.cpp
@@ -6,7 +6,7 @@
 #include <cstdint>
 #include "dataflow_api.h"
 #include "debug/dprint.h"
-#include "ttnn/cpp/ttnn/experimental/tt_dnn/op_library/ccl/edm/erisc_async_datamover.hpp"
+#include "ttnn/experimental/tt_dnn/op_library/ccl/edm/erisc_async_datamover.hpp"
 
 #define DONT_STRIDE_IN_ETH_BUFFER 0
 

diff --git a/tests/ttnn/unit_tests/gtests/test_add.cpp b/tests/ttnn/unit_tests/gtests/test_add.cpp
@@ -5,7 +5,7 @@
 #include "tests/tt_metal/tt_metal/unit_tests_common/common/common_fixture.hpp"
 #include "ttnn/device.hpp"
 #include "ttnn/operations/eltwise/binary/binary.hpp"
-#include "ttnn/operations/core.hpp"
+#include "ttnn/operations/core/core.hpp"
 #include "ttnn/operations/creation.hpp"
 #include "ttnn_test_fixtures.hpp"
 

diff --git a/tests/ttnn/unit_tests/gtests/test_async_runtime.cpp b/tests/ttnn/unit_tests/gtests/test_async_runtime.cpp
@@ -8,7 +8,7 @@
 #include "ttnn/operations/eltwise/unary/device/unary_op.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/moreh_sum/moreh_sum_op.hpp"
 #include "common/bfloat16.hpp"
-#include "ttnn/cpp/ttnn/async_runtime.hpp"
+#include "ttnn/async_runtime.hpp"
 #include "tt_numpy/functions.hpp"
 #include <cmath>
 

diff --git a/tests/ttnn/unit_tests/gtests/test_multi_cq_multi_dev.cpp b/tests/ttnn/unit_tests/gtests/test_multi_cq_multi_dev.cpp
@@ -8,7 +8,7 @@
 #include "ttnn/operations/eltwise/unary/device/unary_op.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/moreh_sum/moreh_sum_op.hpp"
 #include "common/bfloat16.hpp"
-#include "ttnn/cpp/ttnn/async_runtime.hpp"
+#include "ttnn/async_runtime.hpp"
 #include "tt_numpy/functions.hpp"
 #include <cmath>
 

diff --git a/tests/ttnn/unit_tests/gtests/test_multiprod_queue.cpp b/tests/ttnn/unit_tests/gtests/test_multiprod_queue.cpp
@@ -8,7 +8,7 @@
 #include "ttnn/operations/eltwise/binary/binary.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/moreh_sum/moreh_sum_op.hpp"
 #include "common/bfloat16.hpp"
-#include "ttnn/cpp/ttnn/async_runtime.hpp"
+#include "ttnn/async_runtime.hpp"
 #include "tt_numpy/functions.hpp"
 #include <cmath>
 #include <thread>

diff --git a/tests/ttnn/unit_tests/gtests/test_repeat_interleave.cpp b/tests/ttnn/unit_tests/gtests/test_repeat_interleave.cpp
@@ -6,7 +6,7 @@
 
 #include "tt_metal/common/bfloat16.hpp"
 #include "ttnn/device.hpp"
-#include "ttnn/operations/core.hpp"
+#include "ttnn/operations/core/core.hpp"
 #include "ttnn/async_runtime.hpp"
 #include "ttnn/operations/data_movement.hpp"
 #include "tt_numpy/functions.hpp"

diff --git a/tests/ttnn/unit_tests/gtests/test_to_and_from_json.cpp b/tests/ttnn/unit_tests/gtests/test_to_and_from_json.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 
 #include "gtest/gtest.h"
-#include "ttnn/cpp/ttnn/operations/matmul/matmul.hpp"
+#include "ttnn/operations/matmul/matmul.hpp"
 #include "ttnn/types.hpp"
 
 TEST(TEST_JSON_CONVERSION, TEST_MEMORY_CONFIG) {

diff --git a/ttnn/CMakeLists.txt b/ttnn/CMakeLists.txt
@@ -3,7 +3,7 @@ set(TTNN_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp/ttnn/async_runtime.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp/ttnn/run_operation.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp/ttnn/operation_history.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cpp/ttnn/op_library/to_layout/to_layout_op.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/cpp/ttnn/operations/core/to_layout/to_layout_op.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp/ttnn/operations/conv2d/conv2d.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp/ttnn/operations/conv2d/device/conv_op_program_factory.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp/ttnn/operations/conv2d/device/optimized_conv_op_program_factory.cpp

diff --git a/ttnn/cpp/pybind11/activation.hpp b/ttnn/cpp/pybind11/activation.hpp
@@ -8,8 +8,8 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "ttnn/tensor/tensor.hpp"
 #include "ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_op.hpp"
+#include "ttnn/operations/eltwise/unary/device/unary_op.hpp"
 #include "export_enum.hpp"
 
 namespace py = pybind11;

diff --git a/ttnn/cpp/pybind11/operations/core.hpp b/ttnn/cpp/pybind11/operations/core.hpp
@@ -8,7 +8,7 @@
 #include <pybind11/stl.h>
 
 #include "ttnn/cpp/pybind11/decorators.hpp"
-#include "ttnn/operations/core.hpp"
+#include "ttnn/operations/core/core.hpp"
 
 namespace py = pybind11;
 

diff --git a/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/backward/backward_ops.cpp b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/backward/backward_ops.cpp
@@ -6,7 +6,7 @@
 
 #include "ttnn/experimental/tt_dnn/op_library/complex/complex_ops.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp"
-#include "ttnn/cpp/ttnn/operations/embedding/embedding/embedding.hpp"
+#include "ttnn/operations/embedding/embedding/embedding.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/math.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/moreh_sum/moreh_sum_op.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/reduce/reduce_op.hpp"

diff --git a/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp
@@ -13,7 +13,7 @@
 #include "ttnn/operations/eltwise/unary/unary.hpp"
 
 #include "tt_metal/common/constants.hpp"
-#include "ttnn/cpp/ttnn/operations/creation.hpp"
+#include "ttnn/operations/creation.hpp"
 #include "ttnn/operations/data_movement/pad/pad.hpp"
 #include "ttnn/operations/eltwise/binary/device/binary_device_operation.hpp"
 

diff --git a/...ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_post_allgather_op.hpp b/...ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_post_allgather_op.hpp
@@ -7,10 +7,10 @@
 #include <optional>
 
 #include "ttnn/experimental/tt_dnn/op_library/compute_kernel_config.hpp"
-#include "ttnn/run_operation.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_pre_allgather_op.hpp"
+#include "ttnn/run_operation.hpp"
 #include "ttnn/tensor/tensor.hpp"
-#include "ttnn/operations/core.hpp"
+#include "ttnn/operations/core/core.hpp"
 
 using namespace tt::constants;
 

diff --git a/.../ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_pre_allgather_op.hpp b/.../ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_pre_allgather_op.hpp
@@ -9,7 +9,8 @@
 #include "ttnn/experimental/tt_dnn/op_library/compute_kernel_config.hpp"
 #include "ttnn/run_operation.hpp"
 #include "ttnn/tensor/tensor.hpp"
-#include "ttnn/operations/core.hpp"
+#include "ttnn/operations/core/core.hpp"
+
 
 using namespace tt::constants;
 

diff --git a/.../cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.cpp b/.../cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.hpp"
-#include "ttnn/cpp/ttnn/operations/creation.hpp"
+#include "ttnn/operations/creation.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/moreh_helper_functions.hpp"
 
 namespace tt {

diff --git a/.../cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.hpp b/.../cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.hpp
@@ -14,7 +14,7 @@
 #include "ttnn/tensor/tensor.hpp"
 #include "ttnn/tensor/tensor_impl.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp"
-#include "ttnn/cpp/ttnn/operations/eltwise/binary/binary.hpp"
+#include "ttnn/operations/eltwise/binary/binary.hpp"
 
 namespace tt {
 

diff --git a/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/nlp_tms/nlp_tms.hpp b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/nlp_tms/nlp_tms.hpp
@@ -6,7 +6,7 @@
 
 #include "ttnn/tensor/tensor.hpp"
 #include "ttnn/run_operation.hpp"
-#include "ttnn/operations/core.hpp"
+#include "ttnn/operations/core/core.hpp"
 #include "tt_metal/common/constants.hpp"
 
 namespace tt {

diff --git a/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/reduce/reduce_op.cpp b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/reduce/reduce_op.cpp
@@ -14,7 +14,7 @@
 #include "tt_metal/common/constants.hpp"
 #include "ttnn/operations/eltwise/unary/unary.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/backward/backward_ops.hpp"
-#include "ttnn/cpp/ttnn/operations/eltwise/unary_backward/device/unary_backward_op.hpp"
+#include "ttnn/operations/eltwise/unary_backward/device/unary_backward_op.hpp"
 
 
 #include <limits>

diff --git a/ttnn/cpp/ttnn/operations/ccl/all_gather/all_gather_op.hpp b/ttnn/cpp/ttnn/operations/ccl/all_gather/all_gather_op.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "ttnn/operations/ccl/all_gather/device/all_gather_op.hpp"
-#include "ttnn/cpp/ttnn/multi_device.hpp"
+#include "ttnn/multi_device.hpp"
 
 namespace ttnn {
 namespace operations {

diff --git a/ttnn/cpp/ttnn/operations/ccl/all_gather/device/all_gather_op.hpp b/ttnn/cpp/ttnn/operations/ccl/all_gather/device/all_gather_op.hpp
@@ -8,11 +8,11 @@
 #include "common/core_coord.h"
 #include "impl/buffers/buffer.hpp"
 #include "ttnn/tensor/tensor.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
+#include "ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
 #include "tt_metal/common/constants.hpp"
 #include "tt_metal/host_api.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp"
+#include "ttnn/operations/ccl/ccl_host_datastructures.hpp"
+#include "ttnn/operations/ccl/ccl_common.hpp"
 
 #include "ttnn/run_operation.hpp"
 

diff --git a/ttnn/cpp/ttnn/operations/ccl/all_gather/device/multi_core/all_gather_op_multi_core.cpp b/ttnn/cpp/ttnn/operations/ccl/all_gather/device/multi_core/all_gather_op_multi_core.cpp
@@ -8,10 +8,10 @@
 #include "eth_l1_address_map.h"
 #include "impl/buffers/buffer.hpp"
 #include "ttnn/tensor/tensor_impl.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/all_gather/device/all_gather_op.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp"
+#include "ttnn/operations/ccl/all_gather/device/all_gather_op.hpp"
+#include "ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
+#include "ttnn/operations/ccl/ccl_host_datastructures.hpp"
+#include "ttnn/operations/ccl/ccl_common.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/math.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/work_split.hpp"
 #include "tt_metal/common/constants.hpp"

diff --git a/ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp b/ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp
@@ -8,8 +8,8 @@
 #include <numeric>
 
 #include "common/constants.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
+#include "ttnn/operations/ccl/ccl_host_datastructures.hpp"
+#include "ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
 #include "tt_metal/host_api.hpp"
 #include "tt_metal/impl/program/program.hpp"
 #include "ttnn/tensor/types.hpp"

diff --git a/ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp b/ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp
@@ -6,7 +6,7 @@
 
 #include "eth_l1_address_map.h"
 #include "ttnn/tensor/tensor_impl.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
+#include "ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
 #include <limits>
 
 namespace ttnn {

diff --git a/ttnn/cpp/ttnn/operations/ccl/line_all_gather/device/line_all_gather_op.hpp b/ttnn/cpp/ttnn/operations/ccl/line_all_gather/device/line_all_gather_op.hpp
@@ -8,11 +8,11 @@
 #include "common/core_coord.h"
 #include "impl/buffers/buffer.hpp"
 #include "ttnn/tensor/tensor.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
+#include "ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
 #include "tt_metal/common/constants.hpp"
 #include "tt_metal/host_api.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp"
+#include "ttnn/operations/ccl/ccl_host_datastructures.hpp"
+#include "ttnn/operations/ccl/ccl_common.hpp"
 
 #include "ttnn/run_operation.hpp"
 

diff --git a/ttnn/cpp/ttnn/operations/ccl/line_all_gather/line_all_gather_op.hpp b/ttnn/cpp/ttnn/operations/ccl/line_all_gather/line_all_gather_op.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "ttnn/operations/ccl/line_all_gather/device/line_all_gather_op.hpp"
-#include "ttnn/cpp/ttnn/multi_device.hpp"
+#include "ttnn/multi_device.hpp"
 
 namespace ttnn {
 namespace operations {

diff --git a/ttnn/cpp/ttnn/operations/ccl/reduce_scatter/device/host/reduce_scatter_full_worker_grid.cpp b/ttnn/cpp/ttnn/operations/ccl/reduce_scatter/device/host/reduce_scatter_full_worker_grid.cpp
@@ -8,9 +8,9 @@
 #include "impl/buffers/buffer.hpp"
 #include "impl/kernels/data_types.hpp"
 #include "ttnn/tensor/tensor_impl.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp"
+#include "ttnn/operations/ccl/shared_with_host/hetergeneous_data_structs.hpp"
+#include "ttnn/operations/ccl/ccl_host_datastructures.hpp"
+#include "ttnn/operations/ccl/ccl_common.hpp"
 #include "tt_metal/common/constants.hpp"
 #include "tt_metal/host_api.hpp"
 #include "tt_metal/impl/buffers/circular_buffer_types.hpp"

diff --git a/ttnn/cpp/ttnn/operations/ccl/reduce_scatter/device/reduce_scatter_op.cpp b/ttnn/cpp/ttnn/operations/ccl/reduce_scatter/device/reduce_scatter_op.cpp
@@ -5,7 +5,7 @@
 #include "ttnn/operations/ccl/reduce_scatter/device/reduce_scatter_op.hpp"
 
 #include "ttnn/experimental/tt_dnn/op_library/reduce/reduce_op.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp"
+#include "ttnn/operations/ccl/ccl_host_datastructures.hpp"
 #include "tt_metal/host_api.hpp"
 
 #include "ttnn/operations/eltwise/binary/binary.hpp"

diff --git a/ttnn/cpp/ttnn/operations/ccl/reduce_scatter/device/reduce_scatter_op.hpp b/ttnn/cpp/ttnn/operations/ccl/reduce_scatter/device/reduce_scatter_op.hpp
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "ttnn/run_operation.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp"
-#include "ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp"
+#include "ttnn/operations/ccl/ccl_common.hpp"
+#include "ttnn/operations/ccl/ccl_host_datastructures.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/reduce/reduce_op.hpp"
 
 #include "ttnn/operations/eltwise/binary/binary.hpp"

diff --git a/ttnn/cpp/ttnn/operations/ccl/reduce_scatter/reduce_scatter_op.hpp b/ttnn/cpp/ttnn/operations/ccl/reduce_scatter/reduce_scatter_op.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "ttnn/operations/ccl/reduce_scatter/device/reduce_scatter_op.hpp"
-#include "ttnn/cpp/ttnn/multi_device.hpp"
+#include "ttnn/multi_device.hpp"
 
 namespace ttnn {
 namespace operations {

diff --git a/ttnn/cpp/ttnn/operations/conv2d/conv2d.cpp b/ttnn/cpp/ttnn/operations/conv2d/conv2d.cpp
@@ -4,9 +4,9 @@
 
 #include "conv2d.hpp"
 
-#include "ttnn/cpp/ttnn/operations/data_movement/downsample/device/downsample_op.hpp"
+#include "ttnn/operations/data_movement/downsample/device/downsample_op.hpp"
 #include "tt_metal/detail/reports/memory_reporter.hpp"
-#include "ttnn/cpp/ttnn/op_library/to_dtype/to_dtype_op.hpp"
+#include "ttnn/operations/core/to_dtype/to_dtype_op.hpp"
 #include "ttnn/experimental/tt_dnn/op_library/work_split.hpp"
 
 using namespace tt;

diff --git a/ttnn/cpp/ttnn/operations/conv2d/conv2d.hpp b/ttnn/cpp/ttnn/operations/conv2d/conv2d.hpp
@@ -7,9 +7,9 @@
 #include <unordered_set>
 
 #include "ttnn/core.hpp"
-#include "ttnn/operations/core.hpp"
-#include "ttnn/cpp/ttnn/operations/matmul/matmul.hpp"
-#include "ttnn/cpp/ttnn/operations/matmul/device/matmul_op.hpp"
+#include "ttnn/operations/core/core.hpp"
+#include "ttnn/operations/matmul/matmul.hpp"
+#include "ttnn/operations/matmul/device/matmul_op.hpp"
 #include "ttnn/types.hpp"
 #include "ttnn/tensor/tensor_utils.hpp"
 #include "tt_metal/impl/dispatch/command_queue.hpp"

diff --git a/.../operations/conv2d/device/multi_core_optimized_conv_sharded/optimized_conv_op_sharded.cpp b/.../operations/conv2d/device/multi_core_optimized_conv_sharded/optimized_conv_op_sharded.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "ttnn/cpp/ttnn/operations/conv2d/device/optimized_conv_op.hpp"
+#include "ttnn/operations/conv2d/device/optimized_conv_op.hpp"
 #include "ttnn/operations/eltwise/unary/device/unary_op.hpp"
 #include "tt_metal/host_api.hpp"
 #include "tt_metal/detail/tt_metal.hpp"

diff --git a/ttnn/cpp/ttnn/operations/copy.hpp b/ttnn/cpp/ttnn/operations/copy.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "ttnn/decorators.hpp"
-#include "ttnn/operations/core.hpp"
+#include "ttnn/operations/core/core.hpp"
 #include "ttnn/operations/eltwise/unary/unary.hpp"
 #include "ttnn/operations/eltwise/unary/device/unary_op.hpp"