From d8734b55d89f05901ba9a75349761a9c955d9243 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 22 Dec 2017 15:27:52 +0000 Subject: COMPMID-793 : Add graph intermediate representation Change-Id: Ic1685de4e19e0ac79669ef2da64e1dc96c7ea0bf Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115248 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- SConscript | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'SConscript') diff --git a/SConscript b/SConscript index 6f7ea3c36b..dab807a47f 100644 --- a/SConscript +++ b/SConscript @@ -170,6 +170,10 @@ runtime_files += Glob('src/runtime/CPP/functions/*.cpp') # CLHarrisCorners uses the Scheduler to run CPP kernels runtime_files += Glob('src/runtime/CPP/SingleThreadScheduler.cpp') +# FIXME : Rename graph2 -> graph +graph2_files = Glob('src/graph2/*.cpp') +graph2_files += Glob('src/graph2/*/*.cpp') + if env['cppthreads']: runtime_files += Glob('src/runtime/CPP/CPPScheduler.cpp') @@ -183,6 +187,9 @@ if env['opencl']: runtime_files += Glob('src/runtime/CL/*.cpp') runtime_files += Glob('src/runtime/CL/functions/*.cpp') + graph2_files += Glob('src/graph2/backends/CL/*.cpp') + + if env['neon']: core_files += Glob('src/core/NEON/*.cpp') core_files += Glob('src/core/NEON/kernels/*.cpp') @@ -192,6 +199,8 @@ if env['neon']: core_files += Glob('src/core/NEON/kernels/convolution/winograd/*/*.cpp') arm_compute_env.Append(CPPPATH = ["arm_compute/core/NEON/kernels/winograd/", "arm_compute/core/NEON/kernels/assembly/"]) + graph2_files += Glob('src/graph2/backends/NEON/*.cpp') + if env['arch'] == "armv7a": core_files += Glob('src/core/NEON/kernels/arm32/*.cpp') @@ -226,6 +235,14 @@ if env['os'] != 'bare_metal' and not env['standalone']: Depends(arm_compute_so, arm_compute_core_so) Export('arm_compute_so') +arm_compute_graph2_a = build_library('arm_compute_graph2-static', graph2_files, static=True, libs = [ arm_compute_a]) +Export('arm_compute_graph2_a') + +if env['os'] != 'bare_metal' and not env['standalone']: + arm_compute_graph2_so = build_library('arm_compute_graph2', graph2_files, static=False, libs = [ "arm_compute" , "arm_compute_core"]) + Depends(arm_compute_graph2_so, arm_compute_so) + Export('arm_compute_graph2_so') + if env['neon'] and env['opencl']: Import('opencl') graph_files = Glob('src/graph/*.cpp') -- cgit v1.2.1