diff options
| author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-11-18 15:29:08 +0000 |
|---|---|---|
| committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-12-17 08:40:07 +0000 |
| commit | 72610dcf2d634c9c2919ad55245c5c91609e87eb (patch) | |
| tree | c008e47e360f8e903aa26642c5ab0685d69bb1b5 /examples | |
| parent | 462e75e217a11b92b8df8c3434f2491ef70487e3 (diff) | |
| download | ComputeLibrary-72610dcf2d634c9c2919ad55245c5c91609e87eb.tar.gz | |
Remove 3rdparty submodule and internal_only build option
Remove 3rdparty submodule and allow to build external tests, examples
and benchmarks using the Compute Library test framework.
In order to use this option, the external tests directory must have the
following structure:
EXTERNAL_TESTS_DIR:
└── tests
├── benchmark
│ ├── CL
│ ├── datasets
│ ├── fixtures
│ └── NEON
└── validation
├── CL
├── datasets
├── fixtures
└── NEON
Then, the user can build the library with
`external_tests_dir=<PATH_TO_EXTERNAL_TESTS_DIR>`.
Also, remove internal_only build option". Without the 3rdparty
submodule, this build option is no longer needed.
Resolves: COMPMID-3417, COMPMID-3419
Change-Id: Ib7bf8ec7b9b9317fd82012a96bf4a7b0be846c1b
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4704
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/SConscript | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/examples/SConscript b/examples/SConscript index cd07c6a15a..ff457faf38 100644 --- a/examples/SConscript +++ b/examples/SConscript @@ -131,19 +131,19 @@ if env['gles_compute']: alias = examples_env.Alias(example, prog) Default(alias) -#FIXME Delete 3rdparty builds before release -for file in Glob("#3rdparty/examples/graph_*.cpp"): - example = os.path.basename(os.path.splitext(str(file))[0]) - prog = None +if env['external_tests_dir']: + for file in Glob(env['external_tests_dir'] + "/examples/graph_*.cpp"): + example = os.path.basename(os.path.splitext(str(file))[0]) + prog = None - if env['os'] in ['android', 'bare_metal'] or env['standalone']: - prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive'] + extra_link_flags) - Depends(prog, graph_dependency) - prog = install_bin(prog) - else: - #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies - prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], 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) - Default(alias) + if env['os'] in ['android', 'bare_metal'] or env['standalone']: + prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], LIBS = examples_libs + arm_compute_graph_libs, LINKFLAGS=examples_env["LINKFLAGS"]+['-Wl,--whole-archive',graph_dependency,'-Wl,--no-whole-archive'] + extra_link_flags) + Depends(prog, graph_dependency) + prog = install_bin(prog) + else: + #-Wl,--allow-shlib-undefined: Ignore dependencies of dependencies + prog = examples_env.Program(example, [examples_env.Object(source=file, target=example), utils, graph_utils], 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) + Default(alias) |