Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ie_* includes #22657

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Remove ie_* includes #22657

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8cfc58
Remove `ie_*` includes
vurusovs Feb 5, 2024
684de4b
IE_ASSERT fix
vurusovs Feb 5, 2024
2f5a35c
ClangFormat
vurusovs Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...common/low_precision_transformations/tests/eltwise_transformation_is_broadcasted_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
#include <gtest/gtest.h>
#include "low_precision/eltwise_base_transformation.hpp"

#include <ie_data.h>

using namespace ::testing;
using namespace std;

Expand Down
2 changes: 0 additions & 2 deletions src/common/low_precision_transformations/tests/precision_details_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
#include "low_precision/layer_transformation.hpp"
#include "low_precision/fake_quantize.hpp"

#include <ie_data.h>

using namespace ::testing;
using namespace std;
using namespace ov::pass::low_precision;
Expand Down
1 change: 0 additions & 1 deletion src/common/low_precision_transformations/tests/unit/calclulate_levels_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//

#include <gtest/gtest.h>
#include <ie_blob.h>

#include "low_precision/network_helper.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/common/low_precision_transformations/tests/unit/data_precision_check.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include <memory>
#include <gtest/gtest.h>
#include <ie_blob.h>
#include "low_precision/layer_transformation.hpp"
#include "low_precision/network_helper.hpp"

Expand Down
1 change: 0 additions & 1 deletion ...mmon/low_precision_transformations/tests/unit/layer_transformation_get_data_precision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include <memory>
#include <gtest/gtest.h>
#include <ie_blob.h>
#include "low_precision/layer_transformation.hpp"
#include "low_precision/network_helper.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/common/low_precision_transformations/tests/unit/reshape_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <ie_blob.h>
#include <gtest/gtest.h>
#include "low_precision/reshape.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/common/low_precision_transformations/tests/unit/update_reshape_values.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <ie_blob.h>
#include <gtest/gtest.h>
#include "low_precision/network_helper.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/core/tests/type_relaxed_copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <thread>
#include <vector>

#include "ie_common.h"
#include "openvino/op/matmul.hpp"
#include "ov_ops/type_relaxed.hpp"

Expand Down
2 changes: 0 additions & 2 deletions src/frontends/paddle/tests/read_paddle_model_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
//

#include <gtest/gtest.h>
#include <ie_blob.h>

#include <fstream>
#include <ie_core.hpp>
#include <openvino/util/file_util.hpp>
#include <set>
#include <string>
Expand Down
1 change: 0 additions & 1 deletion src/inference/tests/functional/matmul_sr_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "common_test_utils/graph_comparator.hpp"
#include "common_test_utils/ov_test_utils.hpp"
#include "common_test_utils/test_common.hpp"
#include "ie_common.h"
#include "openvino/op/add.hpp"
#include "openvino/op/constant.hpp"
#include "openvino/op/matmul.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/plugins/intel_cpu/tests/unit/nodes/eltwise_node_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include <vector>
#include <gtest/gtest.h>
#include "ie_common.h"
#include "nodes/eltwise.h"

using namespace ov::intel_cpu;
Expand Down
1 change: 0 additions & 1 deletion src/plugins/intel_cpu/tests/unit/nodes/reorder_node_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <cpu_types.h>
#include <edge.h>
#include <gtest/gtest.h>
#include <ie_common.h>
#include <memory_desc/cpu_memory_desc_utils.h>
#include <memory_desc/dnnl_memory_desc.h>
#include <node.h>
Expand Down
1 change: 0 additions & 1 deletion src/plugins/intel_cpu/tests/unit/transformations/state_concat_sdpa.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <transformations/utils/utils.hpp>
#include <openvino/pass/manager.hpp>
#include <ov_ops/type_relaxed.hpp>
#include <ie_core.hpp>

#include "common_test_utils/ov_test_utils.hpp"
#include "utils/gen_pattern.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/plugins/intel_cpu/tests/unit/transformations/x64/convert_to_interaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <transformations/utils/utils.hpp>
#include <openvino/pass/manager.hpp>
#include "ov_ops/type_relaxed.hpp"
#include <ie_core.hpp>

#include "common_test_utils/ov_test_utils.hpp"

