From 14d21ab345bc78bf4cf5adc42dd52054ae179cdc Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Fri, 18 Feb 2022 16:53:20 +0300 Subject: [PATCH 01/10] nncf_eval_testing fix --- ...est_ote_cli_tools_anomaly_classification.py | 2 +- .../test_ote_cli_tools_classification.py | 18 +++++++++--------- tests/ote_cli/test_ote_cli_tools_detection.py | 2 +- .../ote_cli/test_ote_cli_tools_segmentation.py | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/ote_cli/test_ote_cli_tools_anomaly_classification.py b/tests/ote_cli/test_ote_cli_tools_anomaly_classification.py index 6047cf23b61..19d0c0d93cd 100644 --- a/tests/ote_cli/test_ote_cli_tools_anomaly_classification.py +++ b/tests/ote_cli/test_ote_cli_tools_anomaly_classification.py @@ -132,7 +132,7 @@ def test_nncf_eval(self, template): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, root, ote_dir, args, threshold=0.1) + nncf_eval_testing(template, root, ote_dir, args, threshold=0.001) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) diff --git a/tests/ote_cli/test_ote_cli_tools_classification.py b/tests/ote_cli/test_ote_cli_tools_classification.py index 48b9c2d38ed..fbeb07716bb 100644 --- a/tests/ote_cli/test_ote_cli_tools_classification.py +++ b/tests/ote_cli/test_ote_cli_tools_classification.py @@ -127,38 +127,38 @@ def test_ote_hpo(self, template): def test_nncf_optimize(self, template): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - + nncf_optimize_testing(template, root, ote_dir, args) - + @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_nncf_export(self, template): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - + nncf_export_testing(template, root) - + @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_nncf_eval(self, template): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - - nncf_eval_testing(template, root, ote_dir, args, threshold=0.1) + + nncf_eval_testing(template, root, ote_dir, args, threshold=0.001) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_nncf_eval_openvino(self, template): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - + nncf_eval_openvino_testing(template, root, ote_dir, args) - + @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_pot_optimize(self, template): pot_optimize_testing(template, root, ote_dir, args) - + @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) def test_pot_eval(self, template): diff --git a/tests/ote_cli/test_ote_cli_tools_detection.py b/tests/ote_cli/test_ote_cli_tools_detection.py index f55bd6926b9..462b222c407 100644 --- a/tests/ote_cli/test_ote_cli_tools_detection.py +++ b/tests/ote_cli/test_ote_cli_tools_detection.py @@ -146,7 +146,7 @@ def test_nncf_eval(self, template): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, root, ote_dir, args, threshold=0.1) + nncf_eval_testing(template, root, ote_dir, args, threshold=0.001) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) diff --git a/tests/ote_cli/test_ote_cli_tools_segmentation.py b/tests/ote_cli/test_ote_cli_tools_segmentation.py index 27188946444..e1a0d0aa599 100644 --- a/tests/ote_cli/test_ote_cli_tools_segmentation.py +++ b/tests/ote_cli/test_ote_cli_tools_segmentation.py @@ -141,7 +141,7 @@ def test_nncf_eval(self, template): if template.entrypoints.nncf is None: pytest.skip("nncf entrypoint is none") - nncf_eval_testing(template, root, ote_dir, args, threshold=0.1) + nncf_eval_testing(template, root, ote_dir, args, threshold=0.001) @e2e_pytest_component @pytest.mark.parametrize("template", templates, ids=templates_ids) From a45a601d287d0bf6f2cc6fcc4573b2f966bbb53d Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Sat, 19 Feb 2022 07:16:39 +0300 Subject: [PATCH 02/10] Update run_model_templates_tests.sh --- tests/run_model_templates_tests.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/run_model_templates_tests.sh b/tests/run_model_templates_tests.sh index a9bdbce5716..a721932d15e 100755 --- a/tests/run_model_templates_tests.sh +++ b/tests/run_model_templates_tests.sh @@ -1,5 +1,8 @@ python3 -m venv venv || exit 1 . venv/bin/activate || exit 1 + +pip cache purge + pip install --upgrade pip || exit 1 pip install -e ote_cli || exit 1 pip install -e $OTE_SDK_PATH || exit 1 From 2fb8e3cf766b1fe26453dc82460704baa0fca0e3 Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Sat, 19 Feb 2022 07:29:49 +0300 Subject: [PATCH 03/10] Update run_model_templates_tests.sh --- tests/run_model_templates_tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/run_model_templates_tests.sh b/tests/run_model_templates_tests.sh index a721932d15e..c6f843da65c 100755 --- a/tests/run_model_templates_tests.sh +++ b/tests/run_model_templates_tests.sh @@ -1,7 +1,9 @@ python3 -m venv venv || exit 1 . venv/bin/activate || exit 1 -pip cache purge +ls -la `pip cache dir`/ +rm -rf `pip cache dir`/ +ls -la `pip cache dir`/ pip install --upgrade pip || exit 1 pip install -e ote_cli || exit 1 From 3e50215a709b49d936d35304a2711168018d87da Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Sat, 19 Feb 2022 07:43:33 +0300 Subject: [PATCH 04/10] Update run_model_templates_tests.sh --- tests/run_model_templates_tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/run_model_templates_tests.sh b/tests/run_model_templates_tests.sh index c6f843da65c..9377587cc06 100755 --- a/tests/run_model_templates_tests.sh +++ b/tests/run_model_templates_tests.sh @@ -1,11 +1,12 @@ python3 -m venv venv || exit 1 . venv/bin/activate || exit 1 +pip install --upgrade pip || exit 1 + ls -la `pip cache dir`/ rm -rf `pip cache dir`/ ls -la `pip cache dir`/ -pip install --upgrade pip || exit 1 pip install -e ote_cli || exit 1 pip install -e $OTE_SDK_PATH || exit 1 echo "" From 29663386d42c06894322da2fcf3c1ea74a35ff48 Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Sat, 19 Feb 2022 07:57:05 +0300 Subject: [PATCH 05/10] Update run_model_templates_tests.sh --- tests/run_model_templates_tests.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/run_model_templates_tests.sh b/tests/run_model_templates_tests.sh index 9377587cc06..4db840edee9 100755 --- a/tests/run_model_templates_tests.sh +++ b/tests/run_model_templates_tests.sh @@ -7,17 +7,17 @@ ls -la `pip cache dir`/ rm -rf `pip cache dir`/ ls -la `pip cache dir`/ -pip install -e ote_cli || exit 1 -pip install -e $OTE_SDK_PATH || exit 1 -echo "" -echo "" +# pip install -e ote_cli || exit 1 +# pip install -e $OTE_SDK_PATH || exit 1 +# echo "" +# echo "" -export PYTHONPATH=${PYTHONPATH}:`pwd` -pytest tests/ote_cli/ -v --durations=0 || exit 1 -deactivate -echo "" -echo "" +# export PYTHONPATH=${PYTHONPATH}:`pwd` +# pytest tests/ote_cli/ -v --durations=0 || exit 1 +# deactivate +# echo "" +# echo "" -cd external/anomaly -. /tmp/ote_cli/ANOMALY_CLASSIFICATION/venv/bin/activate -pytest tests/ -v || exit 1 +# cd external/anomaly +# . /tmp/ote_cli/ANOMALY_CLASSIFICATION/venv/bin/activate +# pytest tests/ -v || exit 1 From 997e78936c77031fae602485be7492739934c71d Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Sat, 19 Feb 2022 08:10:56 +0300 Subject: [PATCH 06/10] Update run_model_templates_tests.sh --- tests/run_model_templates_tests.sh | 31 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/run_model_templates_tests.sh b/tests/run_model_templates_tests.sh index 4db840edee9..9e4d6637c66 100755 --- a/tests/run_model_templates_tests.sh +++ b/tests/run_model_templates_tests.sh @@ -1,23 +1,22 @@ python3 -m venv venv || exit 1 . venv/bin/activate || exit 1 - pip install --upgrade pip || exit 1 -ls -la `pip cache dir`/ -rm -rf `pip cache dir`/ -ls -la `pip cache dir`/ +# ls -la `pip cache dir`/ +# rm -rf `pip cache dir`/ +# ls -la `pip cache dir`/ -# pip install -e ote_cli || exit 1 -# pip install -e $OTE_SDK_PATH || exit 1 -# echo "" -# echo "" +pip install -e ote_cli || exit 1 +pip install -e $OTE_SDK_PATH || exit 1 +echo "" +echo "" -# export PYTHONPATH=${PYTHONPATH}:`pwd` -# pytest tests/ote_cli/ -v --durations=0 || exit 1 -# deactivate -# echo "" -# echo "" +export PYTHONPATH=${PYTHONPATH}:`pwd` +pytest tests/ote_cli/ -v --durations=0 || exit 1 +deactivate +echo "" +echo "" -# cd external/anomaly -# . /tmp/ote_cli/ANOMALY_CLASSIFICATION/venv/bin/activate -# pytest tests/ -v || exit 1 +cd external/anomaly +. /tmp/ote_cli/ANOMALY_CLASSIFICATION/venv/bin/activate +pytest tests/ -v || exit 1 From 8fbc8685626decdf54c558519a11193ec2ef29db Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Sun, 20 Feb 2022 08:39:18 +0300 Subject: [PATCH 07/10] Update run_model_templates_tests.sh --- tests/run_model_templates_tests.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/run_model_templates_tests.sh b/tests/run_model_templates_tests.sh index 9e4d6637c66..8e046d25b1c 100755 --- a/tests/run_model_templates_tests.sh +++ b/tests/run_model_templates_tests.sh @@ -2,9 +2,8 @@ python3 -m venv venv || exit 1 . venv/bin/activate || exit 1 pip install --upgrade pip || exit 1 -# ls -la `pip cache dir`/ -# rm -rf `pip cache dir`/ -# ls -la `pip cache dir`/ +pip cache purge +ls -la `pip cache dir`/ pip install -e ote_cli || exit 1 pip install -e $OTE_SDK_PATH || exit 1 From 205ae0ef439a8d0ae5054080f2adac8ec3892864 Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Sun, 20 Feb 2022 08:40:19 +0300 Subject: [PATCH 08/10] Update run_model_templates_tests.sh --- tests/run_model_templates_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run_model_templates_tests.sh b/tests/run_model_templates_tests.sh index 8e046d25b1c..6d7a5f1e38e 100755 --- a/tests/run_model_templates_tests.sh +++ b/tests/run_model_templates_tests.sh @@ -11,7 +11,7 @@ echo "" echo "" export PYTHONPATH=${PYTHONPATH}:`pwd` -pytest tests/ote_cli/ -v --durations=0 || exit 1 +pytest tests/ote_cli/ -v -s --durations=0 || exit 1 deactivate echo "" echo "" From e5eac293129bf2962829de93390c420798e9903b Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Mon, 21 Feb 2022 08:16:45 +0300 Subject: [PATCH 09/10] Update run_model_templates_tests.sh --- tests/run_model_templates_tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/run_model_templates_tests.sh b/tests/run_model_templates_tests.sh index 6d7a5f1e38e..1324cffec0e 100755 --- a/tests/run_model_templates_tests.sh +++ b/tests/run_model_templates_tests.sh @@ -2,8 +2,8 @@ python3 -m venv venv || exit 1 . venv/bin/activate || exit 1 pip install --upgrade pip || exit 1 -pip cache purge -ls -la `pip cache dir`/ +# pip cache purge +# ls -la `pip cache dir`/ pip install -e ote_cli || exit 1 pip install -e $OTE_SDK_PATH || exit 1 @@ -11,7 +11,7 @@ echo "" echo "" export PYTHONPATH=${PYTHONPATH}:`pwd` -pytest tests/ote_cli/ -v -s --durations=0 || exit 1 +pytest tests/ote_cli/ -v --durations=0 || exit 1 deactivate echo "" echo "" From 6d9d042279f04b66364a04745c38f8e4405e54b3 Mon Sep 17 00:00:00 2001 From: Ilya Krylov Date: Mon, 21 Feb 2022 08:13:52 +0300 Subject: [PATCH 10/10] updated dor --- external/deep-object-reid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/deep-object-reid b/external/deep-object-reid index 481396ce0dc..1abd68b027b 160000 --- a/external/deep-object-reid +++ b/external/deep-object-reid @@ -1 +1 @@ -Subproject commit 481396ce0dcb009b04c6232ad1d982d66a9a2858 +Subproject commit 1abd68b027b94014d08e9ea18c2cfbb0824969d9