From 0880a7d4afb6a2f2e97657ccf7e3d623dd6e107f Mon Sep 17 00:00:00 2001
From: Mikhail Nosov <mikhail.nosov@intel.com>
Date: Wed, 27 Oct 2021 16:06:04 +0300
Subject: [PATCH] PDPD: Revert 'Four Jobs' pool usage (#7912)

* Put JOB_POOL after comments

* Revert "Put JOB_POOL after comments"

This reverts commit a8fc4c64e5ad308d09c5defb82a8a74cf7d92ec4.

* Revert "Use jobs pool for PDPD model conversion as well (#7602)"

This reverts commit 13904402562e5a7dbb05dcdb3ecf45148725bdc1.

Co-authored-by: Alexander Zhogov <alexander.zhogov@intel.com>
---
 .../test/frontend/paddlepaddle/CMakeLists.txt | 27 +++++++------------
 .../paddlepaddle/test_models/gen_wrapper.py   | 24 ++++++++++-------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/ngraph/test/frontend/paddlepaddle/CMakeLists.txt b/ngraph/test/frontend/paddlepaddle/CMakeLists.txt
index 2adb7128c7b..dc29868bd0e 100644
--- a/ngraph/test/frontend/paddlepaddle/CMakeLists.txt
+++ b/ngraph/test/frontend/paddlepaddle/CMakeLists.txt
@@ -29,24 +29,17 @@ target_compile_definitions(${TARGET_NAME} PRIVATE -D TEST_PADDLE_MODELS_DIRNAME=
 # 'paddlepaddle' installed to check code style
 if (paddlepaddle_FOUND)
     set(TEST_PADDLE_MODELS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_PADDLE_MODELS_DIRNAME}/)
-    set(GEN_WRAPPER ${CMAKE_CURRENT_SOURCE_DIR}/test_models/gen_wrapper.py)
-    file(GLOB_RECURSE PADDLE_GEN_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/test_models/gen_scripts/generate_*.py)
 
-    foreach(GEN_SCRIPT ${PADDLE_GEN_SCRIPTS})
-        get_filename_component(FILE_WE ${GEN_SCRIPT} NAME_WE)
-        set(OUT_DONE_FILE ${TEST_PADDLE_MODELS}/${FILE_WE}_done.txt)
-        list(APPEND OUT_FILES ${OUT_DONE_FILE})
-        add_custom_command(OUTPUT ${OUT_DONE_FILE}
-                COMMAND ${PYTHON_EXECUTABLE}
-                    ${GEN_WRAPPER}
-                    ${GEN_SCRIPT}
-                    ${TEST_PADDLE_MODELS}
-                    ${OUT_DONE_FILE}
-                DEPENDS ${GEN_WRAPPER} ${GEN_SCRIPT}
-                JOB_POOL four_jobs
-                COMMENT "Running ${FILE_WE}.py to generate PDPD model")
-    endforeach()
-    add_custom_target(paddlepaddle_test_models DEPENDS ${OUT_FILES})
+    file(GLOB_RECURSE PADDLE_ALL_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/*.py)
+    set(OUT_FILE ${TEST_PADDLE_MODELS}/generate_done.txt)
+    add_custom_command(OUTPUT ${OUT_FILE}
+            COMMAND ${PYTHON_EXECUTABLE}
+            ${CMAKE_CURRENT_SOURCE_DIR}/test_models/gen_wrapper.py
+            ${CMAKE_CURRENT_SOURCE_DIR}/test_models/gen_scripts
+            ${TEST_PADDLE_MODELS}
+            DEPENDS ${PADDLE_ALL_SCRIPTS}
+            )
+    add_custom_target(paddlepaddle_test_models DEPENDS ${OUT_FILE})
 
     install(DIRECTORY ${TEST_PADDLE_MODELS}
             DESTINATION tests/${TEST_PADDLE_MODELS_DIRNAME}
diff --git a/ngraph/test/frontend/paddlepaddle/test_models/gen_wrapper.py b/ngraph/test/frontend/paddlepaddle/test_models/gen_wrapper.py
index d7db534a5b9..fc860357ce7 100644
--- a/ngraph/test/frontend/paddlepaddle/test_models/gen_wrapper.py
+++ b/ngraph/test/frontend/paddlepaddle/test_models/gen_wrapper.py
@@ -1,19 +1,25 @@
+import glob
 import os
 import subprocess
-
 import sys
 
-# print(sys.argv)
-if len(sys.argv) < 4:
-    print("Script, output folder and mark file must be specified as arguments")
-    exit(1)
+print(sys.argv)
+if len(sys.argv) < 3:
+    print("Gen folder and output folder must be specified as arguments")
+    sys.exit(1)
 
-gen_script = sys.argv[1]
+gen_folder = sys.argv[1]
 out_folder = sys.argv[2]
-mark_file = sys.argv[3]
+mark_file = os.path.join(out_folder, "generate_done.txt")
 
-# print("Processing: {} ".format(gen_script))
-subprocess.run([sys.executable, gen_script, out_folder], env=os.environ)
+gen_files = glob.glob(os.path.join(gen_folder, '**/generate_*.py'), recursive=True)
+
+for gen_script in gen_files:
+    print("Processing: {} ".format(gen_script))
+    status = subprocess.run([sys.executable, gen_script, out_folder], env=os.environ)
+    if status.returncode != 0:
+        print("ERROR: PaddlePaddle model gen script FAILED: {}".format(gen_script))
+        sys.exit(1)
 
 # Create mark file indicating that script was executed
 with open(mark_file, "w") as fp: