diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2017-11-10 18:32:38 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
| commit | 6c0348f4cbf6e30a715780f50aebf6dd0a2a8fc3 (patch) | |
| tree | aa4350d675afd0362eb8309ef0cd851b7d413fe6 /SConscript | |
| parent | 87f21cd39639118293b51fa776d30aa7722917bd (diff) | |
| download | ComputeLibrary-6c0348f4cbf6e30a715780f50aebf6dd0a2a8fc3.tar.gz | |
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 <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'SConscript')
| -rw-r--r-- | SConscript | 7 |
1 files changed, 5 insertions, 2 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]) |