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

Fixed multi-config generators (#17003)

Browse Source
This commit is contained in:
Ilya Lavrenov 2023-04-18 02:44:38 +04:00 committed by GitHub
parent 3f9cc0112a
commit d15cdc81cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/test_model_zoo.cmake
View File

@ -42,11 +42,12 @@ function(ov_model_convert SRC DST OUT)
endif() endif()
set(full_out_name "${DST}/${rel_out_name}") set(full_out_name "${DST}/${rel_out_name}")
file(MAKE_DIRECTORY "${DST}/${rel_dir}")
if(ext STREQUAL ".prototxt") if(ext STREQUAL ".prototxt")
# convert .prototxt models to .onnx binary # convert .prototxt models to .onnx binary
add_custom_command(OUTPUT ${full_out_name} add_custom_command(OUTPUT ${full_out_name}
COMMAND ${CMAKE_COMMAND} -E make_directory
"${DST}/${rel_dir}"
COMMAND ${PYTHON_EXECUTABLE} ${onnx_gen_script} COMMAND ${PYTHON_EXECUTABLE} ${onnx_gen_script}
"${SRC}/${in_file}" ${full_out_name} "${SRC}/${in_file}" ${full_out_name}
DEPENDS ${onnx_gen_script} "${SRC}/${in_file}" DEPENDS ${onnx_gen_script} "${SRC}/${in_file}"
@ -55,6 +56,8 @@ function(ov_model_convert SRC DST OUT)
WORKING_DIRECTORY "${model_source_dir}") WORKING_DIRECTORY "${model_source_dir}")
else() else()
add_custom_command(OUTPUT ${full_out_name} add_custom_command(OUTPUT ${full_out_name}
COMMAND ${CMAKE_COMMAND} -E make_directory
"${DST}/${rel_dir}"
COMMAND "${CMAKE_COMMAND}" -E copy_if_different COMMAND "${CMAKE_COMMAND}" -E copy_if_different
"${SRC}/${in_file}" ${full_out_name} "${SRC}/${in_file}" ${full_out_name}
DEPENDS ${onnx_gen_script} "${SRC}/${in_file}" DEPENDS ${onnx_gen_script} "${SRC}/${in_file}"
@ -68,7 +71,7 @@ function(ov_model_convert SRC DST OUT)
set(${OUT} ${files} PARENT_SCOPE) set(${OUT} ${files} PARENT_SCOPE)
endfunction() endfunction()
if(OV_GENERATOR_MULTI_CONFIG) if(OV_GENERATOR_MULTI_CONFIG AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
set(test_model_zoo_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/test_model_zoo") set(test_model_zoo_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/test_model_zoo")
else() else()
set(test_model_zoo_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo") set(test_model_zoo_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo")