From b9aa2a40f9b0d433744975534945094b91458314 Mon Sep 17 00:00:00 2001 From: Artem Yerofieiev <169092593+ayerofieiev-tt@users.noreply.github.com> Date: Mon, 22 Jul 2024 18:29:26 -0700 Subject: [PATCH] #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 --- CODEOWNERS | 2 +- tests/tt_eager/integration_tests/test_bert.cpp | 4 ++-- tests/tt_eager/ops/test_average_pool.cpp | 2 +- tests/tt_eager/ops/test_pad_op.cpp | 2 +- ...h_l1_forward_local_chip_data_looping_multi_channel.cpp | 2 +- .../erisc/eth_non_blocking_receive_fwd_to_dram.cpp | 2 +- tests/ttnn/unit_tests/gtests/test_add.cpp | 2 +- tests/ttnn/unit_tests/gtests/test_async_runtime.cpp | 2 +- tests/ttnn/unit_tests/gtests/test_multi_cq_multi_dev.cpp | 2 +- tests/ttnn/unit_tests/gtests/test_multiprod_queue.cpp | 2 +- tests/ttnn/unit_tests/gtests/test_repeat_interleave.cpp | 2 +- tests/ttnn/unit_tests/gtests/test_to_and_from_json.cpp | 2 +- ttnn/CMakeLists.txt | 2 +- ttnn/cpp/pybind11/activation.hpp | 2 +- ttnn/cpp/pybind11/operations/core.hpp | 2 +- .../tt_dnn/op_library/backward/backward_ops.cpp | 2 +- .../tt_dnn/op_library/composite/composite_ops.hpp | 2 +- .../layernorm_distributed/layernorm_post_allgather_op.hpp | 4 ++-- .../layernorm_distributed/layernorm_pre_allgather_op.hpp | 3 ++- .../moreh_clip_grad_norm/moreh_clip_grad_norm_op.cpp | 2 +- .../moreh_clip_grad_norm/moreh_clip_grad_norm_op.hpp | 2 +- .../experimental/tt_dnn/op_library/nlp_tms/nlp_tms.hpp | 2 +- .../experimental/tt_dnn/op_library/reduce/reduce_op.cpp | 2 +- ttnn/cpp/ttnn/operations/ccl/all_gather/all_gather_op.hpp | 2 +- .../operations/ccl/all_gather/device/all_gather_op.hpp | 6 +++--- .../device/multi_core/all_gather_op_multi_core.cpp | 8 ++++---- ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp | 4 ++-- ttnn/cpp/ttnn/operations/ccl/ccl_host_datastructures.hpp | 2 +- .../ccl/line_all_gather/device/line_all_gather_op.hpp | 6 +++--- .../operations/ccl/line_all_gather/line_all_gather_op.hpp | 2 +- .../device/host/reduce_scatter_full_worker_grid.cpp | 6 +++--- .../ccl/reduce_scatter/device/reduce_scatter_op.cpp | 2 +- .../ccl/reduce_scatter/device/reduce_scatter_op.hpp | 4 ++-- .../operations/ccl/reduce_scatter/reduce_scatter_op.hpp | 2 +- ttnn/cpp/ttnn/operations/conv2d/conv2d.cpp | 4 ++-- ttnn/cpp/ttnn/operations/conv2d/conv2d.hpp | 6 +++--- .../optimized_conv_op_sharded.cpp | 2 +- ttnn/cpp/ttnn/operations/copy.hpp | 2 +- ttnn/cpp/ttnn/operations/{ => core}/core.hpp | 6 +++--- .../core}/to_dtype/to_dtype_op.hpp | 2 +- .../core}/to_layout/to_layout_op.cpp | 4 ++-- .../core}/to_layout/to_layout_op.hpp | 0 .../core}/to_memory_config/to_memory_config_op.hpp | 0 ttnn/cpp/ttnn/operations/data_movement.hpp | 4 ++-- ttnn/cpp/ttnn/operations/data_movement/concat/concat.hpp | 3 ++- .../operations/data_movement/downsample/downsample.hpp | 2 +- ttnn/cpp/ttnn/operations/data_movement/pad/pad.hpp | 2 +- .../cpp/ttnn/operations/data_movement/permute/permute.hpp | 4 ++-- ttnn/cpp/ttnn/operations/data_movement/slice/slice.hpp | 2 +- .../ttnn/operations/eltwise/binary/binary_composite.hpp | 4 ++-- .../eltwise/binary/device/binary_composite_op.cpp | 6 +++--- .../eltwise/complex_binary/device/complex_binary_op.cpp | 2 +- .../device/complex_binary_backward_op.cpp | 2 +- .../eltwise/complex_unary/device/complex_unary_op.cpp | 2 +- .../device/complex_unary_backward_op.cpp | 2 +- .../eltwise/ternary/device/ternary_composite_op.cpp | 6 +++--- .../ttnn/operations/eltwise/ternary/ternary_composite.hpp | 4 ++-- .../eltwise/unary/device/unary_composite_op.cpp | 8 ++++---- ttnn/cpp/ttnn/operations/eltwise/unary/unary.hpp | 4 ++-- .../cpp/ttnn/operations/eltwise/unary/unary_composite.hpp | 2 +- .../embedding/embedding/device/embeddings_op.cpp | 4 ++-- .../cpp/ttnn/operations/embedding/embedding/embedding.hpp | 2 +- .../ttnn/operations/embedding/embedding_ops_pybind.hpp | 2 +- .../operations/experimental/transformer/transformer.hpp | 2 +- ttnn/cpp/ttnn/operations/matmul/matmul.cpp | 2 +- ttnn/cpp/ttnn/operations/maxpool2d.hpp | 4 ++-- .../device/multi_core/groupnorm_op_multi_core.cpp | 2 +- .../normalization/layernorm/device/layernorm_op.hpp | 2 +- .../device/multi_core/layernorm_op_multi_core.cpp | 2 +- .../cpp/ttnn/operations/normalization/rmsnorm/rmsnorm.hpp | 2 +- .../softmax/device/multi_core/softmax_op_multi_core.cpp | 2 +- .../cpp/ttnn/operations/normalization/softmax/softmax.hpp | 2 +- ttnn/cpp/ttnn/operations/pool/avgpool/avg_pool.hpp | 4 ++-- ttnn/cpp/ttnn/operations/reduction/argmax/argmax.hpp | 2 +- .../operations/reduction/generic/generic_reductions.hpp | 2 +- ttnn/cpp/ttnn/operations/reduction/topk/topk.hpp | 4 ++-- ttnn/cpp/ttnn/operations/ternary.hpp | 2 +- ttnn/cpp/ttnn/operations/transformer/transformer.hpp | 4 ++-- .../operations/upsample/device/upsample_op_multi_core.cpp | 2 +- .../upsample/device/upsample_op_single_core.cpp | 2 +- ttnn/cpp/ttnn/operations/upsample/upsample_op.cpp | 2 +- 81 files changed, 117 insertions(+), 115 deletions(-) rename ttnn/cpp/ttnn/operations/{ => core}/core.hpp (98%) rename ttnn/cpp/ttnn/{op_library => operations/core}/to_dtype/to_dtype_op.hpp (99%) rename ttnn/cpp/ttnn/{op_library => operations/core}/to_layout/to_layout_op.cpp (99%) rename ttnn/cpp/ttnn/{op_library => operations/core}/to_layout/to_layout_op.hpp (100%) rename ttnn/cpp/ttnn/{op_library => operations/core}/to_memory_config/to_memory_config_op.hpp (100%) diff --git a/CODEOWNERS b/CODEOWNERS index 772987c5c87..0baa31e9ae5 100644 --- 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 index c6dc83edc36..837398ac21e 100644 --- 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 index 4fd9132faf3..ca7bab5e8fe 100644 --- 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 index 08e5fee8761..414769b29ea 100644 --- 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/tests/tt_metal/tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_l1_forward_local_chip_data_looping_multi_channel.cpp b/tests/tt_metal/tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_l1_forward_local_chip_data_looping_multi_channel.cpp index 78de41852c5..02c18ce0c13 100644 --- a/tests/tt_metal/tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_l1_forward_local_chip_data_looping_multi_channel.cpp +++ b/tests/tt_metal/tt_metal/test_kernels/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/tests/tt_metal/tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_non_blocking_receive_fwd_to_dram.cpp b/tests/tt_metal/tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_non_blocking_receive_fwd_to_dram.cpp index 64d82d85968..2c1682e69d1 100644 --- a/tests/tt_metal/tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_non_blocking_receive_fwd_to_dram.cpp +++ b/tests/tt_metal/tt_metal/test_kernels/dataflow/unit_tests/erisc/eth_non_blocking_receive_fwd_to_dram.cpp @@ -6,7 +6,7 @@ #include #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 index 7be06802349..87e16090fd9 100644 --- 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 index 972c318845c..10115dd7175 100644 --- 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 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 index d0cc6b49129..d33566d14f9 100644 --- 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 diff --git a/tests/ttnn/unit_tests/gtests/test_multiprod_queue.cpp b/tests/ttnn/unit_tests/gtests/test_multiprod_queue.cpp index 35ad16633d6..c87a5a5dd1c 100644 --- 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 #include diff --git a/tests/ttnn/unit_tests/gtests/test_repeat_interleave.cpp b/tests/ttnn/unit_tests/gtests/test_repeat_interleave.cpp index e899a97e6c8..4c05f475263 100644 --- 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 index caf2e92ac33..51dba45685d 100644 --- 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 #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 index ecd1457e68d..c377904f7a6 100644 --- 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 index 71fc175ff63..84ea7965d46 100644 --- a/ttnn/cpp/pybind11/activation.hpp +++ b/ttnn/cpp/pybind11/activation.hpp @@ -8,8 +8,8 @@ #include #include -#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 index 30ebeb570fa..e040a4fb6d8 100644 --- a/ttnn/cpp/pybind11/operations/core.hpp +++ b/ttnn/cpp/pybind11/operations/core.hpp @@ -8,7 +8,7 @@ #include #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 index b40db109fff..95073c5c8a2 100644 --- 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 index 19c352bbedb..0a04b056e70 100644 --- 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/cpp/ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_post_allgather_op.hpp b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_post_allgather_op.hpp index bf227784b97..9c2cdb18fa3 100644 --- a/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_post_allgather_op.hpp +++ b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_post_allgather_op.hpp @@ -7,10 +7,10 @@ #include #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/cpp/ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_pre_allgather_op.hpp b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_pre_allgather_op.hpp index 34c941e2735..ace3058624c 100644 --- a/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/layernorm_distributed/layernorm_pre_allgather_op.hpp +++ b/ttnn/cpp/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/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.cpp b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.cpp index 2f86450bfbc..c3a49ce6d1d 100644 --- a/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.cpp +++ b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.cpp @@ -8,7 +8,7 @@ #include #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/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.hpp b/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.hpp index 14cdc830f3a..9c17338011c 100644 --- a/ttnn/cpp/ttnn/experimental/tt_dnn/op_library/moreh_clip_grad_norm/moreh_clip_grad_norm_op.hpp +++ b/ttnn/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 index 99e1d4cbff4..eaf957abbd8 100644 --- 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 index e820fb6a771..6e296fc95ed 100644 --- 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 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 index 94c84f41a38..8e6fb04fac0 100644 --- 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 index 50e7b99ed7e..a5a4bee7159 100644 --- 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 index d377c075261..153a76fe5a2 100644 --- 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 index 82591ec2652..657fb79a496 100644 --- a/ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp +++ b/ttnn/cpp/ttnn/operations/ccl/ccl_common.hpp @@ -8,8 +8,8 @@ #include #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 index 92f3ab8b86b..003b7ba278a 100644 --- 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 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 index 3562c919ab3..984fc06de35 100644 --- 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 index 102d6a6b6c7..37fe3f9a0f3 100644 --- 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 index ba19dd9eab5..4faa41aa2f2 100644 --- 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 index 11271380809..77ef6eca612 100644 --- 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 index 2d13e116d17..b3e77e56ca7 100644 --- 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 index e6f3f9dfb83..7c850a20c51 100644 --- 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 index 50c85320156..4d25e759e89 100644 --- 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 index 79ada3837bc..3700009aae5 100644 --- a/ttnn/cpp/ttnn/operations/conv2d/conv2d.hpp +++ b/ttnn/cpp/ttnn/operations/conv2d/conv2d.hpp @@ -7,9 +7,9 @@ #include #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/ttnn/cpp/ttnn/operations/conv2d/device/multi_core_optimized_conv_sharded/optimized_conv_op_sharded.cpp b/ttnn/cpp/ttnn/operations/conv2d/device/multi_core_optimized_conv_sharded/optimized_conv_op_sharded.cpp index 9f80f715347..78a02a7ab6f 100644 --- a/ttnn/cpp/ttnn/operations/conv2d/device/multi_core_optimized_conv_sharded/optimized_conv_op_sharded.cpp +++ b/ttnn/cpp/ttnn/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 index 3896cca5842..98f8032394b 100644 --- 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" diff --git a/ttnn/cpp/ttnn/operations/core.hpp b/ttnn/cpp/ttnn/operations/core/core.hpp similarity index 98% rename from ttnn/cpp/ttnn/operations/core.hpp rename to ttnn/cpp/ttnn/operations/core/core.hpp index d87ca20df06..155b7a083aa 100644 --- a/ttnn/cpp/ttnn/operations/core.hpp +++ b/ttnn/cpp/ttnn/operations/core/core.hpp @@ -15,9 +15,9 @@ #include "tt_metal/impl/trace/trace.hpp" #include "ttnn/core.hpp" #include "ttnn/decorators.hpp" -#include "ttnn/op_library/to_layout/to_layout_op.hpp" -#include "ttnn/op_library/to_dtype/to_dtype_op.hpp" -#include "ttnn/op_library/to_memory_config/to_memory_config_op.hpp" +#include "ttnn/operations/core/to_layout/to_layout_op.hpp" +#include "ttnn/operations/core/to_dtype/to_dtype_op.hpp" +#include "ttnn/operations/core/to_memory_config/to_memory_config_op.hpp" #include "ttnn/types.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/op_library/to_dtype/to_dtype_op.hpp b/ttnn/cpp/ttnn/operations/core/to_dtype/to_dtype_op.hpp similarity index 99% rename from ttnn/cpp/ttnn/op_library/to_dtype/to_dtype_op.hpp rename to ttnn/cpp/ttnn/operations/core/to_dtype/to_dtype_op.hpp index 6d1ff8f26bf..6768752eb9b 100644 --- a/ttnn/cpp/ttnn/op_library/to_dtype/to_dtype_op.hpp +++ b/ttnn/cpp/ttnn/operations/core/to_dtype/to_dtype_op.hpp @@ -8,7 +8,7 @@ #include #include "ttnn/tensor/tensor.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/types.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/op_library/to_layout/to_layout_op.cpp b/ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.cpp similarity index 99% rename from ttnn/cpp/ttnn/op_library/to_layout/to_layout_op.cpp rename to ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.cpp index 7972aad87e6..898c7971757 100644 --- a/ttnn/cpp/ttnn/op_library/to_layout/to_layout_op.cpp +++ b/ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.cpp @@ -2,14 +2,14 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "ttnn/op_library/to_layout/to_layout_op.hpp" +#include "to_layout_op.hpp" #include "ttnn/operations/data_movement/tilize/tilize.hpp" #include "ttnn/operations/data_movement/tilize_with_val_padding/tilize_with_val_padding.hpp" #include "ttnn/experimental/tt_dnn/op_library/untilize/untilize_op.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/op_library/to_layout/to_layout_op.hpp b/ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.hpp similarity index 100% rename from ttnn/cpp/ttnn/op_library/to_layout/to_layout_op.hpp rename to ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.hpp diff --git a/ttnn/cpp/ttnn/op_library/to_memory_config/to_memory_config_op.hpp b/ttnn/cpp/ttnn/operations/core/to_memory_config/to_memory_config_op.hpp similarity index 100% rename from ttnn/cpp/ttnn/op_library/to_memory_config/to_memory_config_op.hpp rename to ttnn/cpp/ttnn/operations/core/to_memory_config/to_memory_config_op.hpp diff --git a/ttnn/cpp/ttnn/operations/data_movement.hpp b/ttnn/cpp/ttnn/operations/data_movement.hpp index bf298e1cc2f..5aeb98f038a 100644 --- a/ttnn/cpp/ttnn/operations/data_movement.hpp +++ b/ttnn/cpp/ttnn/operations/data_movement.hpp @@ -8,8 +8,8 @@ #include "ttnn/experimental/tt_dnn/op_library/concat/concat_op.hpp" #include "ttnn/experimental/tt_dnn/op_library/repeat/repeat_op.hpp" #include "ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp" -#include "ttnn/cpp/ttnn/operations/upsample/upsample_op.hpp" -#include "ttnn/cpp/ttnn/operations/core.hpp" +#include "ttnn/operations/upsample/upsample_op.hpp" +#include "ttnn/operations/core/core.hpp" #include diff --git a/ttnn/cpp/ttnn/operations/data_movement/concat/concat.hpp b/ttnn/cpp/ttnn/operations/data_movement/concat/concat.hpp index a8d528cdec6..67e3c763530 100644 --- a/ttnn/cpp/ttnn/operations/data_movement/concat/concat.hpp +++ b/ttnn/cpp/ttnn/operations/data_movement/concat/concat.hpp @@ -5,7 +5,8 @@ #pragma once #include "ttnn/tensor/types.hpp" -#include "ttnn/cpp/ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" + #include "ttnn/experimental/tt_dnn/op_library/concat/concat_op.hpp" #include diff --git a/ttnn/cpp/ttnn/operations/data_movement/downsample/downsample.hpp b/ttnn/cpp/ttnn/operations/data_movement/downsample/downsample.hpp index 927ffdec319..003b53b34f8 100644 --- a/ttnn/cpp/ttnn/operations/data_movement/downsample/downsample.hpp +++ b/ttnn/cpp/ttnn/operations/data_movement/downsample/downsample.hpp @@ -5,7 +5,7 @@ #pragma once #include "ttnn/tensor/types.hpp" -#include "ttnn/cpp/ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/run_operation.hpp" diff --git a/ttnn/cpp/ttnn/operations/data_movement/pad/pad.hpp b/ttnn/cpp/ttnn/operations/data_movement/pad/pad.hpp index 508e60028ac..af773664fa5 100644 --- a/ttnn/cpp/ttnn/operations/data_movement/pad/pad.hpp +++ b/ttnn/cpp/ttnn/operations/data_movement/pad/pad.hpp @@ -5,7 +5,7 @@ #pragma once #include "ttnn/tensor/types.hpp" -#include "ttnn/cpp/ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/run_operation.hpp" diff --git a/ttnn/cpp/ttnn/operations/data_movement/permute/permute.hpp b/ttnn/cpp/ttnn/operations/data_movement/permute/permute.hpp index 30738d2d4c3..fa7f4792929 100644 --- a/ttnn/cpp/ttnn/operations/data_movement/permute/permute.hpp +++ b/ttnn/cpp/ttnn/operations/data_movement/permute/permute.hpp @@ -5,11 +5,11 @@ #pragma once #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/run_operation.hpp" #include "ttnn/experimental/tt_dnn/op_library/transpose/transpose_op.hpp" -#include "ttnn/cpp/ttnn/types.hpp" +#include "ttnn/types.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/operations/data_movement/slice/slice.hpp b/ttnn/cpp/ttnn/operations/data_movement/slice/slice.hpp index 34b6293497d..2347a9c7bb4 100644 --- a/ttnn/cpp/ttnn/operations/data_movement/slice/slice.hpp +++ b/ttnn/cpp/ttnn/operations/data_movement/slice/slice.hpp @@ -6,7 +6,7 @@ #include "device/slice_op.hpp" #include "ttnn/run_operation.hpp" -#include "ttnn/cpp/ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/decorators.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/operations/eltwise/binary/binary_composite.hpp b/ttnn/cpp/ttnn/operations/eltwise/binary/binary_composite.hpp index d55ab1f8dfe..3bcaffabbba 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/binary/binary_composite.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/binary/binary_composite.hpp @@ -5,8 +5,8 @@ #pragma once #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.hpp" +#include "ttnn/operations/core/core.hpp" +#include "ttnn/operations/eltwise/binary/device/binary_composite_op.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.cpp b/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.cpp index 1050b62f776..12dfb10d39d 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.cpp @@ -4,9 +4,9 @@ #include "binary_composite_op.hpp" #include "third_party/magic_enum/magic_enum.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/binary/binary.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/unary/unary.hpp" -#include "ttnn/cpp/ttnn/types.hpp" +#include "ttnn/operations/eltwise/binary/binary.hpp" +#include "ttnn/operations/eltwise/unary/unary.hpp" +#include "ttnn/types.hpp" #include "tt_metal/common/bfloat16.hpp" #include "ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/complex_binary/device/complex_binary_op.cpp b/ttnn/cpp/ttnn/operations/eltwise/complex_binary/device/complex_binary_op.cpp index 84f7c2ba1f3..24ab2a88f8f 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/complex_binary/device/complex_binary_op.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/complex_binary/device/complex_binary_op.cpp @@ -5,7 +5,7 @@ #include "tt_metal/common/constants.hpp" #include "tt_metal/host_api.hpp" #include "tt_metal/tools/profiler/op_profiler.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/binary/binary.hpp" +#include "ttnn/operations/eltwise/binary/binary.hpp" #include "ttnn/experimental/tt_dnn/op_library/complex/complex_ops.hpp" #include "ttnn/operations/eltwise/complex_unary/device/complex_unary_op.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/complex_binary_backward/device/complex_binary_backward_op.cpp b/ttnn/cpp/ttnn/operations/eltwise/complex_binary_backward/device/complex_binary_backward_op.cpp index 372e38c5519..978394c4ec3 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/complex_binary_backward/device/complex_binary_backward_op.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/complex_binary_backward/device/complex_binary_backward_op.cpp @@ -7,7 +7,7 @@ #include "tt_metal/tools/profiler/op_profiler.hpp" #include "ttnn/operations/eltwise/complex_binary_backward/device/complex_binary_backward_op.hpp" #include "ttnn/operations/eltwise/complex_unary/device/complex_unary_op.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/binary/binary.hpp" +#include "ttnn/operations/eltwise/binary/binary.hpp" #include "ttnn/operations/eltwise/complex_binary/device/complex_binary_op.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/complex_unary/device/complex_unary_op.cpp b/ttnn/cpp/ttnn/operations/eltwise/complex_unary/device/complex_unary_op.cpp index 32234ae69e5..d1b4854d86f 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/complex_unary/device/complex_unary_op.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/complex_unary/device/complex_unary_op.cpp @@ -8,7 +8,7 @@ #include "tt_metal/common/constants.hpp" #include "tt_metal/host_api.hpp" #include "tt_metal/tools/profiler/op_profiler.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/binary/binary.hpp" +#include "ttnn/operations/eltwise/binary/binary.hpp" #include "ttnn/experimental/tt_dnn/op_library/complex/complex_ops.hpp" #include "ttnn/operations/eltwise/complex_binary_backward/device/complex_binary_backward_op.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.cpp b/ttnn/cpp/ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.cpp index c4e0ea7e56e..8ee91686a4e 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.cpp @@ -11,7 +11,7 @@ #include "tt_metal/tools/profiler/op_profiler.hpp" #include "ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.hpp" #include "ttnn/operations/eltwise/complex_binary_backward/device/complex_binary_backward_op.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/binary/binary.hpp" +#include "ttnn/operations/eltwise/binary/binary.hpp" #include "ttnn/operations/eltwise/complex_unary/device/complex_unary_op.hpp" #include "ttnn/operations/eltwise/complex_binary/device/complex_binary_op.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/ternary/device/ternary_composite_op.cpp b/ttnn/cpp/ttnn/operations/eltwise/ternary/device/ternary_composite_op.cpp index efcf919c348..1e814411ee4 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/ternary/device/ternary_composite_op.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/ternary/device/ternary_composite_op.cpp @@ -5,12 +5,12 @@ #include "third_party/magic_enum/magic_enum.hpp" #include "ttnn/experimental/tt_numpy/functions.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/unary/unary.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/binary/binary.hpp" +#include "ttnn/operations/eltwise/unary/unary.hpp" +#include "ttnn/operations/eltwise/binary/binary.hpp" #include "ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp" #include "ternary_composite_op.hpp" #include "ttnn/run_operation.hpp" -#include "ttnn/cpp/ttnn/types.hpp" +#include "ttnn/types.hpp" #include "tt_metal/common/bfloat16.hpp" namespace ttnn::operations::ternary{ diff --git a/ttnn/cpp/ttnn/operations/eltwise/ternary/ternary_composite.hpp b/ttnn/cpp/ttnn/operations/eltwise/ternary/ternary_composite.hpp index fd2dd495dbb..defca951ac1 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/ternary/ternary_composite.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/ternary/ternary_composite.hpp @@ -5,8 +5,8 @@ #pragma once #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/ternary/device/ternary_composite_op.hpp" +#include "ttnn/operations/core/core.hpp" +#include "ttnn/operations/eltwise/ternary/device/ternary_composite_op.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_composite_op.cpp b/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_composite_op.cpp index 29a775bbe5e..9d34c1827c3 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_composite_op.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_composite_op.cpp @@ -7,13 +7,13 @@ #include #include "third_party/magic_enum/magic_enum.hpp" -#include "ttnn/cpp/ttnn/experimental/tt_numpy/functions.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/unary/unary.hpp" -#include "ttnn/cpp/ttnn/operations/eltwise/binary/binary.hpp" +#include "ttnn/experimental/tt_numpy/functions.hpp" +#include "ttnn/operations/eltwise/unary/unary.hpp" +#include "ttnn/operations/eltwise/binary/binary.hpp" #include "ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp" #include "unary_composite_op.hpp" #include "ttnn/run_operation.hpp" -#include "ttnn/cpp/ttnn/types.hpp" +#include "ttnn/types.hpp" #include "tt_metal/common/bfloat16.hpp" #include "ttnn/experimental/tt_dnn/op_library/reduce/reduce_op.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary/unary.hpp b/ttnn/cpp/ttnn/operations/eltwise/unary/unary.hpp index 2281fdbd657..40defbc022e 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/unary/unary.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/unary/unary.hpp @@ -6,9 +6,9 @@ #include "device/unary_op.hpp" #include "ttnn/run_operation.hpp" -#include "ttnn/cpp/ttnn/operations/data_movement/downsample/device/downsample_op.hpp" +#include "ttnn/operations/data_movement/downsample/device/downsample_op.hpp" #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary/unary_composite.hpp b/ttnn/cpp/ttnn/operations/eltwise/unary/unary_composite.hpp index 4ab63b52e81..b3be58f25ac 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/unary/unary_composite.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/unary/unary_composite.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/device/unary_composite_op.hpp" namespace ttnn { namespace operations { diff --git a/ttnn/cpp/ttnn/operations/embedding/embedding/device/embeddings_op.cpp b/ttnn/cpp/ttnn/operations/embedding/embedding/device/embeddings_op.cpp index 9047264d0b5..b02868f0ff2 100644 --- a/ttnn/cpp/ttnn/operations/embedding/embedding/device/embeddings_op.cpp +++ b/ttnn/cpp/ttnn/operations/embedding/embedding/device/embeddings_op.cpp @@ -2,13 +2,13 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "ttnn/cpp/ttnn/operations/embedding/embedding/device/embeddings_op.hpp" +#include "ttnn/operations/embedding/embedding/device/embeddings_op.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" #include "tt_metal/detail/util.hpp" #include "tt_metal/host_api.hpp" -#include "ttnn/cpp/ttnn/operations/embedding/embedding/device/embeddings_program_factory.hpp" +#include "ttnn/operations/embedding/embedding/device/embeddings_program_factory.hpp" using namespace tt::constants; using namespace std; diff --git a/ttnn/cpp/ttnn/operations/embedding/embedding/embedding.hpp b/ttnn/cpp/ttnn/operations/embedding/embedding/embedding.hpp index 865a0ef91ce..ac39408aa3a 100644 --- a/ttnn/cpp/ttnn/operations/embedding/embedding/embedding.hpp +++ b/ttnn/cpp/ttnn/operations/embedding/embedding/embedding.hpp @@ -7,7 +7,7 @@ #include "ttnn/operations/embedding/embedding/device/embeddings_op.hpp" #include "ttnn/run_operation.hpp" #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/operations/embedding/embedding_ops_pybind.hpp b/ttnn/cpp/ttnn/operations/embedding/embedding_ops_pybind.hpp index 53a96b5a32c..3f784d4dc97 100644 --- a/ttnn/cpp/ttnn/operations/embedding/embedding_ops_pybind.hpp +++ b/ttnn/cpp/ttnn/operations/embedding/embedding_ops_pybind.hpp @@ -7,7 +7,7 @@ #include #include -#include "ttnn/cpp/ttnn/operations/embedding/embedding/embedding_pybind.hpp" +#include "ttnn/operations/embedding/embedding/embedding_pybind.hpp" namespace py = pybind11; diff --git a/ttnn/cpp/ttnn/operations/experimental/transformer/transformer.hpp b/ttnn/cpp/ttnn/operations/experimental/transformer/transformer.hpp index ccda278c3e2..069115fe6bc 100644 --- a/ttnn/cpp/ttnn/operations/experimental/transformer/transformer.hpp +++ b/ttnn/cpp/ttnn/operations/experimental/transformer/transformer.hpp @@ -6,7 +6,7 @@ #include "device/transformer_device_operation.hpp" #include "ttnn/run_operation.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" namespace ttnn { namespace operations::experimental::transformer { diff --git a/ttnn/cpp/ttnn/operations/matmul/matmul.cpp b/ttnn/cpp/ttnn/operations/matmul/matmul.cpp index ac92369cf2f..21a11b0ff43 100644 --- a/ttnn/cpp/ttnn/operations/matmul/matmul.cpp +++ b/ttnn/cpp/ttnn/operations/matmul/matmul.cpp @@ -5,7 +5,7 @@ #include "matmul.hpp" #include "ttnn/experimental/tt_dnn/op_library/transpose/transpose_op.hpp" -#include "ttnn/cpp/ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/operations/eltwise/binary/binary.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/operations/maxpool2d.hpp b/ttnn/cpp/ttnn/operations/maxpool2d.hpp index db7472942e2..984af14313a 100644 --- a/ttnn/cpp/ttnn/operations/maxpool2d.hpp +++ b/ttnn/cpp/ttnn/operations/maxpool2d.hpp @@ -6,10 +6,10 @@ #include "ttnn/types.hpp" #include "ttnn/core.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "tt_metal/common/math.hpp" #include "ttnn/operations/conv2d/conv2d.hpp" -#include "ttnn/cpp/ttnn/operations/pool/max_pool.hpp" +#include "ttnn/operations/pool/max_pool.hpp" #include "ttnn/experimental/tt_dnn/op_library/sliding_window_op_infra/halo_op.hpp" #include "ttnn/experimental/tt_dnn/op_library/sliding_window_op_infra/sliding_window.hpp" diff --git a/ttnn/cpp/ttnn/operations/normalization/groupnorm/device/multi_core/groupnorm_op_multi_core.cpp b/ttnn/cpp/ttnn/operations/normalization/groupnorm/device/multi_core/groupnorm_op_multi_core.cpp index d753b5848eb..9faca3382f6 100644 --- a/ttnn/cpp/ttnn/operations/normalization/groupnorm/device/multi_core/groupnorm_op_multi_core.cpp +++ b/ttnn/cpp/ttnn/operations/normalization/groupnorm/device/multi_core/groupnorm_op_multi_core.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "impl/buffers/circular_buffer_types.hpp" -#include "ttnn/cpp/ttnn/operations/normalization/groupnorm/device/groupnorm_op.hpp" +#include "ttnn/operations/normalization/groupnorm/device/groupnorm_op.hpp" #include "ttnn/experimental/tt_dnn/op_library/work_split.hpp" #include "ttnn/experimental/tt_dnn/op_library/math.hpp" diff --git a/ttnn/cpp/ttnn/operations/normalization/layernorm/device/layernorm_op.hpp b/ttnn/cpp/ttnn/operations/normalization/layernorm/device/layernorm_op.hpp index 790e6d47a52..48c32b266bc 100644 --- a/ttnn/cpp/ttnn/operations/normalization/layernorm/device/layernorm_op.hpp +++ b/ttnn/cpp/ttnn/operations/normalization/layernorm/device/layernorm_op.hpp @@ -9,7 +9,7 @@ #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/ttnn/cpp/ttnn/operations/normalization/layernorm/device/multi_core/layernorm_op_multi_core.cpp b/ttnn/cpp/ttnn/operations/normalization/layernorm/device/multi_core/layernorm_op_multi_core.cpp index 9d06fbe7266..271701a06c8 100644 --- a/ttnn/cpp/ttnn/operations/normalization/layernorm/device/multi_core/layernorm_op_multi_core.cpp +++ b/ttnn/cpp/ttnn/operations/normalization/layernorm/device/multi_core/layernorm_op_multi_core.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "impl/buffers/circular_buffer_types.hpp" -#include "ttnn/cpp/ttnn/operations/normalization/layernorm/device/layernorm_op.hpp" +#include "ttnn/operations/normalization/layernorm/device/layernorm_op.hpp" #include "ttnn/experimental/tt_dnn/op_library/work_split.hpp" #include "ttnn/experimental/tt_dnn/op_library/math.hpp" diff --git a/ttnn/cpp/ttnn/operations/normalization/rmsnorm/rmsnorm.hpp b/ttnn/cpp/ttnn/operations/normalization/rmsnorm/rmsnorm.hpp index 3e65201c9ed..b7585ee32d7 100644 --- a/ttnn/cpp/ttnn/operations/normalization/rmsnorm/rmsnorm.hpp +++ b/ttnn/cpp/ttnn/operations/normalization/rmsnorm/rmsnorm.hpp @@ -4,7 +4,7 @@ #pragma once -#include "ttnn/cpp/ttnn/operations/normalization/layernorm/device/layernorm_op.hpp" +#include "ttnn/operations/normalization/layernorm/device/layernorm_op.hpp" namespace ttnn { namespace operations::normalization { diff --git a/ttnn/cpp/ttnn/operations/normalization/softmax/device/multi_core/softmax_op_multi_core.cpp b/ttnn/cpp/ttnn/operations/normalization/softmax/device/multi_core/softmax_op_multi_core.cpp index 992343b8768..e4e833a3bfe 100644 --- a/ttnn/cpp/ttnn/operations/normalization/softmax/device/multi_core/softmax_op_multi_core.cpp +++ b/ttnn/cpp/ttnn/operations/normalization/softmax/device/multi_core/softmax_op_multi_core.cpp @@ -5,7 +5,7 @@ #include "tt_metal/common/logger.hpp" #include "impl/buffers/buffer.hpp" #include "ttnn/operation.hpp" -#include "ttnn/cpp/ttnn/operations/normalization/softmax/device/softmax_op.hpp" +#include "ttnn/operations/normalization/softmax/device/softmax_op.hpp" #include "ttnn/experimental/tt_dnn/op_library/math.hpp" #include "ttnn/experimental/tt_dnn/op_library/work_split.hpp" #include "ttnn/run_operation.hpp" diff --git a/ttnn/cpp/ttnn/operations/normalization/softmax/softmax.hpp b/ttnn/cpp/ttnn/operations/normalization/softmax/softmax.hpp index af40da2ccec..77d153167c5 100644 --- a/ttnn/cpp/ttnn/operations/normalization/softmax/softmax.hpp +++ b/ttnn/cpp/ttnn/operations/normalization/softmax/softmax.hpp @@ -6,7 +6,7 @@ #include "ttnn/experimental/tt_dnn/op_library/moreh_softmax/moreh_softmax_op.hpp" #include "device/softmax_op.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" namespace ttnn { namespace operations::normalization { diff --git a/ttnn/cpp/ttnn/operations/pool/avgpool/avg_pool.hpp b/ttnn/cpp/ttnn/operations/pool/avgpool/avg_pool.hpp index bf094440820..edd313049aa 100644 --- a/ttnn/cpp/ttnn/operations/pool/avgpool/avg_pool.hpp +++ b/ttnn/cpp/ttnn/operations/pool/avgpool/avg_pool.hpp @@ -22,9 +22,9 @@ Tensor avg_pool2d(const Tensor& input, const MemoryConfig& memory_config = opera } // namespace tt -#include "ttnn/cpp/ttnn/operations/pool/avgpool/avg_pool.hpp" +#include "ttnn/operations/pool/avgpool/avg_pool.hpp" #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" namespace ttnn { namespace operations { diff --git a/ttnn/cpp/ttnn/operations/reduction/argmax/argmax.hpp b/ttnn/cpp/ttnn/operations/reduction/argmax/argmax.hpp index cc2f686308e..44d66e03379 100644 --- a/ttnn/cpp/ttnn/operations/reduction/argmax/argmax.hpp +++ b/ttnn/cpp/ttnn/operations/reduction/argmax/argmax.hpp @@ -7,7 +7,7 @@ #include "device/argmax_op.hpp" #include "ttnn/run_operation.hpp" #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" namespace ttnn { namespace operations::reduction { diff --git a/ttnn/cpp/ttnn/operations/reduction/generic/generic_reductions.hpp b/ttnn/cpp/ttnn/operations/reduction/generic/generic_reductions.hpp index e57a20db27e..3a1cb217bb3 100644 --- a/ttnn/cpp/ttnn/operations/reduction/generic/generic_reductions.hpp +++ b/ttnn/cpp/ttnn/operations/reduction/generic/generic_reductions.hpp @@ -10,7 +10,7 @@ #include "ttnn/run_operation.hpp" #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/operations/eltwise/binary/binary.hpp" #include "ttnn/operations/eltwise/unary/unary.hpp" diff --git a/ttnn/cpp/ttnn/operations/reduction/topk/topk.hpp b/ttnn/cpp/ttnn/operations/reduction/topk/topk.hpp index 7ab8a4b6976..e61dcae4575 100644 --- a/ttnn/cpp/ttnn/operations/reduction/topk/topk.hpp +++ b/ttnn/cpp/ttnn/operations/reduction/topk/topk.hpp @@ -5,12 +5,12 @@ #pragma once #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/run_operation.hpp" #include "device/topk_op.hpp" -#include "ttnn/cpp/ttnn/types.hpp" +#include "ttnn/types.hpp" template >>> diff --git a/ttnn/cpp/ttnn/operations/ternary.hpp b/ttnn/cpp/ttnn/operations/ternary.hpp index 3897eeea211..073982647bf 100644 --- a/ttnn/cpp/ttnn/operations/ternary.hpp +++ b/ttnn/cpp/ttnn/operations/ternary.hpp @@ -6,7 +6,7 @@ #include "ttnn/experimental/tt_dnn/op_library/composite/composite_ops.hpp" #include "ttnn/decorators.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/core/core.hpp" namespace ttnn { diff --git a/ttnn/cpp/ttnn/operations/transformer/transformer.hpp b/ttnn/cpp/ttnn/operations/transformer/transformer.hpp index 8d4b495c43b..d8192c2a3b5 100644 --- a/ttnn/cpp/ttnn/operations/transformer/transformer.hpp +++ b/ttnn/cpp/ttnn/operations/transformer/transformer.hpp @@ -9,8 +9,8 @@ #include "ttnn/experimental/tt_dnn/op_library/nlp_tms/nlp_tms.hpp" #include "ttnn/experimental/tt_dnn/op_library/rotary_embedding/rotary_embedding_op.hpp" #include "ttnn/run_operation.hpp" -#include "ttnn/cpp/ttnn/operations/normalization/softmax/device/softmax_op.hpp" -#include "ttnn/operations/core.hpp" +#include "ttnn/operations/normalization/softmax/device/softmax_op.hpp" +#include "ttnn/operations/core/core.hpp" #include "ttnn/operations/eltwise/binary/binary.hpp" diff --git a/ttnn/cpp/ttnn/operations/upsample/device/upsample_op_multi_core.cpp b/ttnn/cpp/ttnn/operations/upsample/device/upsample_op_multi_core.cpp index fc49f72159b..7596ee75f73 100644 --- a/ttnn/cpp/ttnn/operations/upsample/device/upsample_op_multi_core.cpp +++ b/ttnn/cpp/ttnn/operations/upsample/device/upsample_op_multi_core.cpp @@ -4,7 +4,7 @@ #include -#include "ttnn/cpp/ttnn/operations/upsample/upsample_op.hpp" +#include "ttnn/operations/upsample/upsample_op.hpp" #include "ttnn/experimental/tt_dnn/op_library/math.hpp" #include "tt_metal/host_api.hpp" diff --git a/ttnn/cpp/ttnn/operations/upsample/device/upsample_op_single_core.cpp b/ttnn/cpp/ttnn/operations/upsample/device/upsample_op_single_core.cpp index d6d28c3231b..05d01d29ca7 100644 --- a/ttnn/cpp/ttnn/operations/upsample/device/upsample_op_single_core.cpp +++ b/ttnn/cpp/ttnn/operations/upsample/device/upsample_op_single_core.cpp @@ -4,7 +4,7 @@ #include -#include "ttnn/cpp/ttnn/operations/upsample/upsample_op.hpp" +#include "ttnn/operations/upsample/upsample_op.hpp" #include "ttnn/experimental/tt_dnn/op_library/math.hpp" #include "tt_metal/host_api.hpp" diff --git a/ttnn/cpp/ttnn/operations/upsample/upsample_op.cpp b/ttnn/cpp/ttnn/operations/upsample/upsample_op.cpp index 07c07ebd73d..04dc944598b 100644 --- a/ttnn/cpp/ttnn/operations/upsample/upsample_op.cpp +++ b/ttnn/cpp/ttnn/operations/upsample/upsample_op.cpp @@ -10,7 +10,7 @@ #include "detail/util.hpp" #include "ttnn/tensor/host_buffer/functions.hpp" #include "ttnn/tensor/tensor_utils.hpp" -#include "ttnn/cpp/ttnn/operations/pool/maxpool/max_pool.hpp" +#include "ttnn/operations/pool/maxpool/max_pool.hpp" #include "ttnn/experimental/tt_dnn/op_library/reduce/reduce_op.hpp" // for reduce_op_utils #include "ttnn/experimental/tt_dnn/op_library/work_split.hpp" #include "tt_metal/host_api.hpp"