natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove NGraphFunctions namespace (#23627) 

### Details:
 - Remove NGraphFunctions namespace

### Tickets:
 - CVS-133379
This commit is contained in:
Oleg Pipikin 2024-03-25 07:00:59 +01:00 committed by GitHub
parent ed5c543a0a
commit 647ef4e701
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/intel_cpu/tests/functional/custom/subgraph_tests/src/denormal_check.cpp
View File

@ -65,10 +65,10 @@ TEST_F(DenormalNullifyCheck, smoke_CPU_Denormal_Check) {
constexpr unsigned denormalsCount = 15u;
constexpr uint32_t denormalsRange = (0xffffffffu >> 9u) - 1;
testing::internal::Random random(seed);
auto randomRange = NGraphFunctions::Utils::generateVector<ov::element::f32>(elemsCount, 10, -10);
auto randomRange = ov::test::utils::generateVector<ov::element::f32>(elemsCount, 10, -10);
for (auto& interval : intervals) {
auto randomIndices = NGraphFunctions::Utils::generateVector<ov::element::u32>(denormalsCount, interval.second, interval.first);
auto randomIndices = ov::test::utils::generateVector<ov::element::u32>(denormalsCount, interval.second, interval.first);
std::unordered_set<decltype(randomIndices)::value_type> randomIndexSet(randomIndices.begin(), randomIndices.end());
for (size_t i = 0; i < elemsCount; ++i) {
if (randomIndexSet.count(i)) {

8
src/plugins/intel_cpu/tests/functional/utils/fusing_test_utils.hpp
View File

@ -183,14 +183,14 @@ const auto fusingSqrt = fusingSpecificParams{std::make_shared<postNodesMgr>(std:
const auto fusingPReluPerChannel = fusingSpecificParams{std::make_shared<postNodesMgr>(std::vector<postNodeBuilder>{
{[](postNodeConfig& cfg){
ov::Shape newShape = generatePerChannelShape(cfg.target);
auto data = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(ov::shape_size(newShape));
auto data = ov::test::utils::generateVector<ov::element::Type_t::f32>(ov::shape_size(newShape));
return utils::make_activation(cfg.input, cfg.type, utils::LeakyRelu, newShape, data);
}, "PRelu(PerChannel)"}}), {"PRelu"}};
const auto fusingPReluPerTensor = fusingSpecificParams{std::make_shared<postNodesMgr>(std::vector<postNodeBuilder>{
{[](postNodeConfig& cfg){
ov::Shape shape(1, 1);
auto data = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(ov::shape_size(shape));
auto data = ov::test::utils::generateVector<ov::element::Type_t::f32>(ov::shape_size(shape));
return utils::make_activation(cfg.input, cfg.type, utils::LeakyRelu, shape, data);
}, "PRelu(PerTensor)"}}), {"PRelu"}};
@ -465,7 +465,7 @@ const auto fusingPRelu1D = fusingSpecificParams{std::make_shared<postNodesMgr>(s
{[](postNodeConfig& cfg){
auto shape = cfg.input->get_output_partial_shape(0);
ov::Shape newShape({static_cast<size_t>(shape[1].get_length())});
auto data = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(ov::shape_size(newShape));
auto data = ov::test::utils::generateVector<ov::element::Type_t::f32>(ov::shape_size(newShape));
return utils::make_activation(cfg.input, cfg.type, utils::LeakyRelu, newShape, data);
}, "PRelu1D"}}), {"PRelu"}};
@ -473,7 +473,7 @@ const auto fusingPRelu1DScaleShift = fusingSpecificParams{std::make_shared<postN
{[](postNodeConfig& cfg){
auto shape = cfg.input->get_output_partial_shape(0);
ov::Shape newShape({static_cast<size_t>(shape[1].get_length())});
auto data = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(ov::shape_size(newShape));
auto data = ov::test::utils::generateVector<ov::element::Type_t::f32>(ov::shape_size(newShape));
return utils::make_activation(cfg.input, cfg.type, utils::LeakyRelu, newShape, data);
}, "PRelu1D"},
{[](postNodeConfig& cfg) {

12
src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp
View File

@ -264,15 +264,15 @@ ov::Tensor generate(const std::shared_ptr<ov::op::v0::FakeQuantize>& node,
int seed = 1;
size_t constDataSize = ov::shape_size(targetShape);
std::vector<float> inputLowData, inputHighData, outputLowData, outputHighData;
inputLowData = NGraphFunctions::Utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
inputLowData = ov::test::utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
if (node->get_levels() != 2) {
inputHighData = NGraphFunctions::Utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
outputLowData = NGraphFunctions::Utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
outputHighData = NGraphFunctions::Utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
inputHighData = ov::test::utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
outputLowData = ov::test::utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
outputHighData = ov::test::utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
} else {
inputHighData = inputLowData;
outputLowData = NGraphFunctions::Utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
outputHighData = NGraphFunctions::Utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
outputLowData = ov::test::utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
outputHighData = ov::test::utils::generateVector<ov::element::f32>(constDataSize, 10, 1, seed);
for (int i = 0; i < constDataSize; i++) {
if (outputLowData[i] > outputHighData[i]) {

12
src/tests/test_utils/common_test_utils/include/common_test_utils/data_utils.hpp
View File

@ -15,8 +15,9 @@
#include "openvino/core/type/element_type_traits.hpp"
#include "openvino/runtime/tensor.hpp"
namespace NGraphFunctions {
namespace Utils {
namespace ov {
namespace test {
namespace utils {
template <ov::element::Type_t dType>
std::vector<typename ov::element_type_traits<dType>::value_type> inline generateVector(
@ -105,13 +106,6 @@ std::vector<toType> castVector(const std::vector<fromType>& vec) {
return resVec;
}
} // namespace Utils
} // namespace NGraphFunctions
namespace ov {
namespace test {
namespace utils {
inline void fill_data(float* data, size_t size, size_t duty_ratio = 10) {
for (size_t i = 0; i < size; i++) {
if ((i / duty_ratio) % 2 == 1) {

44
src/tests/test_utils/common_test_utils/include/common_test_utils/node_builders/constant.hpp
View File

@ -23,28 +23,28 @@ std::shared_ptr<ov::Node> make_constant(const ov::element::Type& type,
T up_to = 10,
T start_from = 1,
const int seed = 1) {
#define makeNode(TYPE) \
case TYPE: \
if (random) { \
return std::make_shared<ov::op::v0::Constant>( \
type, \
shape, \
NGraphFunctions::Utils::generateVector<TYPE>(ov::shape_size(shape), \
ov::element_type_traits<TYPE>::value_type(up_to), \
ov::element_type_traits<TYPE>::value_type(start_from), \
seed)); \
} else { \
if (std::is_same<T, fundamental_type_for<TYPE>>::value) { \
return std::make_shared<ov::op::v0::Constant>(type, shape, data); \
} else { \
/* Convert std::vector<T> data to required type */ \
std::vector<fundamental_type_for<TYPE>> converted_data(data.size()); \
std::transform(data.cbegin(), data.cend(), converted_data.begin(), [](T e) { \
return static_cast<fundamental_type_for<TYPE>>(e); \
}); \
return std::make_shared<ov::op::v0::Constant>(type, shape, converted_data); \
} \
} \
#define makeNode(TYPE) \
case TYPE: \
if (random) { \
return std::make_shared<ov::op::v0::Constant>( \
type, \
shape, \
generateVector<TYPE>(ov::shape_size(shape), \
ov::element_type_traits<TYPE>::value_type(up_to), \
ov::element_type_traits<TYPE>::value_type(start_from), \
seed)); \
} else { \
if (std::is_same<T, fundamental_type_for<TYPE>>::value) { \
return std::make_shared<ov::op::v0::Constant>(type, shape, data); \
} else { \
/* Convert std::vector<T> data to required type */ \
std::vector<fundamental_type_for<TYPE>> converted_data(data.size()); \
std::transform(data.cbegin(), data.cend(), converted_data.begin(), [](T e) { \
return static_cast<fundamental_type_for<TYPE>>(e); \
}); \
return std::make_shared<ov::op::v0::Constant>(type, shape, converted_data); \
} \
} \
break;
switch (type) {
makeNode(ov::element::bf16);

12
src/tests/test_utils/common_test_utils/src/node_builders/fake_quantize.cpp
View File

@ -41,15 +41,15 @@ std::shared_ptr<ov::Node> make_fake_quantize(const ov::Output<ov::Node>& in,
const int32_t seed) {
size_t constDataSize = ov::shape_size(constShapes);
std::vector<float> inputLowData, inputHighData, outputLowData, outputHighData;
inputLowData = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
inputLowData = ov::test::utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
if (levels != 2) {
inputHighData = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
outputLowData = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
outputHighData = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
inputHighData = ov::test::utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
outputLowData = ov::test::utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
outputHighData = ov::test::utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
} else {
inputHighData = inputLowData;
outputLowData = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
outputHighData = NGraphFunctions::Utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
outputLowData = ov::test::utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
outputHighData = ov::test::utils::generateVector<ov::element::Type_t::f32>(constDataSize, 10, 1, seed);
for (int i = 0; i < constDataSize; i++) {
if (outputLowData[i] > outputHighData[i]) {