diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2022-07-05 14:07:23 +0100 |
|---|---|---|
| committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2022-07-07 13:35:59 +0000 |
| commit | 22dd8b9014112fe446cb8cff6d52933d2603a97f (patch) | |
| tree | 945a33fd1ffdfbf37fb07366a90f26946853a24f /examples | |
| parent | a3f7cd2781f4b8781ae0667dd48159fcdd096469 (diff) | |
| download | ComputeLibrary-22dd8b9014112fe446cb8cff6d52933d2603a97f.tar.gz | |
Add missing flag when building cl graph examples and fix
incorrect cl cache behaviour
Resolves: COMPMID-5286
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Change-Id: I1aa82825ef7d31d7830a00282d1a3523ccf1d746
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7883
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com>
Reviewed-by: SiCong Li <sicong.li@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/SConscript | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/examples/SConscript b/examples/SConscript index c8596eb355..7d9324ca9a 100644 --- a/examples/SConscript +++ b/examples/SConscript @@ -68,7 +68,6 @@ examples_libs = examples_env.get("LIBS",[]) for file in Glob("./graph_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) prog = None - if env['os'] in ['android', 'macos', 'bare_metal'] or env['standalone']: prog = examples_env.Program(example, ["{}.cpp".format(example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+[load_whole_archive, graph_dependency, noload_whole_archive] + extra_link_flags) Depends(prog, graph_dependency) @@ -82,24 +81,26 @@ for file in Glob("./graph_*.cpp"): Default(alias) if env['opencl'] and env['neon']: + examples_env.Append(CPPDEFINES = ['ARM_COMPUTE_CL']) for file in Glob("./neoncl_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = examples_libs + arm_compute_libs) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], LIBS = examples_libs + arm_compute_libs) Depends(prog, arm_compute_dependency) prog = install_bin(prog) alias = examples_env.Alias(example, prog) Default(alias) if env['opencl']: + examples_env.Append(CPPDEFINES = ['ARM_COMPUTE_CL']) for file in Glob("./cl_*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) - prog = examples_env.Program(example, ["{}.cpp".format(example), utils], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = examples_libs + arm_compute_libs) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils], LIBS = examples_libs + arm_compute_libs) Depends(prog, arm_compute_dependency) prog = install_bin(prog) alias = examples_env.Alias(example, prog) Default(alias) if env['experimental_dynamic_fusion']: - examples_env.Append(CPPDEFINES = ['ARM_COMPUTE_CL', 'ENABLE_EXPERIMENTAL_DYNAMIC_FUSION']) + examples_env.Append(CPPDEFINES = ['ENABLE_EXPERIMENTAL_DYNAMIC_FUSION']) for file in Glob("./dynamic_fusion/*.cpp"): example = os.path.basename(os.path.splitext(str(file))[0]) prog = examples_env.Program(example, ["./dynamic_fusion/{}.cpp".format(example), utils], LIBS = examples_libs + arm_compute_libs) @@ -114,12 +115,12 @@ if env['gemm_tuner'] and env['opencl']: example = os.path.basename(os.path.splitext(str(file))[0]) example = os.path.join("gemm_tuner", example) if env['os'] in ['android', 'macos', 'bare_metal'] or env['standalone']: - prog = examples_env.Program(example, ["{}.cpp".format(example), utils, gemm_tuner_common_options], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+[load_whole_archive, graph_dependency, noload_whole_archive, '-fstack-protector-strong'] ) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils, gemm_tuner_common_options], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+[load_whole_archive, graph_dependency, noload_whole_archive, '-fstack-protector-strong'] ) Depends(prog, graph_dependency) prog = install_bin(prog) else: #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies - prog = examples_env.Program(example, ["{}.cpp".format(example), utils, gemm_tuner_common_options], CPPDEFINES=['ARM_COMPUTE_CL'], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) + prog = examples_env.Program(example, ["{}.cpp".format(example), utils, gemm_tuner_common_options], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) Depends(prog, graph_dependency) prog = install_bin(prog) alias = examples_env.Alias(example, prog) |