From f4ecee2d2fddcad0ebf9c9418834de18a243777e Mon Sep 17 00:00:00 2001 From: River Li Date: Tue, 23 Jan 2024 01:59:54 +0800 Subject: [PATCH] Remove ie/cpu/cpu_config.hpp (#22315) --- src/inference/include/ie/cpu/cpu_config.hpp | 56 ------------------- src/plugins/intel_cpu/src/config.cpp | 1 - src/plugins/intel_cpu/src/config.h | 1 - .../single_layer_tests/matmul_sparse.cpp | 1 - 4 files changed, 59 deletions(-) delete mode 100644 src/inference/include/ie/cpu/cpu_config.hpp diff --git a/src/inference/include/ie/cpu/cpu_config.hpp b/src/inference/include/ie/cpu/cpu_config.hpp deleted file mode 100644 index e1619832223..00000000000 --- a/src/inference/include/ie/cpu/cpu_config.hpp +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (C) 2022 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -/** - * @brief A header for advanced hardware related properties for CPU plugin - * To use in SetConfig() method of plugins - * - * @file cpu_config.hpp - */ -#pragma once - -#if !defined(IN_OV_COMPONENT) && !defined(IE_LEGACY_HEADER_INCLUDED) -# define IE_LEGACY_HEADER_INCLUDED -# ifdef _MSC_VER -# pragma message( \ - "The Inference Engine API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# else -# warning("The Inference Engine API is deprecated and will be removed in the 2024.0 release. For instructions on transitioning to the new API, please refer to https://docs.openvino.ai/latest/openvino_2_0_transition_guide.html") -# endif -#endif - -#include "ie_plugin_config.hpp" - -namespace InferenceEngine { - -/** - * @brief CPU plugin configuration - */ -namespace CPUConfigParams { - -/** - * @brief shortcut for defining configuration keys - */ -#define CPU_CONFIG_KEY(name) InferenceEngine::CPUConfigParams::_CONFIG_KEY(CPU_##name) -#define DECLARE_CPU_CONFIG_KEY(name) DECLARE_CONFIG_KEY(CPU_##name) -#define DECLARE_CPU_CONFIG_VALUE(name) DECLARE_CONFIG_VALUE(CPU_##name) - -/** - * @brief The name for defining if denormals is optimized on CPU whenever it is possible - * - * This option lets CPU plugin determine whether denormals are optimized where it expects - * performance benefits from getting rid of denormals computation. - * Such option does not guarantee accuracy of the model, the accuracy in this mode should be - * verified separately by the user. Basing on performance and accuracy results, it should be - * user's decision to use this option or not. - * It is passed to Core::SetConfig(), this option should be used with values: - * PluginConfigParams::YES or PluginConfigParams::NO - * If not set explicitly, the behavior is kept in runtime enviroment where compile_model is called. - */ -INFERENCE_ENGINE_1_0_DEPRECATED DECLARE_CPU_CONFIG_KEY(DENORMALS_OPTIMIZATION); - -INFERENCE_ENGINE_1_0_DEPRECATED DECLARE_CPU_CONFIG_KEY(SPARSE_WEIGHTS_DECOMPRESSION_RATE); - -} // namespace CPUConfigParams -} // namespace InferenceEngine diff --git a/src/plugins/intel_cpu/src/config.cpp b/src/plugins/intel_cpu/src/config.cpp index 6b84bb5a328..f72e5ccdf95 100644 --- a/src/plugins/intel_cpu/src/config.cpp +++ b/src/plugins/intel_cpu/src/config.cpp @@ -4,7 +4,6 @@ #include "config.h" -#include "cpu/cpu_config.hpp" #include "cpu/x64/cpu_isa_traits.hpp" #include "openvino/core/parallel.hpp" #include "openvino/core/type/element_type_traits.hpp" diff --git a/src/plugins/intel_cpu/src/config.h b/src/plugins/intel_cpu/src/config.h index c757805e272..3a5d7a7c486 100644 --- a/src/plugins/intel_cpu/src/config.h +++ b/src/plugins/intel_cpu/src/config.h @@ -15,7 +15,6 @@ #include #include #include -#include namespace ov { namespace intel_cpu { diff --git a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp index 36d39e771d6..f9a7c941dbf 100644 --- a/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp +++ b/src/plugins/intel_cpu/tests/functional/single_layer_tests/matmul_sparse.cpp @@ -4,7 +4,6 @@ #include "common_test_utils/node_builders/constant.hpp" #include "common_test_utils/ov_tensor_utils.hpp" -#include "cpu/cpu_config.hpp" #include "openvino/runtime/intel_cpu/properties.hpp" #include "ov_ops/type_relaxed.hpp" #include "shared_test_classes/base/ov_subgraph.hpp"