Expand Down
1 change: 0 additions & 1 deletion ...gins/intel_gpu/tests/functional/single_layer_tests/dynamic/ctc_greedy_decoder_seq_len.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "common_test_utils/test_constants.hpp"
#include "common_test_utils/ov_tensor_utils.hpp"

using namespace InferenceEngine;
using namespace ov::test;

namespace GPULayerTestsDefinitions {
Expand Down
1 change: 0 additions & 1 deletion src/plugins/template/tests/functional/op_reference/if.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <limits>

#include "base_reference_test.hpp"
#include "ie_core.hpp"
#include "shared_test_classes/base/layer_test_utils.hpp"

using namespace reference_tests;
Expand Down
1 change: 0 additions & 1 deletion src/tests/functional/plugin/shared/src/execution_graph_tests/disable_lowering_precision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <string>
#include <functional>

#include <ie_core.hpp>
#include "openvino/runtime/exec_model_info.hpp"
#include "openvino/core/model.hpp"
#include "common_test_utils/common_utils.hpp"
Expand Down
1 change: 0 additions & 1 deletion ...ctional/plugin/shared/src/low_precision_transformations/depth_to_space_transformation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <ie_core.hpp>
#include <memory>
#include <string>
#include <tuple>
Expand Down
1 change: 0 additions & 1 deletion ...sts/functional/plugin/shared/src/low_precision_transformations/mat_mul_transformation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <ie_core.hpp>
#include <memory>
#include <queue>
#include <string>
Expand Down
1 change: 0 additions & 1 deletion .../plugin/shared/src/low_precision_transformations/mat_mul_with_constant_transformation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <ie_core.hpp>
#include <memory>
#include <queue>
#include <string>
Expand Down
1 change: 0 additions & 1 deletion ...sts/functional/plugin/shared/src/low_precision_transformations/squeeze_transformation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <ie_core.hpp>
#include <memory>
#include <queue>
#include <string>
Expand Down
1 change: 0 additions & 1 deletion ...s/functional/plugin/shared/src/low_precision_transformations/unsqueeze_transformation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
//

#include <ie_core.hpp>
#include <memory>
#include <queue>
#include <string>
Expand Down
1 change: 0 additions & 1 deletion ...functional/shared_test_classes/include/shared_test_classes/base/utils/compare_results.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#pragma once

#include "ie_core.hpp"

namespace ov {
namespace test {
Expand Down
1 change: 0 additions & 1 deletion ...ional/shared_test_classes/src/base/low_precision_transformations/layer_transformation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <vector>
#include <string>

#include <ie_core.hpp>
#include "functional_test_utils/blob_utils.hpp"

#include "ov_models/pass/convert_prc.hpp"
Expand Down
14 changes: 7 additions & 7 deletions src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ void SubgraphBaseTest::run() {
GTEST_FATAL_FAILURE_(errorMessage.c_str());
}
} else if (jmpRes == ov::test::utils::JMP_STATUS::anyError) {
IE_THROW() << "Crash happens";
OPENVINO_THROW("Crash happens");
} else if (jmpRes == ov::test::utils::JMP_STATUS::alarmErr) {
summary.updateOPsStats(function, ov::test::utils::PassRate::Statuses::HANGED, rel_influence_coef);
IE_THROW() << "Crash happens";
OPENVINO_THROW("Crash happens");
}
}

Expand Down Expand Up @@ -170,7 +170,7 @@ void SubgraphBaseTest::query_model() {
actual.insert(res.first);
}
if (expected != actual) {
IE_THROW() << "Expected and actual are different";
OPENVINO_THROW("Expected and actual are different");
}
status = ov::test::utils::PassRate::Statuses::PASSED;
} catch (const std::exception& ex) {
Expand All @@ -185,10 +185,10 @@ void SubgraphBaseTest::query_model() {
GTEST_FATAL_FAILURE_(errorMessage.c_str());
}
} else if (jmpRes == ov::test::utils::JMP_STATUS::anyError) {
IE_THROW() << "Crash happens";
OPENVINO_THROW("Crash happens");
} else if (jmpRes == ov::test::utils::JMP_STATUS::alarmErr) {
summary.updateOPsStats(function, ov::test::utils::PassRate::Statuses::HANGED, rel_influence_coef);
IE_THROW() << "Crash happens";
OPENVINO_THROW("Crash happens");
}
}

