commit d8734b55d89f05901ba9a75349761a9c955d9243
author Georgios Pinitas <georgios.pinitas@arm.com> Fri Dec 22 15:27:52 2017 +0000
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:49:16 2018 +0000
tree e23d53a0fb73251f7416993e4d3a7241e533e79e
parent 7390e05561a5c49306ebbf2eb2dcb1848546f201

COMPMID-793 : Add graph intermediate representation

Change-Id: Ic1685de4e19e0ac79669ef2da64e1dc96c7ea0bf
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115248
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

SConscript

diff --git a/SConscript b/SConscript
index 6f7ea3c..dab807a 100644
--- a/SConscript
+++ b/SConscript
@@ -170,6 +170,10 @@
 # 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 @@
     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 @@
     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 @@
     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')