From eb30cd3050b0837b72b4b383f720264ae999e07d Mon Sep 17 00:00:00 2001 From: Sankar Manoj Date: Tue, 10 Dec 2024 11:28:20 +0000 Subject: [PATCH] #0 : Removed CMAKE_UNIQUE_NAMESPACE --- ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op.hpp | 2 -- .../conv2d/device/conv2d_op_block_sharded_program_factory.cpp | 1 - .../conv2d/device/conv2d_op_height_sharded_program_factory.cpp | 1 - .../operations/conv/conv2d/device/conv2d_op_program_factory.cpp | 2 -- 4 files changed, 6 deletions(-) diff --git a/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op.hpp b/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op.hpp index 05ff0a0ea33..929c9a4efda 100644 --- a/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op.hpp +++ b/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op.hpp @@ -15,7 +15,6 @@ namespace operations::conv { namespace conv2d { -namespace CMAKE_UNIQUE_NAMESPACE { const uint32_t act_cb = tt::CBIndex::c_0; const uint32_t weight_cb = tt::CBIndex::c_1; const uint32_t bias_cb = tt::CBIndex::c_2; @@ -30,7 +29,6 @@ const uint32_t untilize_mode_reblock_cb = tt::CBIndex::c_26; const uint32_t out0_cb = tt::CBIndex::c_16; const uint32_t temp_sum_cb = tt::CBIndex::c_27; const uint32_t untilized_padded_out_cb = tt::CBIndex::c_28; -} // namespace CMAKE_UNIQUE_NAMESPACE // TODO: Accept parallelization diff --git a/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_block_sharded_program_factory.cpp b/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_block_sharded_program_factory.cpp index b33d9e821e5..8c704831d03 100644 --- a/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_block_sharded_program_factory.cpp +++ b/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_block_sharded_program_factory.cpp @@ -42,7 +42,6 @@ operation::ProgramWithCallbacks multi_core_block_sharded_conv2d( bool enable_split_reader, bool enable_subblock_padding, bool use_non_tile_height) { - using namespace CMAKE_UNIQUE_NAMESPACE; bool pass = true; tt_metal::Device* device = a.device(); TT_FATAL(a.get_layout() == Layout::ROW_MAJOR, "Conv activation should be in row major layout"); diff --git a/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_height_sharded_program_factory.cpp b/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_height_sharded_program_factory.cpp index 68ff58aa0f4..5645f87ee27 100644 --- a/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_height_sharded_program_factory.cpp +++ b/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_height_sharded_program_factory.cpp @@ -42,7 +42,6 @@ operation::ProgramWithCallbacks multi_core_height_sharded_conv2d( bool enable_split_reader, bool enable_subblock_padding, bool use_non_tile_height) { - using namespace CMAKE_UNIQUE_NAMESPACE; bool pass = true; tt_metal::Device* device = a.device(); TT_FATAL(a.get_layout() == Layout::ROW_MAJOR, "Conv activation should be in row major layout"); diff --git a/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_program_factory.cpp b/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_program_factory.cpp index f69f3bd3a9d..b6f2cf2611e 100644 --- a/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_program_factory.cpp +++ b/ttnn/cpp/ttnn/operations/conv/conv2d/device/conv2d_op_program_factory.cpp @@ -240,7 +240,6 @@ std::tuple create_CBs_for_sharded_input_v2( bool fp32_dest_acc_en, bool packer_l1_acc_en, bool use_non_tile_height) { - using namespace CMAKE_UNIQUE_NAMESPACE; using namespace tt; tt::DataFormat interm0_df = packer_l1_acc_en ? (fp32_dest_acc_en ? tt::DataFormat::Float32 : tt::DataFormat::Float16_b) : out_df; @@ -476,7 +475,6 @@ std::tuple create_CBs_for_depthwise_sharded_input( bool split_reader, bool fp32_dest_acc_en, bool packer_l1_acc_en) { - using namespace CMAKE_UNIQUE_NAMESPACE; using namespace tt; tt::DataFormat interm0_df = packer_l1_acc_en ? (fp32_dest_acc_en ? tt::DataFormat::Float32 : tt::DataFormat::Float16_b) : out_df;