- Cleanup config file for subgraph runtime - Remove previous patches (now merged)
Signed-off-by: Yuan Zhao <[email protected]> --- ...001-Fix-versioning-for-shared-libary.patch | 55 ------------------- ...p-2-group-layer-use-cases-with-1-dsp.patch | 34 ------------ .../recipes-ti/tidl-api/tidl-api.inc | 4 +- .../recipes-ti/tidl-api/tidl-api_git.bb | 3 +- .../recipes-ti/tidl-api/tidl-examples_git.bb | 4 +- 5 files changed, 5 insertions(+), 95 deletions(-) delete mode 100644 meta-arago-extras/recipes-ti/tidl-api/files/0001-Fix-versioning-for-shared-libary.patch delete mode 100644 meta-arago-extras/recipes-ti/tidl-api/files/0002-replace-2-dsp-2-group-layer-use-cases-with-1-dsp.patch diff --git a/meta-arago-extras/recipes-ti/tidl-api/files/0001-Fix-versioning-for-shared-libary.patch b/meta-arago-extras/recipes-ti/tidl-api/files/0001-Fix-versioning-for-shared-libary.patch deleted file mode 100644 index d15389b8..00000000 --- a/meta-arago-extras/recipes-ti/tidl-api/files/0001-Fix-versioning-for-shared-libary.patch +++ /dev/null @@ -1,55 +0,0 @@ -tidl-api: Fix versioning for shared libary - - SONAME needs to be properly set up in the generated shared library. - -Upstream-Status: Submitted - -Signed-off-by: Yuan Zhao <[email protected]> ---- - tidl_api/Makefile | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/tidl_api/Makefile b/tidl_api/Makefile -index a04e604..3a5ea69 100644 ---- a/tidl_api/Makefile -+++ b/tidl_api/Makefile -@@ -37,6 +37,8 @@ all: $(LIB_NAME) $(LIB_IMGUTIL_NAME) $(PY_LIB_NAME) \ - include make.inc - include make.buildid - -+SO_VER=$(MAJOR_VER).$(MINOR_VER).$(PATCH_VER) -+ - RM = rm - AR = ar - -@@ -95,7 +97,10 @@ $(LIB_NAME): $(HOST_OBJ_FILES) - $(AR) cr $@ $(HOST_OBJ_FILES) - - $(SHARED_LIB_NAME): $(HOST_OBJ_FILES) -- $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared -lOpenCL $(HOST_OBJ_FILES) -o $@ -+ $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared -Wl,-soname,$@.$(MAJOR_VER) \ -+ -lOpenCL $(HOST_OBJ_FILES) -o $@.$(SO_VER) -+ ln -sf $@.$(SO_VER) $@.$(MAJOR_VER) -+ ln -sf $@.$(MAJOR_VER) $@ - - $(PY_LIB_NAME): $(HOST_OBJ_PYBIND_FILES) $(LIB_NAME) - $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared -lOpenCL -locl_util $^ -o $@ -@@ -104,10 +109,14 @@ $(LIB_IMGUTIL_NAME): $(HOST_OBJ_IMGUTIL_FILES) - $(AR) cr $@ $(HOST_OBJ_IMGUTIL_FILES) - - $(SHARED_LIB_IMGUTIL_NAME): $(HOST_OBJ_IMGUTIL_FILES) -- $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared $(HOST_OBJ_IMGUTIL_FILES) -o $@ -+ $(CXX) $(CXXFLAGS) -Wl,-Bsymbolic -shared -Wl,-soname,$@.$(MAJOR_VER) \ -+ $(HOST_OBJ_IMGUTIL_FILES) -o $@.$(SO_VER) -+ ln -sf $@.$(SO_VER) $@.$(MAJOR_VER) -+ ln -sf $@.$(MAJOR_VER) $@ - - clean:: - $(RM) -f $(LIB_NAME) $(PY_LIB_NAME) - $(RM) -f $(LIB_IMGUTIL_NAME) -+ $(RM) -f $(SHARED_LIB_NAME)* $(SHARED_LIB_IMGUTIL_NAME)* - $(RM) -rf obj - --- -2.17.1 - diff --git a/meta-arago-extras/recipes-ti/tidl-api/files/0002-replace-2-dsp-2-group-layer-use-cases-with-1-dsp.patch b/meta-arago-extras/recipes-ti/tidl-api/files/0002-replace-2-dsp-2-group-layer-use-cases-with-1-dsp.patch deleted file mode 100644 index 0c78ccf0..00000000 --- a/meta-arago-extras/recipes-ti/tidl-api/files/0002-replace-2-dsp-2-group-layer-use-cases-with-1-dsp.patch +++ /dev/null @@ -1,34 +0,0 @@ -tidl-api: replace 2 dsp + 2 group layer use cases with 1 dsp - - The BBAI only has enough CMEM for 4 EVEs, 1 DSP, and 2 group - layers. In the case of all of our networks, the difference between - 1 and 2 dsps is essentially nonexistent. (PLSDK-3189) - -Upstream-Status: Accepted - -Signed-off-by: Caleb Robey <[email protected]> -Signed-off-by: Yuan Zhao <[email protected]> ---- - examples/mcbench/scripts/all_5729.sh | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/examples/mcbench/scripts/all_5729.sh b/examples/mcbench/scripts/all_5729.sh -index defec72..0fee8a1 100755 ---- a/examples/mcbench/scripts/all_5729.sh -+++ b/examples/mcbench/scripts/all_5729.sh -@@ -7,8 +7,7 @@ export TIDL_NETWORK_HEAP_SIZE_DSP=56623104 - export TIDL_NETWORK_HEAP_SIZE_EVE=67108864 - export TIDL_NETWORK_HEAP_SIZE_DSP=8388608 - ./mcbench -g 2 -d 1 -e 4 -c ../test/testvecs/config/infer/tidl_config_mobileNet1_lg2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y --./mcbench -g 2 -d 2 -e 4 -c ../test/testvecs/config/infer/tidl_config_mobileNet1_lg2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y --./mcbench -g 2 -d 2 -e 4 -c ../test/testvecs/config/infer/tidl_config_mobileNet2_lg2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y --./mcbench -g 2 -d 2 -e 4 -c ../test/testvecs/config/infer/tidl_config_inceptionNetv1_lg2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y --./mcbench -g 2 -d 2 -e 4 -c ../test/testvecs/config/infer/tidl_config_j11_v2_lg2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y --./mcbench -g 2 -d 2 -e 4 -c ../test/testvecs/config/infer/tidl_config_j11_v2_dense_lg2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y -+./mcbench -g 2 -d 1 -e 4 -c ../test/testvecs/config/infer/tidl_config_mobileNet2_lg2.txt -f 50 -i ../test/testvecs/input/preproc_2_224x224_multi.y -+./mcbench -g 2 -d 1 -e 4 -c ../test/testvecs/config/infer/tidl_config_inceptionNetv1_lg2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y -+./mcbench -g 2 -d 1 -e 4 -c ../test/testvecs/config/infer/tidl_config_j11_v2_lg2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y -+./mcbench -g 2 -d 1 -e 4 -c ../test/testvecs/config/infer/tidl_config_j11_v2_dense_lg2.txt -f 50 -i ../test/testvecs/input/preproc_0_224x224_multi.y --- -2.17.1 - diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc b/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc index 116928ab..c45b33fb 100644 --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc +++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc @@ -1,4 +1,4 @@ -PV = "1.4.0" +PV = "1.5.0" INC_PR = "r0" LIC_FILES_CHKSUM = "file://license.txt;md5=e3daeabffb9fc131a73f16d16cbdb118" @@ -8,7 +8,7 @@ GIT_PROTOCOL = "git" BRANCH = "master" SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${BRANCH}" -SRCREV = "21faf4b36a0ae9ee5b5c6aaf90d067728ff4f78b" +SRCREV = "eeb4c457c8881a81fbf59a60b2ee070d2450a935" # default patchdir is ${S} S = "${WORKDIR}/git" diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb index c96fa337..4dd8c685 100644 --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb +++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-api_git.bb @@ -6,8 +6,7 @@ LICENSE = "BSD" include tidl-api.inc require recipes-ti/includes/ti-paths.inc -PR = "${INC_PR}.1" -SRC_URI += "file://0001-Fix-versioning-for-shared-libary.patch" +PR = "${INC_PR}.0" COMPATIBLE_MACHINE = "dra7xx" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb b/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb index e5afad1c..d59ee405 100644 --- a/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb +++ b/meta-arago-extras/recipes-ti/tidl-api/tidl-examples_git.bb @@ -6,8 +6,7 @@ LICENSE = "BSD" include tidl-api.inc require recipes-ti/includes/ti-paths.inc -PR = "${INC_PR}.1" -SRC_URI += "file://0002-replace-2-dsp-2-group-layer-use-cases-with-1-dsp.patch" +PR = "${INC_PR}.0" COMPATIBLE_MACHINE = "dra7xx" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -23,6 +22,7 @@ RDEPENDS_${PN} += "tidl-api \ opencl-runtime \ opencv \ json-c \ + python3-core \ " EXTRA_OEMAKE = " -C ${S}/examples \ -- 2.24.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
