From 923b2bb8eaea66d2a9e5f1b964b30a4995730a62 Mon Sep 17 00:00:00 2001 From: Andrew Fuller Date: Mon, 16 Dec 2024 14:06:36 -0500 Subject: [PATCH] Bump MagicEnum to v0.9.7 (#16065) ### Ticket Closes #16036 ### Problem description Consumers cannot opt to use an external MagicEnum as the #include statements are incompatible. ### What's changed Bump to MagicEnum v0.9.7 which unifies the way to consume it across source and post-install. --- dependencies/CMakeLists.txt | 2 +- tests/tt_eager/ops/test_bcast_op.cpp | 2 +- tests/tt_eager/ops/test_sfpu.cpp | 2 +- tt_metal/common/tt_backend_api_types.cpp | 2 +- tt_metal/impl/allocator/allocator.cpp | 2 +- tt_metal/impl/dispatch/command_queue_interface.hpp | 2 +- tt_metal/impl/dispatch/data_collection.cpp | 2 +- tt_metal/programming_examples/eltwise_binary/eltwise_binary.cpp | 2 +- tt_metal/programming_examples/matmul_common/bmm_op.hpp | 2 +- tt_metal/tools/profiler/op_profiler.hpp | 2 +- tt_metal/tt_stl/reflection.hpp | 2 +- ttnn/cpp/pybind11/export_enum.hpp | 2 +- ttnn/cpp/ttnn/core.hpp | 2 +- ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.hpp | 2 +- .../data_movement/sharded/reshard/device/reshard_op.cpp | 2 +- .../operations/eltwise/binary/device/binary_composite_op.cpp | 2 +- .../operations/eltwise/binary/device/binary_composite_op.hpp | 2 +- .../eltwise/binary/device/binary_device_operation.hpp | 2 +- .../ttnn/operations/eltwise/binary_backward/binary_backward.cpp | 2 +- .../eltwise/complex_binary/device/complex_binary_op.hpp | 2 +- .../eltwise/complex_unary/device/complex_unary_op.hpp | 2 +- .../complex_unary_backward/device/complex_unary_backward_op.hpp | 2 +- .../ttnn/operations/eltwise/ternary/ternary_composite_op.hpp | 2 +- .../operations/eltwise/ternary_backward/ternary_backward.cpp | 2 +- .../ttnn/operations/eltwise/unary/device/unary_composite_op.cpp | 2 +- .../ttnn/operations/eltwise/unary/device/unary_composite_op.hpp | 2 +- .../operations/eltwise/unary/device/unary_device_operation.cpp | 2 +- .../ttnn/operations/eltwise/unary_backward/unary_backward.cpp | 2 +- ttnn/cpp/ttnn/operations/moreh/moreh_helper_functions.cpp | 2 +- .../device/layernorm_post_all_gather_op.cpp | 2 +- .../device/layernorm_pre_all_gather_op.cpp | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt index c63dcf9a7a8..eb0bf54d180 100644 --- a/dependencies/CMakeLists.txt +++ b/dependencies/CMakeLists.txt @@ -72,7 +72,7 @@ endif() # magic_enum : https://github.com/Neargye/magic_enum ############################################################################################################################ -CPMAddPackage(NAME magic_enum GITHUB_REPOSITORY Neargye/magic_enum GIT_TAG v0.9.6) +CPMAddPackage(NAME magic_enum GITHUB_REPOSITORY Neargye/magic_enum GIT_TAG v0.9.7) ############################################################################################################################ # fmt : https://github.com/fmtlib/fmt diff --git a/tests/tt_eager/ops/test_bcast_op.cpp b/tests/tt_eager/ops/test_bcast_op.cpp index 38675a93723..f563c01cfb2 100644 --- a/tests/tt_eager/ops/test_bcast_op.cpp +++ b/tests/tt_eager/ops/test_bcast_op.cpp @@ -7,7 +7,7 @@ #include "ttnn/tensor/tensor.hpp" #include "ttnn/operations/data_movement/bcast/bcast.hpp" #include "common/constants.hpp" -#include +#include #include using namespace tt; diff --git a/tests/tt_eager/ops/test_sfpu.cpp b/tests/tt_eager/ops/test_sfpu.cpp index 1e9df15d4be..8274a3ab7a6 100644 --- a/tests/tt_eager/ops/test_sfpu.cpp +++ b/tests/tt_eager/ops/test_sfpu.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include "tt_metal/host_api.hpp" #include "tt_metal/detail/tt_metal.hpp" diff --git a/tt_metal/common/tt_backend_api_types.cpp b/tt_metal/common/tt_backend_api_types.cpp index 58a082b5f72..31d0c1db8ac 100644 --- a/tt_metal/common/tt_backend_api_types.cpp +++ b/tt_metal/common/tt_backend_api_types.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "tt_backend_api_types.hpp" -#include +#include std::string tt::get_string(tt::ARCH arch) { switch (arch) { diff --git a/tt_metal/impl/allocator/allocator.cpp b/tt_metal/impl/allocator/allocator.cpp index ad25e1f3a6f..af3b4bb49fa 100644 --- a/tt_metal/impl/allocator/allocator.cpp +++ b/tt_metal/impl/allocator/allocator.cpp @@ -4,7 +4,7 @@ #include "tt_metal/impl/allocator/allocator.hpp" -#include +#include #include "tt_metal/common/math.hpp" #include "tt_metal/detail/util.hpp" #include "tt_metal/impl/allocator/algorithms/free_list.hpp" diff --git a/tt_metal/impl/dispatch/command_queue_interface.hpp b/tt_metal/impl/dispatch/command_queue_interface.hpp index 8204be59bb8..2ea6d2e76e0 100644 --- a/tt_metal/impl/dispatch/command_queue_interface.hpp +++ b/tt_metal/impl/dispatch/command_queue_interface.hpp @@ -4,7 +4,7 @@ #pragma once #include -#include +#include #include #include "tt_metal/common/base.hpp" diff --git a/tt_metal/impl/dispatch/data_collection.cpp b/tt_metal/impl/dispatch/data_collection.cpp index 3b04ce19a87..e41a449f08a 100644 --- a/tt_metal/impl/dispatch/data_collection.cpp +++ b/tt_metal/impl/dispatch/data_collection.cpp @@ -7,7 +7,7 @@ #include "tt_metal/impl/kernels/kernel.hpp" #include "tt_metal/common/core_coord.hpp" -#include +#include using namespace tt; using namespace tt::tt_metal; diff --git a/tt_metal/programming_examples/eltwise_binary/eltwise_binary.cpp b/tt_metal/programming_examples/eltwise_binary/eltwise_binary.cpp index 98154a7c16a..de01317173a 100644 --- a/tt_metal/programming_examples/eltwise_binary/eltwise_binary.cpp +++ b/tt_metal/programming_examples/eltwise_binary/eltwise_binary.cpp @@ -11,7 +11,7 @@ #include "common/bfloat16.hpp" -#include +#include using namespace tt; using namespace tt::tt_metal; diff --git a/tt_metal/programming_examples/matmul_common/bmm_op.hpp b/tt_metal/programming_examples/matmul_common/bmm_op.hpp index b229618d172..c1d118215ec 100644 --- a/tt_metal/programming_examples/matmul_common/bmm_op.hpp +++ b/tt_metal/programming_examples/matmul_common/bmm_op.hpp @@ -15,7 +15,7 @@ #include "tt_metal/common/bfloat16.hpp" #include "umd/device/tt_xy_pair.h" -#include +#include #include "tt_metal/common/work_split.hpp" diff --git a/tt_metal/tools/profiler/op_profiler.hpp b/tt_metal/tools/profiler/op_profiler.hpp index 0e1d0d9ef15..376f5b34150 100644 --- a/tt_metal/tools/profiler/op_profiler.hpp +++ b/tt_metal/tools/profiler/op_profiler.hpp @@ -11,7 +11,7 @@ #include "ttnn/tensor/tensor.hpp" #include -#include +#include #include "tools/profiler/profiler.hpp" #include "tt_metal/impl/kernels/kernel.hpp" #include "ttnn/operation.hpp" diff --git a/tt_metal/tt_stl/reflection.hpp b/tt_metal/tt_stl/reflection.hpp index 33dd853cc38..29cd686f013 100644 --- a/tt_metal/tt_stl/reflection.hpp +++ b/tt_metal/tt_stl/reflection.hpp @@ -24,7 +24,7 @@ #include "concepts.hpp" #include -#include +#include #include "type_name.hpp" #include "tt_metal/common/logger.hpp" diff --git a/ttnn/cpp/pybind11/export_enum.hpp b/ttnn/cpp/pybind11/export_enum.hpp index c0561411b89..a07620dfb87 100644 --- a/ttnn/cpp/pybind11/export_enum.hpp +++ b/ttnn/cpp/pybind11/export_enum.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include namespace py = pybind11; diff --git a/ttnn/cpp/ttnn/core.hpp b/ttnn/cpp/ttnn/core.hpp index db32d95c1b0..c0fd10852b5 100644 --- a/ttnn/cpp/ttnn/core.hpp +++ b/ttnn/cpp/ttnn/core.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "ttnn/tensor/tensor.hpp" #include "ttnn/tensor/tensor_impl.hpp" // TTNN_TENSOR_PRINT_PROFILE #include "ttnn/tensor/types.hpp" diff --git a/ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.hpp b/ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.hpp index 2ab6380247f..b45d1bf15b5 100644 --- a/ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.hpp +++ b/ttnn/cpp/ttnn/operations/core/to_layout/to_layout_op.hpp @@ -8,7 +8,7 @@ #include #include "ttnn/tensor/tensor.hpp" -#include +#include #include "ttnn/tensor/host_buffer/functions.hpp" #include "ttnn/tensor/tensor_utils.hpp" #include "ttnn/operations/core/compute_kernel/compute_kernel_config.hpp" diff --git a/ttnn/cpp/ttnn/operations/data_movement/sharded/reshard/device/reshard_op.cpp b/ttnn/cpp/ttnn/operations/data_movement/sharded/reshard/device/reshard_op.cpp index 6ec78ed579b..44dabab2e62 100644 --- a/ttnn/cpp/ttnn/operations/data_movement/sharded/reshard/device/reshard_op.cpp +++ b/ttnn/cpp/ttnn/operations/data_movement/sharded/reshard/device/reshard_op.cpp @@ -4,7 +4,7 @@ #include "reshard_op.hpp" -#include +#include #include "reshard_program_factory.hpp" #include "tt_metal/common/constants.hpp" 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 6f24991c759..a54d641d6e6 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 @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "binary_composite_op.hpp" -#include +#include #include #include "ttnn/operations/eltwise/binary/binary.hpp" #include "ttnn/operations/eltwise/unary/unary.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.hpp b/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.hpp index 1da4530b62f..dea52bf595a 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_composite_op.hpp @@ -8,7 +8,7 @@ #include #include #include "ttnn/tensor/tensor.hpp" -#include +#include #include "ttnn/operations/core/core.hpp" namespace ttnn::operations::binary { diff --git a/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_device_operation.hpp b/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_device_operation.hpp index 11a77a206e9..048d086e4ef 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_device_operation.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/binary/device/binary_device_operation.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include #include #include diff --git a/ttnn/cpp/ttnn/operations/eltwise/binary_backward/binary_backward.cpp b/ttnn/cpp/ttnn/operations/eltwise/binary_backward/binary_backward.cpp index 0d647f99577..ea3b863e830 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/binary_backward/binary_backward.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/binary_backward/binary_backward.cpp @@ -26,7 +26,7 @@ #include "ttnn/operations/creation.hpp" #include "ttnn/common/constants.hpp" #include "ttnn/operations/eltwise/binary_backward/binary_backward.hpp" -#include +#include #include namespace ttnn::operations::binary_backward { diff --git a/ttnn/cpp/ttnn/operations/eltwise/complex_binary/device/complex_binary_op.hpp b/ttnn/cpp/ttnn/operations/eltwise/complex_binary/device/complex_binary_op.hpp index 42660946c11..27748350623 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/complex_binary/device/complex_binary_op.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/complex_binary/device/complex_binary_op.hpp @@ -7,7 +7,7 @@ #include #include #include "ttnn/tensor/tensor.hpp" -#include +#include #include "ttnn/operations/eltwise/complex/complex.hpp" namespace ttnn::operations::complex_binary { diff --git a/ttnn/cpp/ttnn/operations/eltwise/complex_unary/device/complex_unary_op.hpp b/ttnn/cpp/ttnn/operations/eltwise/complex_unary/device/complex_unary_op.hpp index b64e059000c..8e043674ed2 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/complex_unary/device/complex_unary_op.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/complex_unary/device/complex_unary_op.hpp @@ -7,7 +7,7 @@ #include #include #include "ttnn/tensor/tensor.hpp" -#include +#include #include "ttnn/operations/eltwise/complex/complex.hpp" namespace ttnn::operations::complex_unary { diff --git a/ttnn/cpp/ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.hpp b/ttnn/cpp/ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.hpp index e3de7966efe..5e9ac298bc7 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/complex_unary_backward/device/complex_unary_backward_op.hpp @@ -7,7 +7,7 @@ #include #include #include "ttnn/tensor/tensor.hpp" -#include +#include #include "ttnn/operations/eltwise/complex/complex.hpp" namespace ttnn::operations::complex_unary_backward { diff --git a/ttnn/cpp/ttnn/operations/eltwise/ternary/ternary_composite_op.hpp b/ttnn/cpp/ttnn/operations/eltwise/ternary/ternary_composite_op.hpp index 99e4a79a526..1b5f342ddbf 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/ternary/ternary_composite_op.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/ternary/ternary_composite_op.hpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include "ttnn/tensor/tensor.hpp" #include "ttnn/operations/core/core.hpp" #include "ttnn/run_operation.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/ternary_backward/ternary_backward.cpp b/ttnn/cpp/ttnn/operations/eltwise/ternary_backward/ternary_backward.cpp index 5e261d58cce..c792f0f988d 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/ternary_backward/ternary_backward.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/ternary_backward/ternary_backward.cpp @@ -12,7 +12,7 @@ #include "tt_metal/host_api.hpp" #include "tt_metal/tools/profiler/op_profiler.hpp" #include "ttnn/operations/eltwise/ternary_backward/ternary_backward.hpp" -#include +#include namespace ttnn::operations::ternary_backward { 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 04baa0f9599..b967bf65a05 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,7 +7,7 @@ #include #include -#include +#include #include #include "tt_metal/common/bfloat16.hpp" #include "ttnn/operations/data_movement/reshape_on_device/reshape.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_composite_op.hpp b/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_composite_op.hpp index 584ec6fadb5..b35a963d5d5 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_composite_op.hpp +++ b/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_composite_op.hpp @@ -6,7 +6,7 @@ #include #include #include "ttnn/tensor/tensor.hpp" -#include +#include #include "ttnn/cpp/ttnn/operations/eltwise/ternary/where.hpp" #include "ttnn/operations/eltwise/unary/unary.hpp" #include "ttnn/operations/eltwise/binary/binary.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_device_operation.cpp b/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_device_operation.cpp index 56ba7717bcf..5b7a9efc1e1 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_device_operation.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/unary/device/unary_device_operation.cpp @@ -4,7 +4,7 @@ #include "unary_device_operation.hpp" -#include +#include #include "tt_metal/common/constants.hpp" #include "tt_metal/host_api.hpp" #include "tt_metal/tools/profiler/op_profiler.hpp" diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary_backward/unary_backward.cpp b/ttnn/cpp/ttnn/operations/eltwise/unary_backward/unary_backward.cpp index 423a0a6775c..6a0aaed9c3f 100644 --- a/ttnn/cpp/ttnn/operations/eltwise/unary_backward/unary_backward.cpp +++ b/ttnn/cpp/ttnn/operations/eltwise/unary_backward/unary_backward.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#include +#include #include #include "ttnn/operations/data_movement/bcast/bcast.hpp" #include "tt_metal/common/constants.hpp" diff --git a/ttnn/cpp/ttnn/operations/moreh/moreh_helper_functions.cpp b/ttnn/cpp/ttnn/operations/moreh/moreh_helper_functions.cpp index 184ec4fd097..2b3cbb83cba 100644 --- a/ttnn/cpp/ttnn/operations/moreh/moreh_helper_functions.cpp +++ b/ttnn/cpp/ttnn/operations/moreh/moreh_helper_functions.cpp @@ -4,7 +4,7 @@ #include "moreh_helper_functions.hpp" -#include +#include #include #include "common/constants.hpp" diff --git a/ttnn/cpp/ttnn/operations/normalization/layernorm_distributed/device/layernorm_post_all_gather_op.cpp b/ttnn/cpp/ttnn/operations/normalization/layernorm_distributed/device/layernorm_post_all_gather_op.cpp index dec7a4005e4..7628a438671 100644 --- a/ttnn/cpp/ttnn/operations/normalization/layernorm_distributed/device/layernorm_post_all_gather_op.cpp +++ b/ttnn/cpp/ttnn/operations/normalization/layernorm_distributed/device/layernorm_post_all_gather_op.cpp @@ -11,7 +11,7 @@ #include "tt_metal/common/constants.hpp" #include "tt_metal/detail/util.hpp" -#include +#include #include diff --git a/ttnn/cpp/ttnn/operations/normalization/layernorm_distributed/device/layernorm_pre_all_gather_op.cpp b/ttnn/cpp/ttnn/operations/normalization/layernorm_distributed/device/layernorm_pre_all_gather_op.cpp index dceb72e35e2..c0c1f08fc12 100644 --- a/ttnn/cpp/ttnn/operations/normalization/layernorm_distributed/device/layernorm_pre_all_gather_op.cpp +++ b/ttnn/cpp/ttnn/operations/normalization/layernorm_distributed/device/layernorm_pre_all_gather_op.cpp @@ -11,7 +11,7 @@ #include "tt_metal/common/constants.hpp" #include "tt_metal/detail/util.hpp" -#include +#include #include