diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2019-10-24 19:00:57 +0000 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2019-10-25 10:05:14 +0800 |
commit | 1a669124ecfa4bcd9182cde2ea0465b8f62305e9 (patch) | |
tree | df4ef565f85cdc55912627c15a32dc6e9ea88df4 /dynamic-layers/openembedded-layer/recipes-support/opencv/files | |
parent | c66d4837720eaa27e59eaad784b0f1eebbc8ba30 (diff) | |
download | meta-intel-1a669124ecfa4bcd9182cde2ea0465b8f62305e9.tar.gz |
dldt-inference-engine: use firmware files from SRC_URI
* use the files from SRC_URI instead of fetching them during
configure
* use the firmware files CMake would download during configure
when not provided already, I haven't found any changelog to
find out what's the difference between
firmware_ma2x8x_784.zip firmware_ma2x8x_mdk_R9.8.zip
firmware_ma2450_759W.zip firmware_ma2450_784.zip
firmware_mv0262_784.zip firmware_mv0262_mdk_R9.8.zip
so to be safe use whatever CMake does and what I was testing
on raspberrypi4 before (because of missing this fix).
-- Downloading from https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2450_759W.zip to dldt-inference-engine/2019r3-r0/git/inference-engine/temp/download/firmware_ma2450_759W.zip ...
-- Downloading from https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_ma2x8x_mdk_R9.8.zip to dldt-inference-engine/2019r3-r0/git/inference-engine/temp/download/firmware_ma2x8x_mdk_R9.8.zip ...
-- Downloading from https://download.01.org/opencv/2019/openvinotoolkit/R3/inference_engine/firmware_mv0262_mdk_R9.8.zip to dldt-inference-engine/2019r3-r0/git/inference-engine/temp/download/firmware_mv0262_mdk_R9.8.zip ...
* add PACKAGECONFIG verbose for VERBOSE_BUILD so it's easier
to debug which firmware files are being used, in this case:
log.do_configure will show:
-- ma2450=../mvnc/MvNCAPI-ma2450.mvcmd
-- ma2x8x=../mvnc/MvNCAPI-ma2x8x.mvcmd
-- mv0262=../mvnc/MvNCAPI-mv0262.mvcmd
* the patch is very loosely based on the patch removed here:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/diff/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch?id=649456856dc38086e7d43d740d68198e3395b067
but I've reworked it competely to simplify this mess :)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch new file mode 100644 index 00000000..a4c75ff3 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0008-Simplify-searching-for-firmware-files.patch | |||
@@ -0,0 +1,104 @@ | |||
1 | From 1f6f05ae4d3fba95ccc34a4622d06b9d2bf88e80 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 27 Sep 2019 11:34:36 +0800 | ||
4 | Subject: [PATCH] Simplify searching for firmware files | ||
5 | |||
6 | Disable runtime fetching when VPU_FIRMWARE_*_FILE variables are defined | ||
7 | and point to already fetched firmware instead. | ||
8 | |||
9 | Do it all in one foreach loop. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/opencv/dldt/pull/302] | ||
12 | |||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | inference-engine/cmake/vpu_dependencies.cmake | 63 ++++++------------- | ||
16 | 1 file changed, 20 insertions(+), 43 deletions(-) | ||
17 | |||
18 | diff --git a/inference-engine/cmake/vpu_dependencies.cmake b/inference-engine/cmake/vpu_dependencies.cmake | ||
19 | index 1550163d..e0bc844e 100644 | ||
20 | --- a/inference-engine/cmake/vpu_dependencies.cmake | ||
21 | +++ b/inference-engine/cmake/vpu_dependencies.cmake | ||
22 | @@ -4,52 +4,29 @@ | ||
23 | |||
24 | set(VPU_SUPPORTED_SOC ma2450 ma2x8x mv0262) | ||
25 | |||
26 | -# | ||
27 | -# Default firmware packages | ||
28 | -# | ||
29 | - | ||
30 | -RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2450 | ||
31 | - ARCHIVE_UNIFIED firmware_ma2450_759W.zip | ||
32 | - TARGET_PATH "${TEMP}/vpu/firmware/ma2450" | ||
33 | - ENVIRONMENT "VPU_FIRMWARE_MA2450" | ||
34 | - FOLDER) | ||
35 | -debug_message(STATUS "ma2450=" ${VPU_FIRMWARE_MA2450}) | ||
36 | - | ||
37 | -RESOLVE_DEPENDENCY(VPU_FIRMWARE_MV0262 | ||
38 | - ARCHIVE_UNIFIED firmware_mv0262_mdk_R9.8.zip | ||
39 | - TARGET_PATH "${TEMP}/vpu/firmware/mv0262" | ||
40 | - ENVIRONMENT "VPU_FIRMWARE_MV0262" | ||
41 | - FOLDER) | ||
42 | -debug_message(STATUS "mv0262=" ${VPU_FIRMWARE_MV0262}) | ||
43 | - | ||
44 | -RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2X8X | ||
45 | - ARCHIVE_UNIFIED firmware_ma2x8x_mdk_R9.8.zip | ||
46 | - TARGET_PATH "${TEMP}/vpu/firmware/ma2x8x" | ||
47 | - ENVIRONMENT "VPU_FIRMWARE_MA2X8X" | ||
48 | - FOLDER) | ||
49 | -debug_message(STATUS "ma2x8x=" ${VPU_FIRMWARE_MA2X8X}) | ||
50 | - | ||
51 | -# | ||
52 | -# CMake variables to override default firmware files | ||
53 | -# | ||
54 | - | ||
55 | foreach(soc IN LISTS VPU_SUPPORTED_SOC) | ||
56 | string(TOUPPER "${soc}" soc_upper) | ||
57 | - set(var_name VPU_FIRMWARE_${soc_upper}_FILE) | ||
58 | + set(var_name_file VPU_FIRMWARE_${soc_upper}_FILE) | ||
59 | + set(var_name VPU_FIRMWARE_${soc_upper}) | ||
60 | + set(var_name_zip firmware_${soc}_mdk_R9.8.zip) | ||
61 | + if(${soc} STREQUAL "ma2450") | ||
62 | + set(var_name_zip firmware_${soc}_759W.zip) | ||
63 | + endif() | ||
64 | |||
65 | - find_file(${var_name} MvNCAPI-${soc}.mvcmd "${VPU_FIRMWARE_${soc_upper}}/mvnc") | ||
66 | - if(NOT ${var_name}) | ||
67 | - message(FATAL_ERROR "[VPU] Missing ${soc} firmware") | ||
68 | + if(NOT DEFINED ${var_name_file}) | ||
69 | + RESOLVE_DEPENDENCY(${var_name} | ||
70 | + ARCHIVE_UNIFIED ${var_name_zip} | ||
71 | + TARGET_PATH "${TEMP}/vpu/firmware/${soc}" | ||
72 | + ENVIRONMENT "${var_name}" | ||
73 | + FOLDER) | ||
74 | + find_file(${var_name_file} NAMES "MvNCAPI-${soc}.mvcmd" PATHS "${VPU_FIRMWARE_${soc_upper}}/mvnc" NO_CMAKE_FIND_ROOT_PATH) | ||
75 | endif() | ||
76 | -endforeach() | ||
77 | |||
78 | -# | ||
79 | -# `vpu_copy_firmware` CMake target | ||
80 | -# | ||
81 | + if(NOT ${var_name_file}) | ||
82 | + message(FATAL_ERROR "[VPU] Missing ${soc} firmware, MvNCAPI-${soc}.mvcmd not found in ${VPU_FIRMWARE_${soc_upper}}/mvnc env $ENV{${var_name}} ") | ||
83 | + endif() | ||
84 | |||
85 | -foreach(soc IN LISTS VPU_SUPPORTED_SOC) | ||
86 | - string(TOUPPER "${soc}" soc_upper) | ||
87 | - set(var_name VPU_FIRMWARE_${soc_upper}_FILE) | ||
88 | + debug_message(STATUS "${soc}=" ${${var_name_file}}) | ||
89 | |||
90 | set(firmware_out_file "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/MvNCAPI-${soc}.mvcmd") | ||
91 | list(APPEND all_firmware_files ${firmware_out_file}) | ||
92 | @@ -57,9 +34,9 @@ foreach(soc IN LISTS VPU_SUPPORTED_SOC) | ||
93 | add_custom_command( | ||
94 | OUTPUT ${firmware_out_file} | ||
95 | COMMAND | ||
96 | - ${CMAKE_COMMAND} -E copy ${${var_name}} ${firmware_out_file} | ||
97 | - MAIN_DEPENDENCY ${${var_name}} | ||
98 | - COMMENT "[VPU] Copy ${${var_name}} to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" | ||
99 | + ${CMAKE_COMMAND} -E copy ${${var_name_file}} ${firmware_out_file} | ||
100 | + MAIN_DEPENDENCY ${${var_name_file}} | ||
101 | + COMMENT "[VPU] Copy ${${var_name_file}} to ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" | ||
102 | VERBATIM) | ||
103 | endforeach() | ||
104 | |||