diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-12-22 15:27:52 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
| commit | d8734b55d89f05901ba9a75349761a9c955d9243 (patch) | |
| tree | e23d53a0fb73251f7416993e4d3a7241e533e79e /tests | |
| parent | 7390e05561a5c49306ebbf2eb2dcb1848546f201 (diff) | |
| download | ComputeLibrary-d8734b55d89f05901ba9a75349761a9c955d9243.tar.gz | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/SConscript | 16 | ||||
| -rw-r--r-- | tests/framework/instruments/InstrumentsStats.cpp | 2 | ||||
| -rw-r--r-- | tests/validation/reference/Scale.cpp | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/tests/SConscript b/tests/SConscript index f6fe49ad1d..efe6437627 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -1,4 +1,4 @@ -# Copyright (c) 2017 ARM Limited. +# Copyright (c) 2017, 2018 ARM Limited. # # SPDX-License-Identifier: MIT # @@ -58,13 +58,15 @@ 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_a, arm_compute_core_a]) + test_env.Append(LIBS = [arm_compute_graph2_a, 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", "arm_compute_core"]) + test_env.Append(LIBS = ["arm_compute_graph2", "arm_compute", "arm_compute_core"]) arm_compute_lib = arm_compute_so #FIXME Delete before release @@ -231,10 +233,12 @@ if test_env['benchmark_examples']: 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("../examples/graph_*.cpp"): @@ -245,7 +249,7 @@ if test_env['benchmark_examples']: arm_compute_benchmark_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_benchmark_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_benchmark_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_benchmark_examples += [ prog ] Depends(arm_compute_benchmark_examples, arm_compute_test_framework) diff --git a/tests/framework/instruments/InstrumentsStats.cpp b/tests/framework/instruments/InstrumentsStats.cpp index 6fad8f36ed..8f7d8a18e3 100644 --- a/tests/framework/instruments/InstrumentsStats.cpp +++ b/tests/framework/instruments/InstrumentsStats.cpp @@ -22,7 +22,7 @@ * SOFTWARE. */ #include "InstrumentsStats.h" -#include "arm_compute/core/utils/misc/utility.h" +#include "arm_compute/core/utils/misc/Utility.h" namespace arm_compute { diff --git a/tests/validation/reference/Scale.cpp b/tests/validation/reference/Scale.cpp index 0cc96abcf3..5c9e95633c 100644 --- a/tests/validation/reference/Scale.cpp +++ b/tests/validation/reference/Scale.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,7 +24,7 @@ #include "Scale.h" #include "Utils.h" -#include "arm_compute/core/utils/misc/utility.h" +#include "arm_compute/core/utils/misc/Utility.h" #include "support/ToolchainSupport.h" namespace arm_compute |