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

[MO, POT] Top up upper bounds for TensorFlow and NumPy modules in all requirement files (#12191)

Browse Source 
* [MO] Relax MO upper-bound requirements for TensorFlow and NumPy

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Just debug numpy version

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Pin upper-bounds for NumPy and TensorFlow modules in all reqs files

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Update submodule dependency for open_model_zoo

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Install numpy module first

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Update NumPy version in POT setup.py

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Extend telemetry tests with a set of possible solutions for events

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Fix build issue

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>

* Update NumPy module version for layer tests

Signed-off-by: Kazantsev, Roman <roman.kazantsev@intel.com>
This commit is contained in:
Roman Kazantsev 2022-08-03 15:18:41 +03:00 committed by GitHub
parent 62f79c3222
commit e0cef714d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 58 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/python/requirements.txt
View File

@ -1,2 +1,2 @@
opencv-python==4.5.*
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1

2
src/bindings/python/requirements.txt
View File

@ -1 +1 @@
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1

2
src/bindings/python/src/compatibility/openvino/requirements.txt
View File

@ -1 +1 @@
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1

4
src/core/tests/frontend/onnx/telemetry.cpp
View File

@ -15,11 +15,11 @@ static TelemetryFEParam getTestData() {
res.m_frontEndName = ONNX_FE;
res.m_modelsPath = std::string(TEST_ONNX_MODELS_DIRNAME);
res.m_modelName = "controlflow/loop_2d_add.onnx";
res.m_expected_events = {
res.m_expected_events = {{
std::make_tuple("mo", "op_count", "onnx_Loop", 1),
std::make_tuple("mo", "op_count", "onnx_Add", 1),
std::make_tuple("mo", "op_count", "onnx_Identity", 2),
};
}};
return res;
}

8
src/core/tests/frontend/paddle/telemetry.cpp
View File

@ -15,10 +15,10 @@ static TelemetryFEParam getTestData() {
res.m_frontEndName = PADDLE_FE;
res.m_modelsPath = std::string(TEST_PADDLE_MODELS_DIRNAME);
res.m_modelName = "relu/relu.pdmodel";
res.m_expected_events = {std::make_tuple("mo", "op_count", "paddle_feed", 1),
std::make_tuple("mo", "op_count", "paddle_fetch", 1),
std::make_tuple("mo", "op_count", "paddle_relu", 1),
std::make_tuple("mo", "op_count", "paddle_scale", 1)};
res.m_expected_events = {{std::make_tuple("mo", "op_count", "paddle_feed", 1),
std::make_tuple("mo", "op_count", "paddle_fetch", 1),
std::make_tuple("mo", "op_count", "paddle_relu", 1),
std::make_tuple("mo", "op_count", "paddle_scale", 1)}};
return res;
}

21
src/frontends/tensorflow/tests/telemetry.cpp
View File

@ -16,12 +16,21 @@ static TelemetryFEParam getTestData() {
res.m_modelsPath = std::string(TEST_TENSORFLOW_MODELS_DIRNAME);
res.m_modelName = "2in_2out/2in_2out.pb";
res.m_expected_events = {std::make_tuple("mo", "op_count", "tf_Add", 2),
std::make_tuple("mo", "op_count", "tf_Const", 2),
std::make_tuple("mo", "op_count", "tf_Conv2D", 2),
std::make_tuple("mo", "op_count", "tf_NoOp", 1),
std::make_tuple("mo", "op_count", "tf_Placeholder", 2),
std::make_tuple("mo", "op_count", "tf_Relu", 4)};
res.m_expected_events = {// Expected events on old TensorFlow environment
{std::make_tuple("mo", "op_count", "tf_Add", 2),
std::make_tuple("mo", "op_count", "tf_Const", 2),
std::make_tuple("mo", "op_count", "tf_Conv2D", 2),
std::make_tuple("mo", "op_count", "tf_NoOp", 1),
std::make_tuple("mo", "op_count", "tf_Placeholder", 2),
std::make_tuple("mo", "op_count", "tf_Relu", 4)},
// Expected events on new TensorFlow environment 2.9
{std::make_tuple("mo", "op_count", "tf_AddV2", 2),
std::make_tuple("mo", "op_count", "tf_Const", 2),
std::make_tuple("mo", "op_count", "tf_Conv2D", 2),
std::make_tuple("mo", "op_count", "tf_NoOp", 1),
std::make_tuple("mo", "op_count", "tf_Placeholder", 2),
std::make_tuple("mo", "op_count", "tf_Relu", 4)}};
return res;
}

2
src/frontends/tests/frontend/shared/include/telemetry.hpp
View File

@ -45,7 +45,7 @@ struct TelemetryFEParam {
std::string m_frontEndName;
std::string m_modelsPath;
std::string m_modelName;
std::set<std::tuple<std::string, std::string, std::string, int>> m_expected_events;
std::set<std::set<std::tuple<std::string, std::string, std::string, int>>> m_expected_events;
};
class FrontEndTelemetryTest : public ::testing::TestWithParam<TelemetryFEParam> {

23
src/frontends/tests/frontend/shared/src/telemetry.cpp
View File

@ -63,8 +63,16 @@ TEST_P(FrontEndTelemetryTest, TestTelemetryMock) {
EXPECT_NO_THROW(m_frontEnd->add_extension(telemetry_extension));
m_inputModel = m_frontEnd->load(m_param.m_modelName);
function = m_frontEnd->convert(m_inputModel);
EXPECT_EQ(m_test_telemetry.m_event_cnt, m_param.m_expected_events.size());
EXPECT_EQ(m_test_telemetry.m_received_events, m_param.m_expected_events);
bool is_found = false;
for (const auto m_expected_events : m_param.m_expected_events) {
is_found = false;
is_found = (m_test_telemetry.m_event_cnt == m_expected_events.size()) &&
(m_test_telemetry.m_received_events == m_expected_events);
if (is_found) {
break;
}
}
EXPECT_TRUE(is_found) << "Unexpected set of operations received from telemetry.";
EXPECT_EQ(m_test_telemetry.m_trace_cnt, 0);
EXPECT_EQ(m_test_telemetry.m_error_cnt, 0);
@ -73,8 +81,15 @@ TEST_P(FrontEndTelemetryTest, TestTelemetryMock) {
EXPECT_NO_THROW(m_frontEnd->add_extension(telemetry_extension));
m_inputModel = m_frontEnd->load(m_param.m_modelName);
function = m_frontEnd->decode(m_inputModel);
EXPECT_EQ(m_test_telemetry.m_event_cnt, m_param.m_expected_events.size());
EXPECT_EQ(m_test_telemetry.m_received_events, m_param.m_expected_events);
for (const auto m_expected_events : m_param.m_expected_events) {
is_found = false;
is_found = (m_test_telemetry.m_event_cnt == m_expected_events.size()) &&
(m_test_telemetry.m_received_events == m_expected_events);
if (is_found) {
break;
}
}
EXPECT_TRUE(is_found) << "Unexpected set of operations received from telemetry.";
EXPECT_EQ(m_test_telemetry.m_trace_cnt, 0);
EXPECT_EQ(m_test_telemetry.m_error_cnt, 0);
}

3
tests/layer_tests/requirements.txt
View File

@ -1,3 +1,2 @@
requests>=2.25.1
numpy~=1.19.5; platform_system != "Windows"
numpy~=1.19.3; platform_system == "Windows"
numpy>=1.19.2

2
tools/benchmark_tool/requirements.txt
View File

@ -1,4 +1,4 @@
py-cpuinfo>=7.0.0
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1
progress>=1.5
opencv-python==4.5.*

2
tools/cross_check_tool/requirements.txt
View File

@ -1,2 +1,2 @@
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1
opencv-python==4.5.*

4
tools/mo/requirements.txt
View File

@ -1,9 +1,9 @@
tensorflow>=1.15.5,<2.6
numpy>=1.16.6,<=1.23.1
tensorflow>=1.15.5,<=2.9.1
mxnet~=1.2.0; sys_platform == 'win32'
mxnet~=1.7.0.post2; sys_platform != 'win32'
networkx~=2.5; python_version <= "3.6"
networkx<2.8.1; python_version > "3.6"
numpy>=1.16.6,<1.20
protobuf>=3.15.6
onnx>=1.8.1,<1.12
defusedxml>=0.7.1

2
tools/mo/requirements_caffe.txt
View File

@ -1,6 +1,6 @@
networkx~=2.5; python_version <= "3.6"
networkx<2.8.1; python_version > "3.6"
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1
protobuf>=3.15.6
defusedxml>=0.7.1
requests>=2.25.1

2
tools/mo/requirements_kaldi.txt
View File

@ -1,6 +1,6 @@
networkx~=2.5; python_version <= "3.6"
networkx<2.8.1; python_version > "3.6"
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1
defusedxml>=0.7.1
requests>=2.25.1
fastjsonschema~=2.15.1

2
tools/mo/requirements_mxnet.txt
View File

@ -2,7 +2,7 @@ mxnet~=1.2.0; sys_platform == 'win32'
mxnet~=1.7.0.post2; sys_platform != 'win32'
networkx~=2.5; python_version <= "3.6"
networkx<2.8.1; python_version > "3.6"
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1
defusedxml>=0.7.1
urllib3>=1.26.4
requests>=2.25.1

2
tools/mo/requirements_onnx.txt
View File

@ -1,7 +1,7 @@
onnx>=1.8.1,<1.12
networkx~=2.5; python_version <= "3.6"
networkx<2.8.1; python_version > "3.6"
numpy>=1.16.6,<1.20
numpy>=1.16.6,<=1.23.1
defusedxml>=0.7.1
requests>=2.25.1
fastjsonschema~=2.15.1

4
tools/mo/requirements_tf.txt
View File

@ -1,7 +1,7 @@
tensorflow>=1.15.5,<2.6
numpy>=1.16.6,<=1.23.1
tensorflow>=1.15.5,<=2.9.1
networkx~=2.5; python_version <= "3.6"
networkx<2.8.1; python_version > "3.6"
numpy>=1.16.6,<1.20
defusedxml>=0.7.1
requests>=2.25.1
fastjsonschema~=2.15.1

5
tools/mo/requirements_tf2.txt
View File

@ -1,8 +1,7 @@
tensorflow~=2.5.0; python_version <= "3.6"
tensorflow~=2.5.3; python_version > "3.6"
numpy>=1.16.6,<=1.23.1
tensorflow>=2.5,<=2.9.1
networkx~=2.5; python_version <= "3.6"
networkx<2.8.1; python_version > "3.6"
numpy>=1.16.6,<1.20
defusedxml>=0.7.1
requests>=2.25.1
fastjsonschema~=2.15.1

2
tools/pot/setup.py
View File

@ -67,7 +67,7 @@ if '--install-dev-extras' in sys.argv:
INSTALL_REQUIRES = [
"scipy~=1.5.4",
"jstyleson~=0.0.2",
"numpy>=1.16.6,<1.20",
"numpy>=1.16.6,<=1.23.1",
"addict>=2.4.0",
"networkx~=2.5;python_version<='3.6'",
"networkx<2.8.1;python_version>'3.6'",