diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2018-03-14 14:23:47 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
| commit | 9280c9204a09f5f5bc69a150aea441684978d9f1 (patch) | |
| tree | 3633f6a99be430fc7b28952034fa699a5d63e498 /tests/SConscript | |
| parent | e5f3b7f9780111f9e5329ebcaabe96e3ac705c71 (diff) | |
| download | ComputeLibrary-9280c9204a09f5f5bc69a150aea441684978d9f1.tar.gz | |
COMPMID-959 Fixed removed dependency on graph in arm_compute_benchmark and validation
Change-Id: Ife6f770af33fc8e9c01744e55777410820041677
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/124552
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/SConscript')
| -rw-r--r-- | tests/SConscript | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/SConscript b/tests/SConscript index efe6437627..4a4f1bf5dc 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -58,15 +58,13 @@ Import("arm_compute_test_framework") test_env.Append(LIBS = arm_compute_test_framework) if env['os'] in ['android', 'bare_metal'] or env['standalone']: - Import("arm_compute_graph2_a") Import("arm_compute_a") Import("arm_compute_core_a") - test_env.Append(LIBS = [arm_compute_graph2_a, arm_compute_a, arm_compute_core_a]) + test_env.Append(LIBS = [arm_compute_a, arm_compute_core_a]) arm_compute_lib = arm_compute_a else: - Import("arm_compute_graph2_so") Import("arm_compute_so") - test_env.Append(LIBS = ["arm_compute_graph2", "arm_compute", "arm_compute_core"]) + test_env.Append(LIBS = ["arm_compute", "arm_compute_core"]) arm_compute_lib = arm_compute_so #FIXME Delete before release @@ -190,10 +188,12 @@ if test_env['validation_tests']: if test_env['opencl'] and test_env['neon']: if env['os'] == 'android': Import('arm_compute_graph_a') - graph_dependency = arm_compute_graph_a + Import("arm_compute_graph2_a") + graph_dependency = [ arm_compute_graph_a, arm_compute_graph2_a] else: Import('arm_compute_graph_so') - graph_dependency = arm_compute_graph_so + Import("arm_compute_graph2_so") + graph_dependency = [ arm_compute_graph_so, arm_compute_graph2_so] graph_utils = test_env.Object(source="../utils/GraphUtils.cpp", target="GraphUtils") for file in Glob("validate_examples/graph_*.cpp"): @@ -204,7 +204,7 @@ if test_env['validation_tests']: arm_compute_validate_examples += [ prog ] else: #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies - prog = test_env.Program(example, [ test_env.Object(source=file, target=example), graph_utils]+ files_validate_examples, LIBS = test_env["LIBS"] + ["arm_compute_graph"], LINKFLAGS=test_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) + prog = test_env.Program(example, [ test_env.Object(source=file, target=example), graph_utils]+ files_validate_examples, LIBS = test_env["LIBS"] + ["arm_compute_graph", "arm_compute_graph2"], LINKFLAGS=test_env["LINKFLAGS"]+['-Wl,--allow-shlib-undefined'] ) Depends(prog, graph_dependency) arm_compute_validate_examples += [ prog ] Depends(arm_compute_validate_examples, arm_compute_test_framework) |