Expand Down Expand Up @@ -247,10 +247,10 @@ void SubgraphBaseTest::import_export() {
GTEST_FATAL_FAILURE_(errorMessage.c_str());
}
} else if (jmpRes == ov::test::utils::JMP_STATUS::anyError) {
IE_THROW() << "Crash happens";
OPENVINO_THROW("Crash happens");
} else if (jmpRes == ov::test::utils::JMP_STATUS::alarmErr) {
summary.updateOPsStats(function, ov::test::utils::PassRate::Statuses::HANGED, rel_influence_coef);
IE_THROW() << "Crash happens";
OPENVINO_THROW("Crash happens");
}
}

Expand Down
3 changes: 1 addition & 2 deletions ...tests/functional/shared_test_classes/src/subgraph/quantized_convolution_backprop_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "common_test_utils/node_builders/convolution_backprop_data.hpp"
#include "common_test_utils/node_builders/constant.hpp"
#include "ov_models/utils/ov_helpers.hpp"
#include "ie_common.h"
#include "common_test_utils/node_builders/fake_quantize.hpp"

namespace ov {
Expand Down Expand Up @@ -48,7 +47,7 @@ void QuantConvBackpropDataLayerTest::SetUp() {
ov::element::Type element_type = ov::element::undefined;
std::tie(groupConvBackpropDataParams, element_type, inputShape, targetDevice) = this->GetParam();
ov::op::PadType padType;
InferenceEngine::SizeVector kernel, stride, dilation;
std::vector<size_t> kernel, stride, dilation;
std::vector<ptrdiff_t> padBegin, padEnd;
size_t convOutChannels;
size_t quantLevels;
Expand Down
1 change: 0 additions & 1 deletion src/tests/functional/shared_test_classes/src/subgraph/split_conv_concat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "shared_test_classes/subgraph/split_conv_concat.hpp"

#include "common_test_utils/data_utils.hpp"
#include "ie_common.h"
#include "shared_test_classes/base/layer_test_utils.hpp"
#include "shared_test_classes/base/ov_subgraph.hpp"
#include "common_test_utils/node_builders/convolution.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/tests/test_utils/common_test_utils/src/graph_comparator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include "common_test_utils/ov_tensor_utils.hpp"
#include "gtest/gtest.h"
#include "ie_common.h"
#include "openvino/op/constant.hpp"
#include "openvino/op/loop.hpp"
#include "openvino/op/result.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/tests/test_utils/functional_test_utils/include/functional_test_utils/blob_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "blob_factory.hpp"
#include "common_test_utils/data_utils.hpp"
#include "common_test_utils/test_constants.hpp"
#include "ie_ngraph_utils.hpp"
#include "openvino/runtime/common.hpp"

namespace FuncTestUtils {
Expand Down
1 change: 0 additions & 1 deletion src/tests/test_utils/unit_test_utils/mocks/mock_engine/mock_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#include "cpp_interfaces/interface/ie_iplugin_internal.hpp"
#include "description_buffer.hpp"
#include "ie_icore.hpp"
#include "openvino/core/except.hpp"
#include "openvino/runtime/common.hpp"
#include "openvino/runtime/icore.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test_utils/unit_test_utils/mocks/openvino/runtime/mock_icore.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include <gmock/gmock.h>

#include "ie_icore.hpp"
#include "openvino/runtime/icore.hpp"

Check warning on line 9 in src/tests/test_utils/unit_test_utils/mocks/openvino/runtime/mock_icore.hpp

View workflow job for this annotation

GitHub Actions / clang-format 

[reviewdog-suggester] reported by reviewdog 🐶


Raw Output:
src/tests/test_utils/unit_test_utils/mocks/openvino/runtime/mock_icore.hpp:9:-#include "openvino/runtime/icore.hpp"
#include "openvino/runtime/icompiled_model.hpp"

Check warning on line 11 in src/tests/test_utils/unit_test_utils/mocks/openvino/runtime/mock_icore.hpp

View workflow job for this annotation

GitHub Actions / clang-format 

[reviewdog-suggester] reported by reviewdog 🐶


Raw Output:
src/tests/test_utils/unit_test_utils/mocks/openvino/runtime/mock_icore.hpp:10:+#include "openvino/runtime/icore.hpp"
namespace ov {

class MockICore : public ov::ICore {
Expand Down
Loading