From 6c0348f4cbf6e30a715780f50aebf6dd0a2a8fc3 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Fri, 10 Nov 2017 18:32:38 +0000 Subject: COMPMID-652: The Graph library should link against OpenCL Currently it only works if the application links against OpenCL which won't be needed anymore once we merge Isabella's patch. Change-Id: Ic7034aebed3c99c4efe68962673c805838b9be8f Reviewed-on: http://mpd-gerrit.cambridge.arm.com/95411 Reviewed-by: Georgios Pinitas Tested-by: Kaizen --- SConscript | 7 +++++-- SConstruct | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SConscript b/SConscript index 0679c85070..17220e4c29 100644 --- a/SConscript +++ b/SConscript @@ -221,6 +221,7 @@ if env['os'] != 'bare_metal' and not env['standalone']: Export('arm_compute_so') if env['neon'] and env['opencl']: + Import('opencl') graph_files = Glob('src/graph/*.cpp') graph_files += Glob('src/graph/nodes/*.cpp') graph_files += Glob('src/graph/operations/*.cpp') @@ -234,8 +235,10 @@ if env['neon'] and env['opencl']: arm_compute_graph_a = build_library('arm_compute_graph-static', static_graph_objects, static=True, libs = [ arm_compute_a ]) Export('arm_compute_graph_a') - arm_compute_graph_so = build_library('arm_compute_graph', shared_graph_objects, static=False, libs = [ "arm_compute", "arm_compute_core" ]) - Depends( arm_compute_graph_so, arm_compute_so) + arm_compute_env.Append(LIBPATH = ["#build/%s/opencl-1.2-stubs" % env['build_dir']]) + arm_compute_graph_so = build_library('arm_compute_graph', shared_graph_objects, static=False, libs = [ "arm_compute", "arm_compute_core", "OpenCL" ]) + Depends(arm_compute_graph_so, arm_compute_so) + Depends(arm_compute_graph_so, opencl) Export('arm_compute_graph_so') graph_alias = arm_compute_env.Alias("arm_compute_graph", [arm_compute_graph_a, arm_compute_graph_so]) diff --git a/SConstruct b/SConstruct index 0385e2e392..355449edc7 100644 --- a/SConstruct +++ b/SConstruct @@ -224,14 +224,14 @@ Export('vars') Export('env') Export('version_at_least') -SConscript('./SConscript', variant_dir='#build/%s' % env['build_dir'], duplicate=0) - if env['opencl']: SConscript("./opencl-1.2-stubs/SConscript", variant_dir="build/%s/opencl-1.2-stubs" % env['build_dir'], duplicate=0) if env['gles_compute'] and env['os'] != 'android': SConscript("./opengles-3.1/stubs/SConscript", variant_dir="build/%s/opengles-3.1/stubs" % env['build_dir'], duplicate=0) +SConscript('./SConscript', variant_dir='#build/%s' % env['build_dir'], duplicate=0) + if env['examples'] and env['os'] != 'bare_metal': SConscript('./examples/SConscript', variant_dir='#build/%s/examples' % env['build_dir'], duplicate=0) -- cgit v1.2.1