Jianzhong Xu
2018-12-05 18:58:03 UTC
Signed-off-by: Jianzhong Xu <***@ti.com>
---
.../nativesdk-packagegroup-arago-sdk-host.bb | 1 +
.../recipes-ti/tidl-utils/tidl-import.bb | 43 ++++++++++++++++++++++
.../recipes-ti/tidl-utils/tidl-utils.bb | 7 ++--
.../recipes-ti/tidl-utils/tidl-utils.inc | 5 +++
4 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 meta-arago-extras/recipes-ti/tidl-utils/tidl-import.bb
create mode 100644 meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc
diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb
index 4f8e62b..53cf9b1 100644
--- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb
@@ -11,6 +11,7 @@ EXTRA_TI_TOOLS = " \
nativesdk-ti-cgt-pru \
nativesdk-clocl \
nativesdk-clacc \
+ nativesdk-tidl-import \
"
RDEPENDS_${PN} = "\
diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import.bb b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import.bb
new file mode 100644
index 0000000..30bfa2e
--- /dev/null
+++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import.bb
@@ -0,0 +1,43 @@
+SUMMARY = " TIDL import tool for conversion of Caffe and TF models into TI custom network format "
+DESCRIPTION = "TIDL import tool is using protobuf to read and parse information from external network models \
+ This is ARM Linux implementation."
+
+require ./tidl-utils.inc
+
+LICENSE = "BSD-3"
+LIC_FILES_CHKSUM = "file://modules/ti_dl/inc/itidl_ti.h;md5=7baa68fec0aadbac92c3b41b283d26c4"
+
+PV = "01.00.00.00"
+PR = "r1"
+
+S = "${WORKDIR}/git/src/importTool/"
+
+DEPENDS=" protobuf zlib protobuf-native"
+
+EXTRA_OEMAKE += "TIARM_TOOLS=${GCC_ARM_NONE_TOOLCHAIN} "
+EXTRA_OEMAKE += "XDAIS_PATH=${XDAIS_INSTALL_DIR} "
+EXTRA_OEMAKE += "SHOW_COMMANDS=1"
+EXTRA_OEMAKE += "CORE=eve "
+EXTRA_OEMAKE += "TARGET_BUILD=release "
+EXTRA_OEMAKE += "TARGET_PLATFORM=PC"
+
+EXTRA_MAKE_ARGS = "PLATFORM_BUILD=x86 LINUX_IMPORT_TOOL=64BIT PROTOBUF_LIB_DIR=${STAGING_DIR_NATIVE}/usr/lib PROTOBUF_INC_DIR=${STAGING_DIR_NATIVE}/usr/include"
+EXTRA_MAKE_ARGS_class-target = "LINUX_BUILD_TOOLS=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PROTOBUF_LIB_DIR=${STAGING_LIBDIR} PROTOBUF_INC_DIR=${STAGING_INCDIR} LINUXENV=oearm"
+
+EXTRA_OEMAKE += "${EXTRA_MAKE_ARGS}"
+
+do_compile() {
+ cd ${S}/modules/ti_dl/utils
+ ./genProtoSrc.sh
+ cd ${S}
+ oe_runmake -C modules/ti_dl/utils/tidlModelImport
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 755 ${S}/modules/ti_dl/utils/tidlModelImport/out/tidl_model_import.out ${D}${bindir}
+}
+
+INSANE_SKIP_${PN} = "ldflags"
+
+BBCLASSEXTEND=" native nativesdk "
diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
index 569de5a..575a0a0 100644
--- a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
+++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
@@ -3,16 +3,15 @@ DESCRIPTION = "TIDL Utilities for standalone simulation and importing / translat
HOMEPAGE = "http://software-dl.ti.com/processor-sdk-linux/esd/docs/latest/linux/Foundational_Components.html#tidl"
LICENSE = "TI-TFL"
-PV = "1.0.0.0"
+require ./tidl-utils.inc
+
+PV = "1.0.0.1"
INC_PR = "r0"
LIC_FILES_CHKSUM = "file://docs/LICENSE.txt;md5=a93aa5af7a3bbbb6fb34c8df59efaa5c"
RDEPENDS_${PN}_class-target += " tidl-api tidl-examples "
-SRC_URI = "git://git.ti.com/tidl/tidl-utils.git;protocol=git;branch=master"
-SRCREV = "994d90ae583610673d9d39086ca5e84027a9c56e"
-
PR = "${INC_PR}.0"
S = "${WORKDIR}/git"
diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc
new file mode 100644
index 0000000..a51d4ba
--- /dev/null
+++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc
@@ -0,0 +1,5 @@
+SUMMARY = "TIDL utils SRC URI"
+
+SRC_URI = "git://git.ti.com/tidl/tidl-utils.git;protocol=git;branch=master"
+SRCREV = "0021b6f15ee4a1a8919905429a5045fd02afe5b1"
+
---
.../nativesdk-packagegroup-arago-sdk-host.bb | 1 +
.../recipes-ti/tidl-utils/tidl-import.bb | 43 ++++++++++++++++++++++
.../recipes-ti/tidl-utils/tidl-utils.bb | 7 ++--
.../recipes-ti/tidl-utils/tidl-utils.inc | 5 +++
4 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 meta-arago-extras/recipes-ti/tidl-utils/tidl-import.bb
create mode 100644 meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc
diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb
index 4f8e62b..53cf9b1 100644
--- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-sdk-host.bb
@@ -11,6 +11,7 @@ EXTRA_TI_TOOLS = " \
nativesdk-ti-cgt-pru \
nativesdk-clocl \
nativesdk-clacc \
+ nativesdk-tidl-import \
"
RDEPENDS_${PN} = "\
diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-import.bb b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import.bb
new file mode 100644
index 0000000..30bfa2e
--- /dev/null
+++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-import.bb
@@ -0,0 +1,43 @@
+SUMMARY = " TIDL import tool for conversion of Caffe and TF models into TI custom network format "
+DESCRIPTION = "TIDL import tool is using protobuf to read and parse information from external network models \
+ This is ARM Linux implementation."
+
+require ./tidl-utils.inc
+
+LICENSE = "BSD-3"
+LIC_FILES_CHKSUM = "file://modules/ti_dl/inc/itidl_ti.h;md5=7baa68fec0aadbac92c3b41b283d26c4"
+
+PV = "01.00.00.00"
+PR = "r1"
+
+S = "${WORKDIR}/git/src/importTool/"
+
+DEPENDS=" protobuf zlib protobuf-native"
+
+EXTRA_OEMAKE += "TIARM_TOOLS=${GCC_ARM_NONE_TOOLCHAIN} "
+EXTRA_OEMAKE += "XDAIS_PATH=${XDAIS_INSTALL_DIR} "
+EXTRA_OEMAKE += "SHOW_COMMANDS=1"
+EXTRA_OEMAKE += "CORE=eve "
+EXTRA_OEMAKE += "TARGET_BUILD=release "
+EXTRA_OEMAKE += "TARGET_PLATFORM=PC"
+
+EXTRA_MAKE_ARGS = "PLATFORM_BUILD=x86 LINUX_IMPORT_TOOL=64BIT PROTOBUF_LIB_DIR=${STAGING_DIR_NATIVE}/usr/lib PROTOBUF_INC_DIR=${STAGING_DIR_NATIVE}/usr/include"
+EXTRA_MAKE_ARGS_class-target = "LINUX_BUILD_TOOLS=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PROTOBUF_LIB_DIR=${STAGING_LIBDIR} PROTOBUF_INC_DIR=${STAGING_INCDIR} LINUXENV=oearm"
+
+EXTRA_OEMAKE += "${EXTRA_MAKE_ARGS}"
+
+do_compile() {
+ cd ${S}/modules/ti_dl/utils
+ ./genProtoSrc.sh
+ cd ${S}
+ oe_runmake -C modules/ti_dl/utils/tidlModelImport
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 755 ${S}/modules/ti_dl/utils/tidlModelImport/out/tidl_model_import.out ${D}${bindir}
+}
+
+INSANE_SKIP_${PN} = "ldflags"
+
+BBCLASSEXTEND=" native nativesdk "
diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
index 569de5a..575a0a0 100644
--- a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
+++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.bb
@@ -3,16 +3,15 @@ DESCRIPTION = "TIDL Utilities for standalone simulation and importing / translat
HOMEPAGE = "http://software-dl.ti.com/processor-sdk-linux/esd/docs/latest/linux/Foundational_Components.html#tidl"
LICENSE = "TI-TFL"
-PV = "1.0.0.0"
+require ./tidl-utils.inc
+
+PV = "1.0.0.1"
INC_PR = "r0"
LIC_FILES_CHKSUM = "file://docs/LICENSE.txt;md5=a93aa5af7a3bbbb6fb34c8df59efaa5c"
RDEPENDS_${PN}_class-target += " tidl-api tidl-examples "
-SRC_URI = "git://git.ti.com/tidl/tidl-utils.git;protocol=git;branch=master"
-SRCREV = "994d90ae583610673d9d39086ca5e84027a9c56e"
-
PR = "${INC_PR}.0"
S = "${WORKDIR}/git"
diff --git a/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc
new file mode 100644
index 0000000..a51d4ba
--- /dev/null
+++ b/meta-arago-extras/recipes-ti/tidl-utils/tidl-utils.inc
@@ -0,0 +1,5 @@
+SUMMARY = "TIDL utils SRC URI"
+
+SRC_URI = "git://git.ti.com/tidl/tidl-utils.git;protocol=git;branch=master"
+SRCREV = "0021b6f15ee4a1a8919905429a5045fd02afe5b1"
+
--
1.9.1
1.9.1