arm_compute v17.12
diff --git a/SConscript b/SConscript
index b6305a0..0efa414 100644
--- a/SConscript
+++ b/SConscript
@@ -24,8 +24,8 @@
import re
import subprocess
-VERSION = "v17.10"
-SONAME_VERSION="5.0.0"
+VERSION = "v17.12"
+SONAME_VERSION="6.0.0"
Import('env')
Import('vars')
@@ -125,6 +125,8 @@
arm_compute_env = env.Clone()
+# Don't allow undefined references in the libraries:
+arm_compute_env.Append(LINKFLAGS=['-Wl,--no-undefined','-Wl,--no-allow-shlib-undefined'])
generate_embed = [ arm_compute_env.Command("src/core/arm_compute_version.embed", "", action=create_version_file) ]
arm_compute_env.Append(CPPPATH =[Dir("./src/core/").path] )
@@ -137,8 +139,12 @@
core_files = Glob('src/core/*.cpp')
core_files += Glob('src/core/CPP/*.cpp')
core_files += Glob('src/core/CPP/kernels/*.cpp')
+core_files += Glob('src/core/utils/*/*.cpp')
runtime_files = Glob('src/runtime/*.cpp')
+runtime_files += Glob('src/runtime/CPP/ICPPSimpleFunction.cpp')
+runtime_files += Glob('src/runtime/CPP/functions/*.cpp')
+
# CLHarrisCorners uses the Scheduler to run CPP kernels
runtime_files += Glob('src/runtime/CPP/SingleThreadScheduler.cpp')
@@ -178,30 +184,46 @@
runtime_files += Glob('src/runtime/NEON/*.cpp')
runtime_files += Glob('src/runtime/NEON/functions/*.cpp')
-static_core_objects = [arm_compute_env.StaticObject(f) for f in core_files]
-shared_core_objects = [arm_compute_env.SharedObject(f) for f in core_files]
+if env['gles_compute']:
+ if env['os'] != 'android':
+ arm_compute_env.Append(CPPPATH = ["#opengles-3.1/include", "#opengles-3.1/mali_include"])
-arm_compute_core_a = build_library('arm_compute_core-static', static_core_objects, static=True)
+ core_files += Glob('src/core/GLES_COMPUTE/*.cpp')
+ core_files += Glob('src/core/GLES_COMPUTE/kernels/*.cpp')
+
+ runtime_files += Glob('src/runtime/GLES_COMPUTE/*.cpp')
+ runtime_files += Glob('src/runtime/GLES_COMPUTE/functions/*.cpp')
+
+ # Generate embed files
+ if env['embed_kernels']:
+ cs_files = Glob('src/core/GLES_COMPUTE/cs_shaders/*.cs')
+ cs_files += Glob('src/core/GLES_COMPUTE/cs_shaders/*.h')
+
+ embed_files = [ f.get_path()+"embed" for f in cs_files ]
+ arm_compute_env.Append(CPPPATH =[Dir("./src/core/GLES_COMPUTE/").path] )
+
+ generate_embed.append(arm_compute_env.Command(embed_files, cs_files, action=resolve_includes))
+
+arm_compute_core_a = build_library('arm_compute_core-static', core_files, static=True)
Export('arm_compute_core_a')
if env['os'] != 'bare_metal' and not env['standalone']:
- arm_compute_core_so = build_library('arm_compute_core', shared_core_objects, static=False)
+ arm_compute_core_so = build_library('arm_compute_core', core_files, static=False)
Export('arm_compute_core_so')
-shared_runtime_objects = [arm_compute_env.SharedObject(f) for f in runtime_files]
-static_runtime_objects = [arm_compute_env.StaticObject(f) for f in runtime_files]
-
-arm_compute_a = build_library('arm_compute-static', static_runtime_objects, static=True, libs = [ arm_compute_core_a ])
+arm_compute_a = build_library('arm_compute-static', runtime_files, static=True, libs = [ arm_compute_core_a ])
Export('arm_compute_a')
if env['os'] != 'bare_metal' and not env['standalone']:
- arm_compute_so = build_library('arm_compute', shared_runtime_objects, static=False, libs = [ "arm_compute_core" ])
+ arm_compute_so = build_library('arm_compute', runtime_files, static=False, libs = [ "arm_compute_core" ])
Depends(arm_compute_so, arm_compute_core_so)
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')
graph_files += Glob('src/graph/CL/*.cpp')
graph_files += Glob('src/graph/NEON/*.cpp')
@@ -212,8 +234,10 @@
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])