Skip to content

Commit

Permalink
Remove ie_* includes (#22657)
Browse files Browse the repository at this point in the history
  • Loading branch information
vurusovs authored Feb 5, 2024
1 parent a6fd315 commit a4cdec3
Show file tree
Hide file tree
Showing 32 changed files with 12 additions and 44 deletions.
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
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
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
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
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
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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class AutoBatchAsyncInferRequestTest : public ::testing::TestWithParam<AutoBatch
} else if ((status == std::cv_status::timeout) && sz) {
std::pair<AsyncInferRequest*, ov::threading::Task> t;
for (int n = 0; n < sz; n++) {
IE_ASSERT(workerRequestPtr->_tasks.try_pop(t));
OPENVINO_ASSERT(workerRequestPtr->_tasks.try_pop(t));
t.first->m_sync_request->m_batched_request_status =
SyncInferRequest::eExecutionFlavor::TIMEOUT_EXECUTED;
t.first->m_request_without_batch->start_async();
Expand Down
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 Expand Up @@ -1024,7 +1023,7 @@ AccuracyCheckResult accuracy_check(const std::shared_ptr<ov::Model>& ref_functio
return AccuracyCheckResult{true, ""};
}
try {
IE_ASSERT(ref_function->get_parameters().size() == cur_function->get_parameters().size());
OPENVINO_ASSERT(ref_function->get_parameters().size() == cur_function->get_parameters().size());

std::map<std::shared_ptr<ov::Node>, ov::Tensor> ref_input_data;
std::map<std::shared_ptr<ov::Node>, ov::Tensor> cur_input_data;
Expand All @@ -1038,7 +1037,7 @@ AccuracyCheckResult accuracy_check(const std::shared_ptr<ov::Model>& ref_functio

auto ref_outputs = ngraph::helpers::interpretFunction(ref_function, ref_input_data);
auto outputs = ngraph::helpers::interpretFunction(cur_function, cur_input_data);
IE_ASSERT(ref_outputs.size() == outputs.size());
OPENVINO_ASSERT(ref_outputs.size() == outputs.size());

for (int i = 0; i < ref_outputs.size(); i++) {
ov::test::utils::compare(ref_outputs[i], outputs[i], abs_threshold, rel_threshold);
Expand Down
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <gmock/gmock.h>

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

namespace ov {

Expand Down

0 comments on commit a4cdec3

Please sign in to comment.