* [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0
@ 2017-03-15 18:01 Jacob Stiffler
2017-03-15 18:01 ` [morty/master][PATCH 2/2] opencl-examples: add persistent examples for dra7xx Jacob Stiffler
2017-03-16 19:20 ` [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0 Denys Dmytriyenko
0 siblings, 2 replies; 8+ messages in thread
From: Jacob Stiffler @ 2017-03-15 18:01 UTC (permalink / raw)
To: meta-arago
* opencl : add systemd service for MCT daemon
* monitor : sources unified between platforms
* examples : add new examples
Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
| 4 ++--
| 2 ++
| 2 --
| 12 +++++++++++-
4 files changed, 15 insertions(+), 5 deletions(-)
--git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
index 38f08b9..94e3dd8 100644
--- a/meta-arago-extras/recipes-ti/ocl/ocl.inc
+++ b/meta-arago-extras/recipes-ti/ocl/ocl.inc
@@ -1,4 +1,4 @@
-PV = "1.1.11.2"
+PV = "1.1.12.0"
INC_PR = "r0"
LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff"
@@ -9,7 +9,7 @@ OCL_GIT_URI = "git://git.ti.com/opencl/ti-opencl.git"
OCL_GIT_PROTOCOL = "git"
OCL_GIT_BRANCH = "master"
-OCL_SRCREV = "5a8f16bb1809a410b961292ae070d079b89e749a"
+OCL_SRCREV = "8c0ec9c270cafaef0a56c376fc28c1b7714cb09c"
BRANCH = "${OCL_GIT_BRANCH}"
SRC_URI = "${OCL_GIT_URI};protocol=${OCL_GIT_PROTOCOL};branch=${BRANCH}"
--git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index c69b7e2..cc1db80 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -35,6 +35,8 @@ OCL_EXAMPLE_LIST = " buffer \
vecadd_openmp \
vecadd_openmp_t \
dgemm \
+ abort_exit \
+ timeout \
"
python do_unpack_append() {
--git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
index 8fc1e81..c0a8a6c 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
@@ -45,8 +45,6 @@ COMPATIBLE_MACHINE = "dra7xx|keystone"
PACKAGE_ARCH = "${MACHINE_ARCH}"
S = "${WORKDIR}/git/monitor"
-S_dra7xx = "${WORKDIR}/git/monitor_vayu"
-S_k2g = "${WORKDIR}/git/monitor_vayu"
BUILD_TARGET_k2hk-evm = "ARM_K2H"
BUILD_TARGET_k2l-evm = "ARM_K2L"
--git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
index 9676687..1d39274 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
@@ -6,7 +6,7 @@ include ocl.inc
PR = "${INC_PR}.0"
-inherit cmake
+inherit cmake systemd
COMPATIBLE_MACHINE = "dra7xx|keystone"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -58,6 +58,16 @@ EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABL
EXTRA_OEMAKE += "KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} LINUX_DEVKIT_ROOT=${STAGING_DIR_HOST}"
export KERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
+MCTD = "${S}/mct-daemon/ti-mct-daemon.service.k2x"
+MCTD_dra7xx = "${S}/mct-daemon/ti-mct-daemon.service.am57x"
+
+do_install_append() {
+ install -d ${D}${systemd_system_unitdir}
+ install -m0644 ${MCTD} ${D}${systemd_system_unitdir}/ti-mct-daemon.service
+}
+
+SYSTEMD_SERVICE_${PN} = "ti-mct-daemon.service"
+
FILES_${PN} += " \
${datadir}/ti/opencl/* \
"
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [morty/master][PATCH 2/2] opencl-examples: add persistent examples for dra7xx
2017-03-15 18:01 [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0 Jacob Stiffler
@ 2017-03-15 18:01 ` Jacob Stiffler
2017-03-16 19:20 ` [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0 Denys Dmytriyenko
1 sibling, 0 replies; 8+ messages in thread
From: Jacob Stiffler @ 2017-03-15 18:01 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
.../recipes-ti/ocl/opencl-examples_git.bb | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
index cc1db80..fbecbc1 100644
--- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
+++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://software-dl.ti.com/mctools/docs/opencl/intro.html"
LICENSE = "BSD"
include ocl.inc
+require recipes-ti/includes/ti-paths.inc
PR = "${INC_PR}.1"
@@ -11,6 +12,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS = "opencl ti-cgt6x-native clocl-native"
+OCL_PERSISTENT_DEPENDS = "ti-xdctools ti-ipc-rtos ti-sysbios"
+
+DEPENDS_append_dra7xx = " ${OCL_PERSISTENT_DEPENDS}"
+
RDEPENDS_${PN} += " opencl-runtime"
RDEPENDS_${PN}-dev += " libgomp-dev"
@@ -39,6 +44,17 @@ OCL_EXAMPLE_LIST = " buffer \
timeout \
"
+OCL_PERSISTENT_EXAMPLE_LIST = " persistent_clock_concurrent \
+ persistent_clock_spanning \
+ persistent_common \
+ persistent_kernel_timeout \
+ persistent_messageq_concurrent \
+ persistent_task_concurrent \
+ persistent_task_spanning \
+"
+
+OCL_EXAMPLE_LIST_append_dra7xx = " ${OCL_PERSISTENT_EXAMPLE_LIST}"
+
python do_unpack_append() {
import shutil
@@ -61,6 +77,10 @@ do_configure() {
sed "s|arm-linux-gnueabihf-g++|${CXX}|g" -i make.inc
}
+export XDC_DIR = "${XDC_INSTALL_DIR}/packages"
+export IPC_DIR = "${IPC_INSTALL_DIR}/packages"
+export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}/packages"
+
do_compile() {
oe_runmake CC="${CC}" CPP="${CPP}" CXX="${CXX}"
}
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0
2017-03-15 18:01 [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0 Jacob Stiffler
2017-03-15 18:01 ` [morty/master][PATCH 2/2] opencl-examples: add persistent examples for dra7xx Jacob Stiffler
@ 2017-03-16 19:20 ` Denys Dmytriyenko
2017-03-16 19:23 ` Denys Dmytriyenko
1 sibling, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-16 19:20 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
Jake,
It appears the new version no longer provides libOpenCL.so - is it expected?
It is currently breaking incremental builds due to package naming change...
The workaround is to either make a clean build or bump PR in affected
packagegroups. Before doing that, I'm trying to see if there was an issue
with the new version. Please let me know.
--
Denys
On Wed, Mar 15, 2017 at 02:01:23PM -0400, Jacob Stiffler wrote:
> * opencl : add systemd service for MCT daemon
> * monitor : sources unified between platforms
> * examples : add new examples
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
> meta-arago-extras/recipes-ti/ocl/ocl.inc | 4 ++--
> meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb | 2 ++
> meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 2 --
> meta-arago-extras/recipes-ti/ocl/opencl_git.bb | 12 +++++++++++-
> 4 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
> index 38f08b9..94e3dd8 100644
> --- a/meta-arago-extras/recipes-ti/ocl/ocl.inc
> +++ b/meta-arago-extras/recipes-ti/ocl/ocl.inc
> @@ -1,4 +1,4 @@
> -PV = "1.1.11.2"
> +PV = "1.1.12.0"
> INC_PR = "r0"
>
> LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff"
> @@ -9,7 +9,7 @@ OCL_GIT_URI = "git://git.ti.com/opencl/ti-opencl.git"
> OCL_GIT_PROTOCOL = "git"
> OCL_GIT_BRANCH = "master"
>
> -OCL_SRCREV = "5a8f16bb1809a410b961292ae070d079b89e749a"
> +OCL_SRCREV = "8c0ec9c270cafaef0a56c376fc28c1b7714cb09c"
>
> BRANCH = "${OCL_GIT_BRANCH}"
> SRC_URI = "${OCL_GIT_URI};protocol=${OCL_GIT_PROTOCOL};branch=${BRANCH}"
> diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> index c69b7e2..cc1db80 100644
> --- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> +++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> @@ -35,6 +35,8 @@ OCL_EXAMPLE_LIST = " buffer \
> vecadd_openmp \
> vecadd_openmp_t \
> dgemm \
> + abort_exit \
> + timeout \
> "
>
> python do_unpack_append() {
> diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> index 8fc1e81..c0a8a6c 100644
> --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> @@ -45,8 +45,6 @@ COMPATIBLE_MACHINE = "dra7xx|keystone"
> PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> S = "${WORKDIR}/git/monitor"
> -S_dra7xx = "${WORKDIR}/git/monitor_vayu"
> -S_k2g = "${WORKDIR}/git/monitor_vayu"
>
> BUILD_TARGET_k2hk-evm = "ARM_K2H"
> BUILD_TARGET_k2l-evm = "ARM_K2L"
> diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> index 9676687..1d39274 100644
> --- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> +++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> @@ -6,7 +6,7 @@ include ocl.inc
>
> PR = "${INC_PR}.0"
>
> -inherit cmake
> +inherit cmake systemd
>
> COMPATIBLE_MACHINE = "dra7xx|keystone"
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> @@ -58,6 +58,16 @@ EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABL
> EXTRA_OEMAKE += "KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} LINUX_DEVKIT_ROOT=${STAGING_DIR_HOST}"
> export KERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
>
> +MCTD = "${S}/mct-daemon/ti-mct-daemon.service.k2x"
> +MCTD_dra7xx = "${S}/mct-daemon/ti-mct-daemon.service.am57x"
> +
> +do_install_append() {
> + install -d ${D}${systemd_system_unitdir}
> + install -m0644 ${MCTD} ${D}${systemd_system_unitdir}/ti-mct-daemon.service
> +}
> +
> +SYSTEMD_SERVICE_${PN} = "ti-mct-daemon.service"
> +
> FILES_${PN} += " \
> ${datadir}/ti/opencl/* \
> "
> --
> 2.7.4
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0
2017-03-16 19:20 ` [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0 Denys Dmytriyenko
@ 2017-03-16 19:23 ` Denys Dmytriyenko
2017-03-16 20:28 ` Denys Dmytriyenko
0 siblings, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-16 19:23 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
On Thu, Mar 16, 2017 at 03:20:33PM -0400, Denys Dmytriyenko wrote:
> Jake,
>
> It appears the new version no longer provides libOpenCL.so - is it expected?
Actually, it does provide it, just messing up the debian package renaming due
to all the new stuff... I'll see if I can correct it.
> It is currently breaking incremental builds due to package naming change...
> The workaround is to either make a clean build or bump PR in affected
> packagegroups. Before doing that, I'm trying to see if there was an issue
> with the new version. Please let me know.
>
> --
> Denys
>
>
> On Wed, Mar 15, 2017 at 02:01:23PM -0400, Jacob Stiffler wrote:
> > * opencl : add systemd service for MCT daemon
> > * monitor : sources unified between platforms
> > * examples : add new examples
> >
> > Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> > ---
> > meta-arago-extras/recipes-ti/ocl/ocl.inc | 4 ++--
> > meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb | 2 ++
> > meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 2 --
> > meta-arago-extras/recipes-ti/ocl/opencl_git.bb | 12 +++++++++++-
> > 4 files changed, 15 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
> > index 38f08b9..94e3dd8 100644
> > --- a/meta-arago-extras/recipes-ti/ocl/ocl.inc
> > +++ b/meta-arago-extras/recipes-ti/ocl/ocl.inc
> > @@ -1,4 +1,4 @@
> > -PV = "1.1.11.2"
> > +PV = "1.1.12.0"
> > INC_PR = "r0"
> >
> > LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff"
> > @@ -9,7 +9,7 @@ OCL_GIT_URI = "git://git.ti.com/opencl/ti-opencl.git"
> > OCL_GIT_PROTOCOL = "git"
> > OCL_GIT_BRANCH = "master"
> >
> > -OCL_SRCREV = "5a8f16bb1809a410b961292ae070d079b89e749a"
> > +OCL_SRCREV = "8c0ec9c270cafaef0a56c376fc28c1b7714cb09c"
> >
> > BRANCH = "${OCL_GIT_BRANCH}"
> > SRC_URI = "${OCL_GIT_URI};protocol=${OCL_GIT_PROTOCOL};branch=${BRANCH}"
> > diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> > index c69b7e2..cc1db80 100644
> > --- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> > +++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> > @@ -35,6 +35,8 @@ OCL_EXAMPLE_LIST = " buffer \
> > vecadd_openmp \
> > vecadd_openmp_t \
> > dgemm \
> > + abort_exit \
> > + timeout \
> > "
> >
> > python do_unpack_append() {
> > diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> > index 8fc1e81..c0a8a6c 100644
> > --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> > +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> > @@ -45,8 +45,6 @@ COMPATIBLE_MACHINE = "dra7xx|keystone"
> > PACKAGE_ARCH = "${MACHINE_ARCH}"
> >
> > S = "${WORKDIR}/git/monitor"
> > -S_dra7xx = "${WORKDIR}/git/monitor_vayu"
> > -S_k2g = "${WORKDIR}/git/monitor_vayu"
> >
> > BUILD_TARGET_k2hk-evm = "ARM_K2H"
> > BUILD_TARGET_k2l-evm = "ARM_K2L"
> > diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> > index 9676687..1d39274 100644
> > --- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> > +++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> > @@ -6,7 +6,7 @@ include ocl.inc
> >
> > PR = "${INC_PR}.0"
> >
> > -inherit cmake
> > +inherit cmake systemd
> >
> > COMPATIBLE_MACHINE = "dra7xx|keystone"
> > PACKAGE_ARCH = "${MACHINE_ARCH}"
> > @@ -58,6 +58,16 @@ EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABL
> > EXTRA_OEMAKE += "KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} LINUX_DEVKIT_ROOT=${STAGING_DIR_HOST}"
> > export KERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
> >
> > +MCTD = "${S}/mct-daemon/ti-mct-daemon.service.k2x"
> > +MCTD_dra7xx = "${S}/mct-daemon/ti-mct-daemon.service.am57x"
> > +
> > +do_install_append() {
> > + install -d ${D}${systemd_system_unitdir}
> > + install -m0644 ${MCTD} ${D}${systemd_system_unitdir}/ti-mct-daemon.service
> > +}
> > +
> > +SYSTEMD_SERVICE_${PN} = "ti-mct-daemon.service"
> > +
> > FILES_${PN} += " \
> > ${datadir}/ti/opencl/* \
> > "
> > --
> > 2.7.4
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0
2017-03-16 19:23 ` Denys Dmytriyenko
@ 2017-03-16 20:28 ` Denys Dmytriyenko
2017-03-17 13:38 ` Jacob Stiffler
0 siblings, 1 reply; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-16 20:28 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
On Thu, Mar 16, 2017 at 03:23:59PM -0400, Denys Dmytriyenko wrote:
> On Thu, Mar 16, 2017 at 03:20:33PM -0400, Denys Dmytriyenko wrote:
> > Jake,
> >
> > It appears the new version no longer provides libOpenCL.so - is it expected?
>
> Actually, it does provide it, just messing up the debian package renaming due
> to all the new stuff... I'll see if I can correct it.
It's not just few packagegroups, it's everything that depends on opencl
(opencv, openmp, examples, etc.) is affected. If you build from scratch every
time, you won't see it.
I've submitted a patch to hopefully resolve it:
http://arago-project.org/pipermail/meta-arago/2017-March/008854.html
This doesn't only affect incremental builds, but also package feeds and would
break package/distro upgrades in the field. Unfortunately, we haven't been
paying much attention to this problem in the past, but as we've already
discussed, we should keep an eye on it...
--
Denys
> > It is currently breaking incremental builds due to package naming change...
> > The workaround is to either make a clean build or bump PR in affected
> > packagegroups. Before doing that, I'm trying to see if there was an issue
> > with the new version. Please let me know.
> >
> > --
> > Denys
> >
> >
> > On Wed, Mar 15, 2017 at 02:01:23PM -0400, Jacob Stiffler wrote:
> > > * opencl : add systemd service for MCT daemon
> > > * monitor : sources unified between platforms
> > > * examples : add new examples
> > >
> > > Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> > > ---
> > > meta-arago-extras/recipes-ti/ocl/ocl.inc | 4 ++--
> > > meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb | 2 ++
> > > meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 2 --
> > > meta-arago-extras/recipes-ti/ocl/opencl_git.bb | 12 +++++++++++-
> > > 4 files changed, 15 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/meta-arago-extras/recipes-ti/ocl/ocl.inc b/meta-arago-extras/recipes-ti/ocl/ocl.inc
> > > index 38f08b9..94e3dd8 100644
> > > --- a/meta-arago-extras/recipes-ti/ocl/ocl.inc
> > > +++ b/meta-arago-extras/recipes-ti/ocl/ocl.inc
> > > @@ -1,4 +1,4 @@
> > > -PV = "1.1.11.2"
> > > +PV = "1.1.12.0"
> > > INC_PR = "r0"
> > >
> > > LIC_FILES_CHKSUM = "file://../debian/copyright;md5=2e3965a73a8a49c23836467266120dff"
> > > @@ -9,7 +9,7 @@ OCL_GIT_URI = "git://git.ti.com/opencl/ti-opencl.git"
> > > OCL_GIT_PROTOCOL = "git"
> > > OCL_GIT_BRANCH = "master"
> > >
> > > -OCL_SRCREV = "5a8f16bb1809a410b961292ae070d079b89e749a"
> > > +OCL_SRCREV = "8c0ec9c270cafaef0a56c376fc28c1b7714cb09c"
> > >
> > > BRANCH = "${OCL_GIT_BRANCH}"
> > > SRC_URI = "${OCL_GIT_URI};protocol=${OCL_GIT_PROTOCOL};branch=${BRANCH}"
> > > diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> > > index c69b7e2..cc1db80 100644
> > > --- a/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> > > +++ b/meta-arago-extras/recipes-ti/ocl/opencl-examples_git.bb
> > > @@ -35,6 +35,8 @@ OCL_EXAMPLE_LIST = " buffer \
> > > vecadd_openmp \
> > > vecadd_openmp_t \
> > > dgemm \
> > > + abort_exit \
> > > + timeout \
> > > "
> > >
> > > python do_unpack_append() {
> > > diff --git a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> > > index 8fc1e81..c0a8a6c 100644
> > > --- a/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> > > +++ b/meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb
> > > @@ -45,8 +45,6 @@ COMPATIBLE_MACHINE = "dra7xx|keystone"
> > > PACKAGE_ARCH = "${MACHINE_ARCH}"
> > >
> > > S = "${WORKDIR}/git/monitor"
> > > -S_dra7xx = "${WORKDIR}/git/monitor_vayu"
> > > -S_k2g = "${WORKDIR}/git/monitor_vayu"
> > >
> > > BUILD_TARGET_k2hk-evm = "ARM_K2H"
> > > BUILD_TARGET_k2l-evm = "ARM_K2L"
> > > diff --git a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> > > index 9676687..1d39274 100644
> > > --- a/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> > > +++ b/meta-arago-extras/recipes-ti/ocl/opencl_git.bb
> > > @@ -6,7 +6,7 @@ include ocl.inc
> > >
> > > PR = "${INC_PR}.0"
> > >
> > > -inherit cmake
> > > +inherit cmake systemd
> > >
> > > COMPATIBLE_MACHINE = "dra7xx|keystone"
> > > PACKAGE_ARCH = "${MACHINE_ARCH}"
> > > @@ -58,6 +58,16 @@ EXTRA_OECMAKE += " -DBUILD_TARGET=${OCL_BUILD_TARGET} -DBUILD_OUTPUT=lib -DENABL
> > > EXTRA_OEMAKE += "KERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} LINUX_DEVKIT_ROOT=${STAGING_DIR_HOST}"
> > > export KERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}"
> > >
> > > +MCTD = "${S}/mct-daemon/ti-mct-daemon.service.k2x"
> > > +MCTD_dra7xx = "${S}/mct-daemon/ti-mct-daemon.service.am57x"
> > > +
> > > +do_install_append() {
> > > + install -d ${D}${systemd_system_unitdir}
> > > + install -m0644 ${MCTD} ${D}${systemd_system_unitdir}/ti-mct-daemon.service
> > > +}
> > > +
> > > +SYSTEMD_SERVICE_${PN} = "ti-mct-daemon.service"
> > > +
> > > FILES_${PN} += " \
> > > ${datadir}/ti/opencl/* \
> > > "
> > > --
> > > 2.7.4
> > >
> > > _______________________________________________
> > > meta-arago mailing list
> > > meta-arago@arago-project.org
> > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0
2017-03-16 20:28 ` Denys Dmytriyenko
@ 2017-03-17 13:38 ` Jacob Stiffler
2017-03-17 14:46 ` Jacob Stiffler
0 siblings, 1 reply; 8+ messages in thread
From: Jacob Stiffler @ 2017-03-17 13:38 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 3/16/2017 4:28 PM, Denys Dmytriyenko wrote:
> On Thu, Mar 16, 2017 at 03:23:59PM -0400, Denys Dmytriyenko wrote:
>> On Thu, Mar 16, 2017 at 03:20:33PM -0400, Denys Dmytriyenko wrote:
>>> Jake,
>>>
>>> It appears the new version no longer provides libOpenCL.so - is it expected?
>> Actually, it does provide it, just messing up the debian package renaming due
>> to all the new stuff... I'll see if I can correct it.
> It's not just few packagegroups, it's everything that depends on opencl
> (opencv, openmp, examples, etc.) is affected. If you build from scratch every
> time, you won't see it.
>
> I've submitted a patch to hopefully resolve it:
> http://arago-project.org/pipermail/meta-arago/2017-March/008854.html
>
> This doesn't only affect incremental builds, but also package feeds and would
> break package/distro upgrades in the field. Unfortunately, we haven't been
> paying much attention to this problem in the past, but as we've already
> discussed, we should keep an eye on it...
>
I'm trying to understand this automatic package naming, and how the
opencl package gets renamed to libopencl when the IPK is created. Could
you point to where this occurs in OE?
I also see that on krogoth, everything is OK. Even with the new
binaries, the IPKs are still name libopencl*. However, I do see that on
morty, the addition of the binaries does alter the IPK names.
I'll look at the patch and provide comments once I better understand
what is happening.
- Jake
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0
2017-03-17 13:38 ` Jacob Stiffler
@ 2017-03-17 14:46 ` Jacob Stiffler
2017-03-17 18:51 ` Denys Dmytriyenko
0 siblings, 1 reply; 8+ messages in thread
From: Jacob Stiffler @ 2017-03-17 14:46 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 3/17/2017 9:38 AM, Jacob Stiffler wrote:
>
>
> On 3/16/2017 4:28 PM, Denys Dmytriyenko wrote:
>> On Thu, Mar 16, 2017 at 03:23:59PM -0400, Denys Dmytriyenko wrote:
>>> On Thu, Mar 16, 2017 at 03:20:33PM -0400, Denys Dmytriyenko wrote:
>>>> Jake,
>>>>
>>>> It appears the new version no longer provides libOpenCL.so - is it
>>>> expected?
>>> Actually, it does provide it, just messing up the debian package
>>> renaming due
>>> to all the new stuff... I'll see if I can correct it.
>> It's not just few packagegroups, it's everything that depends on opencl
>> (opencv, openmp, examples, etc.) is affected. If you build from
>> scratch every
>> time, you won't see it.
>>
>> I've submitted a patch to hopefully resolve it:
>> http://arago-project.org/pipermail/meta-arago/2017-March/008854.html
>>
>> This doesn't only affect incremental builds, but also package feeds
>> and would
>> break package/distro upgrades in the field. Unfortunately, we haven't
>> been
>> paying much attention to this problem in the past, but as we've already
>> discussed, we should keep an eye on it...
>>
> I'm trying to understand this automatic package naming, and how the
> opencl package gets renamed to libopencl when the IPK is created.
> Could you point to where this occurs in OE?
>
Reading the comment on your patch shows why this happens, and I have
found that the code responsible is in the debian.bbclass.
> I also see that on krogoth, everything is OK. Even with the new
> binaries, the IPKs are still name libopencl*. However, I do see that
> on morty, the addition of the binaries does alter the IPK names.
>
I see the it was OK because your patch was already committed. Removing
that patch shows the problem.
> I'll look at the patch and provide comments once I better understand
> what is happening.
>
We may need to take a closer look at the packaging and dependencies. I
would assume that the library RDEPENDS on the daemon, so it might not
make sense to have opposite dependency in the packages (runtime RDEPENDS
on libraries).
> - Jake
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0
2017-03-17 14:46 ` Jacob Stiffler
@ 2017-03-17 18:51 ` Denys Dmytriyenko
0 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-17 18:51 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
On Fri, Mar 17, 2017 at 10:46:35AM -0400, Jacob Stiffler wrote:
>
>
> On 3/17/2017 9:38 AM, Jacob Stiffler wrote:
> >
> >
> >On 3/16/2017 4:28 PM, Denys Dmytriyenko wrote:
> >>On Thu, Mar 16, 2017 at 03:23:59PM -0400, Denys Dmytriyenko wrote:
> >>>On Thu, Mar 16, 2017 at 03:20:33PM -0400, Denys Dmytriyenko wrote:
> >>>>Jake,
> >>>>
> >>>>It appears the new version no longer provides libOpenCL.so -
> >>>>is it expected?
> >>>Actually, it does provide it, just messing up the debian
> >>>package renaming due
> >>>to all the new stuff... I'll see if I can correct it.
> >>It's not just few packagegroups, it's everything that depends on opencl
> >>(opencv, openmp, examples, etc.) is affected. If you build from
> >>scratch every
> >>time, you won't see it.
> >>
> >>I've submitted a patch to hopefully resolve it:
> >>http://arago-project.org/pipermail/meta-arago/2017-March/008854.html
> >>
> >>This doesn't only affect incremental builds, but also package
> >>feeds and would
> >>break package/distro upgrades in the field. Unfortunately, we
> >>haven't been
> >>paying much attention to this problem in the past, but as we've already
> >>discussed, we should keep an eye on it...
> >>
> >I'm trying to understand this automatic package naming, and how
> >the opencl package gets renamed to libopencl when the IPK is
> >created. Could you point to where this occurs in OE?
>
> Reading the comment on your patch shows why this happens, and I have
> found that the code responsible is in the debian.bbclass.
>
> >I also see that on krogoth, everything is OK. Even with the new
> >binaries, the IPKs are still name libopencl*. However, I do see
> >that on morty, the addition of the binaries does alter the IPK
> >names.
>
> I see the it was OK because your patch was already committed.
> Removing that patch shows the problem.
Sorry, couldn't wait any longer - had to make 2016.06.01 RC build last
night...
> >I'll look at the patch and provide comments once I better
> >understand what is happening.
>
> We may need to take a closer look at the packaging and dependencies.
> I would assume that the library RDEPENDS on the daemon, so it might
> not make sense to have opposite dependency in the packages (runtime
> RDEPENDS on libraries).
First of all, I noticed that ${PN}-runtime wasn't even used - it had no
FILES_${PN}-runtime defined, thus not packaging any files. What was it's
intentional purpose?
If needed, we can change the way files get packaged and dependencies between
them.
Second, it's unfortunate that this package renaming slipped through unnoticed
in the very beginning for opencl - not sure if it was meant to be just a
library or not. If the main purpose of opencl package is indeed to provide
libOpenCL.so library, then it's fine for the package to stay as libopencl1*.
Otherwise we could have disabled automatic debian renaming for it...
--
Denys
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-03-17 18:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-15 18:01 [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0 Jacob Stiffler
2017-03-15 18:01 ` [morty/master][PATCH 2/2] opencl-examples: add persistent examples for dra7xx Jacob Stiffler
2017-03-16 19:20 ` [morty/master][PATCH 1/2] ocl: update to version 1.1.12.0 Denys Dmytriyenko
2017-03-16 19:23 ` Denys Dmytriyenko
2017-03-16 20:28 ` Denys Dmytriyenko
2017-03-17 13:38 ` Jacob Stiffler
2017-03-17 14:46 ` Jacob Stiffler
2017-03-17 18:51 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.