From 4b66fbfe21c3b17499c428ec0b4da978d588804b Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 15 Dec 2023 18:15:52 +0400 Subject: [PATCH] Revert "[TFLite] Allows failing when model isn't generated (#21621)" (#21701) This reverts commit 8c634ce4b0d5699db74705a4eddca58055c056b0. --- .../test_models/gen_scripts/generate_pose_detector.py | 7 +------ .../tensorflow_lite/tests/test_models/gen_wrapper.py | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/frontends/tensorflow_lite/tests/test_models/gen_scripts/generate_pose_detector.py b/src/frontends/tensorflow_lite/tests/test_models/gen_scripts/generate_pose_detector.py index d2d976f9eee..4ee4d4636c8 100644 --- a/src/frontends/tensorflow_lite/tests/test_models/gen_scripts/generate_pose_detector.py +++ b/src/frontends/tensorflow_lite/tests/test_models/gen_scripts/generate_pose_detector.py @@ -9,7 +9,6 @@ import sys import urllib.request import zipfile -src_url = "https://storage.googleapis.com/mediapipe-models/pose_landmarker/pose_landmarker_lite/float16/latest/pose_landmarker_lite.task" path_to_model_dir = os.path.join(sys.argv[1], "downloads") tflite_file_name = 'pose_detector.tflite' tflite_model_path = os.path.join(path_to_model_dir, tflite_file_name) @@ -19,11 +18,7 @@ if not os.path.exists(path_to_model_dir): os.makedirs(path_to_model_dir, exist_ok=True) if not os.path.exists(tflite_model_path): if not os.path.exists(task_file_path): - try: - urllib.request.urlretrieve(src_url, task_file_path) - except: - print(f"ERROR: Cannot download model archive, try to download it manually from {src_url} and place to {task_file_path}") - exit(2) + urllib.request.urlretrieve("https://storage.googleapis.com/mediapipe-models/pose_landmarker/pose_landmarker_lite/float16/latest/pose_landmarker_lite.task", task_file_path) with zipfile.ZipFile(task_file_path, "r") as f: f.extract(tflite_file_name, path_to_model_dir) diff --git a/src/frontends/tensorflow_lite/tests/test_models/gen_wrapper.py b/src/frontends/tensorflow_lite/tests/test_models/gen_wrapper.py index 324e45702eb..98fd235ff8b 100644 --- a/src/frontends/tensorflow_lite/tests/test_models/gen_wrapper.py +++ b/src/frontends/tensorflow_lite/tests/test_models/gen_wrapper.py @@ -14,11 +14,7 @@ out_folder = sys.argv[2] mark_file = sys.argv[3] assert gen_script.endswith('.py'), "Unexpected script: " + gen_script -try: - subprocess.run([sys.executable, gen_script, out_folder], env=os.environ, check=True) -except subprocess.CalledProcessError as cpe: - if cpe.returncode == 2: - exit(2) +subprocess.run([sys.executable, gen_script, out_folder], env=os.environ) # Create mark file indicating that script was executed with open(mark_file, "w") as fp: