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

PDPD: Revert 'Four Jobs' pool usage (#7912)

Browse Source 
* Put JOB_POOL after comments

* Revert "Put JOB_POOL after comments"

This reverts commit a8fc4c64e5.

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

This reverts commit 1390440256.

Co-authored-by: Alexander Zhogov <alexander.zhogov@intel.com>
This commit is contained in:
Mikhail Nosov 2021-10-27 16:06:04 +03:00 committed by GitHub
parent e481758f73
commit 0880a7d4af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ngraph/test/frontend/paddlepaddle/CMakeLists.txt
View File

@ -29,24 +29,17 @@ target_compile_definitions(${TARGET_NAME} PRIVATE -D TEST_PADDLE_MODELS_DIRNAME=
# 'paddlepaddle' installed to check code style # 'paddlepaddle' installed to check code style
if (paddlepaddle_FOUND) if (paddlepaddle_FOUND)
set(TEST_PADDLE_MODELS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_PADDLE_MODELS_DIRNAME}/) 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}) file(GLOB_RECURSE PADDLE_ALL_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/*.py)
get_filename_component(FILE_WE ${GEN_SCRIPT} NAME_WE) set(OUT_FILE ${TEST_PADDLE_MODELS}/generate_done.txt)
set(OUT_DONE_FILE ${TEST_PADDLE_MODELS}/${FILE_WE}_done.txt) add_custom_command(OUTPUT ${OUT_FILE}
list(APPEND OUT_FILES ${OUT_DONE_FILE})
add_custom_command(OUTPUT ${OUT_DONE_FILE}
COMMAND ${PYTHON_EXECUTABLE} COMMAND ${PYTHON_EXECUTABLE}
${GEN_WRAPPER} ${CMAKE_CURRENT_SOURCE_DIR}/test_models/gen_wrapper.py
${GEN_SCRIPT} ${CMAKE_CURRENT_SOURCE_DIR}/test_models/gen_scripts
${TEST_PADDLE_MODELS} ${TEST_PADDLE_MODELS}
${OUT_DONE_FILE} DEPENDS ${PADDLE_ALL_SCRIPTS}
DEPENDS ${GEN_WRAPPER} ${GEN_SCRIPT} )
JOB_POOL four_jobs add_custom_target(paddlepaddle_test_models DEPENDS ${OUT_FILE})
COMMENT "Running ${FILE_WE}.py to generate PDPD model")
endforeach()
add_custom_target(paddlepaddle_test_models DEPENDS ${OUT_FILES})
install(DIRECTORY ${TEST_PADDLE_MODELS} install(DIRECTORY ${TEST_PADDLE_MODELS}
DESTINATION tests/${TEST_PADDLE_MODELS_DIRNAME} DESTINATION tests/${TEST_PADDLE_MODELS_DIRNAME}

24
ngraph/test/frontend/paddlepaddle/test_models/gen_wrapper.py
View File

@ -1,19 +1,25 @@
import glob
import os import os
import subprocess import subprocess
import sys import sys
# print(sys.argv) print(sys.argv)
if len(sys.argv) < 4: if len(sys.argv) < 3:
print("Script, output folder and mark file must be specified as arguments") print("Gen folder and output folder must be specified as arguments")
exit(1) sys.exit(1)
gen_script = sys.argv[1] gen_folder = sys.argv[1]
out_folder = sys.argv[2] 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)) gen_files = glob.glob(os.path.join(gen_folder, '**/generate_*.py'), recursive=True)
subprocess.run([sys.executable, gen_script, out_folder], env=os.environ)
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 # Create mark file indicating that script was executed
with open(mark_file, "w") as fp: with open(mark_file, "w") as fp: