Skip to content

Commit 9dc8db6

Browse files
authored
Merge pull request #1 from aobolensk/acl
Integrate ARM Compute Library
2 parents 2af8df6 + de453be commit 9dc8db6

File tree

5 files changed

+34
-27
lines changed

5 files changed

+34
-27
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
submodules: recursive
1616
- name: Install dependencies
1717
run: |
18-
sudo apt-get install -y cmake ninja-build ccache
18+
sudo apt-get install -y cmake ninja-build ccache scons
1919
- name: ccache
2020
uses: hendrikmuhs/[email protected]
2121
with:
@@ -37,7 +37,7 @@ jobs:
3737
submodules: recursive
3838
- name: Install dependencies
3939
run: |
40-
sudo apt-get install -y cmake ninja-build ccache
40+
sudo apt-get install -y cmake ninja-build ccache scons
4141
- name: ccache
4242
uses: hendrikmuhs/[email protected]
4343
with:
@@ -51,28 +51,6 @@ jobs:
5151
- name: Build
5252
run: |
5353
cmake --build build --parallel
54-
windows-msvc-build:
55-
runs-on: windows-latest
56-
defaults:
57-
run:
58-
shell: bash
59-
steps:
60-
- uses: actions/checkout@v4
61-
with:
62-
submodules: recursive
63-
- name: Setup ccache
64-
uses: Chocobo1/setup-ccache-action@v1
65-
with:
66-
windows_compile_environment: msvc
67-
- name: CMake configure
68-
shell: bash
69-
run: >
70-
cmake -S . -B build
71-
-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
72-
- name: Build
73-
shell: bash
74-
run: |
75-
cmake --build build --config Release --parallel
7654
macos-clang-build:
7755
runs-on: macOS-latest
7856
steps:
@@ -81,7 +59,7 @@ jobs:
8159
submodules: recursive
8260
- name: Install dependencies
8361
run: |
84-
brew install ninja
62+
brew install ninja scons
8563
- name: ccache
8664
uses: hendrikmuhs/[email protected]
8765
with:
@@ -103,7 +81,7 @@ jobs:
10381
submodules: true
10482
- name: Install dependencies
10583
run: |
106-
sudo apt-get install -y cmake ninja-build ccache gcovr lcov
84+
sudo apt-get install -y cmake ninja-build ccache gcovr lcov scons
10785
- uses: actions/checkout@v4
10886
with:
10987
submodules: true

.github/workflows/static-analysis-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Run clang-tidy
1919
with:
2020
build_dir: build
21-
apt_packages: ninja-build
21+
apt_packages: ninja-build,scons
2222
cmake_command: cmake -S . -B build -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
2323
config_file: .clang-tidy
2424
exclude: 3rdparty

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "3rdparty/googletest"]
22
path = 3rdparty/googletest
33
url = https://github.com/google/googletest
4+
[submodule "3rdparty/ComputeLibrary"]
5+
path = 3rdparty/ComputeLibrary
6+
url = https://github.com/embedded-dev-research/ComputeLibrary

3rdparty/CMakeLists.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,26 @@
11
add_subdirectory(googletest)
2+
3+
set(COMPUTE_LIBRARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ComputeLibrary)
4+
set(CMAKE_BUILD_PARALLEL_LEVEL 4)
5+
6+
if (LINUX)
7+
set(ACL_OS "linux")
8+
elseif(APPLE)
9+
set(ACL_OS "macos")
10+
else()
11+
set(ACL_OS "unknown")
12+
endif()
13+
14+
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
15+
set(ACL_ARCH "x86")
16+
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
17+
set(ACL_ARCH "armv8.2-a")
18+
else()
19+
set(ACL_OS "unknown")
20+
endif()
21+
22+
add_custom_target(build_compute_library ALL
23+
COMMAND scons Werror=1 debug=0 asserts=0 neon=0 opencl=0 os=${ACL_OS} embed_kernels=1 arch=${ACL_ARCH} -j${CMAKE_BUILD_PARALLEL_LEVEL}
24+
WORKING_DIRECTORY ${COMPUTE_LIBRARY_DIR}
25+
COMMENT "Building Arm Compute Library with scons"
26+
)

3rdparty/ComputeLibrary

Submodule ComputeLibrary added at c61bd33

0 commit comments

Comments
 (0)