Skip to content

Commit 9010918

Browse files
author
Jenkins
committed
Compute Library v25.02.1
1 parent b5ef896 commit 9010918

File tree

309 files changed

+594
-38465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+594
-38465
lines changed

‎Android.bp

-45
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ cc_library_static {
173173
proprietary: true,
174174
local_include_dirs: ["build/android-arm64v8a/src/core",
175175
"build/android-arm64v8a/src/core/CL",
176-
"compute_kernel_writer/include",
177176
"src/core/common",
178177
"src/core/helpers",
179178
"src/core/NEON/kernels/arm_gemm",
@@ -648,50 +647,6 @@ cc_library_static {
648647
"src/cpu/operators/CpuTranspose.cpp",
649648
"src/cpu/operators/CpuWinogradConv2d.cpp",
650649
"src/cpu/operators/internal/CpuGemmAssemblyDispatch.cpp",
651-
"src/dynamic_fusion/runtime/gpu/cl/ClKernelRuntime.cpp",
652-
"src/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.cpp",
653-
"src/dynamic_fusion/sketch/attributes/CastAttributes.cpp",
654-
"src/dynamic_fusion/sketch/attributes/ClampAttributes.cpp",
655-
"src/dynamic_fusion/sketch/attributes/Conv2dAttributes.cpp",
656-
"src/dynamic_fusion/sketch/attributes/DepthwiseConv2dAttributes.cpp",
657-
"src/dynamic_fusion/sketch/attributes/MatMulAttributes.cpp",
658-
"src/dynamic_fusion/sketch/attributes/Pool2dAttributes.cpp",
659-
"src/dynamic_fusion/sketch/attributes/ReshapeAttributes.cpp",
660-
"src/dynamic_fusion/sketch/attributes/ResizeAttributes.cpp",
661-
"src/dynamic_fusion/sketch/attributes/SoftmaxAttributes.cpp",
662-
"src/dynamic_fusion/sketch/gpu/GpuKernelComponentGraph.cpp",
663-
"src/dynamic_fusion/sketch/gpu/GpuKernelComponentGroup.cpp",
664-
"src/dynamic_fusion/sketch/gpu/GpuKernelComponentStream.cpp",
665-
"src/dynamic_fusion/sketch/gpu/GpuLogicalKernel.cpp",
666-
"src/dynamic_fusion/sketch/gpu/GpuOperatorGroup.cpp",
667-
"src/dynamic_fusion/sketch/gpu/GpuWorkloadContext.cpp",
668-
"src/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.cpp",
669-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentActivation.cpp",
670-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentCast.cpp",
671-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDepthwiseConv2d.cpp",
672-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentDirectConv2d.cpp",
673-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentElementwiseBinary.cpp",
674-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentMatMul.cpp",
675-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentPool2d.cpp",
676-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentReshape.cpp",
677-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentResize.cpp",
678-
"src/dynamic_fusion/sketch/gpu/components/cl/ClComponentStore.cpp",
679-
"src/dynamic_fusion/sketch/gpu/operators/GpuAdd.cpp",
680-
"src/dynamic_fusion/sketch/gpu/operators/GpuCast.cpp",
681-
"src/dynamic_fusion/sketch/gpu/operators/GpuClamp.cpp",
682-
"src/dynamic_fusion/sketch/gpu/operators/GpuConv2d.cpp",
683-
"src/dynamic_fusion/sketch/gpu/operators/GpuDepthwiseConv2d.cpp",
684-
"src/dynamic_fusion/sketch/gpu/operators/GpuMatMul.cpp",
685-
"src/dynamic_fusion/sketch/gpu/operators/GpuMul.cpp",
686-
"src/dynamic_fusion/sketch/gpu/operators/GpuOutput.cpp",
687-
"src/dynamic_fusion/sketch/gpu/operators/GpuPool2d.cpp",
688-
"src/dynamic_fusion/sketch/gpu/operators/GpuReshape.cpp",
689-
"src/dynamic_fusion/sketch/gpu/operators/GpuResize.cpp",
690-
"src/dynamic_fusion/sketch/gpu/operators/GpuSigmoid.cpp",
691-
"src/dynamic_fusion/sketch/gpu/operators/GpuSoftmax.cpp",
692-
"src/dynamic_fusion/sketch/gpu/operators/GpuSub.cpp",
693-
"src/dynamic_fusion/sketch/gpu/operators/GpuTanh.cpp",
694-
"src/dynamic_fusion/sketch/gpu/operators/internal/GpuElementwiseBinaryCommon.cpp",
695650
"src/gpu/cl/ClContext.cpp",
696651
"src/gpu/cl/ClKernelLibrary.cpp",
697652
"src/gpu/cl/ClQueue.cpp",

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
2828
list(APPEND CMAKE_MESSAGE_CONTEXT ArmCompute)
2929
project(
3030
ArmCompute
31-
VERSION 47.0.0
31+
VERSION 48.0.0
3232
DESCRIPTION
3333
"The Arm Compute Library is a collection of low-level machine learning functions optimized for Arm® Cortex®-A CPU and Arm® Mali™ GPU architectures"
3434
LANGUAGES C CXX ASM)

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<img src="https://raw.githubusercontent.com/ARM-software/ComputeLibrary/gh-pages/ACL_logo.png"/><br><br>
1010
</div>
1111

12-
# Compute Library ![](https://img.shields.io/badge/latest_release-25.02-green)
12+
# Compute Library ![](https://img.shields.io/badge/latest_release-25.02.1-green)
1313

1414

1515
The Compute Library is a collection of low-level machine learning functions optimized for Arm® Cortex®-A, Arm® Neoverse™ and Arm® Mali™ GPUs architectures.<br>
@@ -37,7 +37,7 @@ Key Features:
3737
<br>
3838

3939
## Documentation
40-
[![Documentation](https://img.shields.io/badge/documentation-25.02-green)](https://artificial-intelligence.sites.arm.com/computelibrary/v25.02/index.xhtml)
40+
[![Documentation](https://img.shields.io/badge/documentation-25.02.1-green)](https://artificial-intelligence.sites.arm.com/computelibrary/v25.02.1/index.xhtml)
4141

4242
> Note: The documentation includes the reference API, changelogs, build guide, contribution guide, errata, etc.
4343
@@ -50,22 +50,22 @@ All the binaries can be downloaded from [here](https://github.com/ARM-software/C
5050

5151
| Platform | Operating System | Release archive (Download) |
5252
| -------------- | ---------------- | -------------------------- |
53-
| Raspberry Pi 4 | Linux® 32bit | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-armv7a-cpu-bin.tar.gz) |
54-
| Raspberry Pi 4 | Linux® 64bit | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-aarch64-cpu-bin.tar.gz) |
55-
| Odroid N2 | Linux® 64bit | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-aarch64-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-aarch64-cpu-gpu-bin.tar.gz) |
56-
| HiKey960 | Linux® 64bit | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-aarch64-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-aarch64-cpu-gpu-bin.tar.gz) |
53+
| Raspberry Pi 4 | Linux® 32bit | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-armv7a-cpu-bin.tar.gz) |
54+
| Raspberry Pi 4 | Linux® 64bit | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-aarch64-cpu-bin.tar.gz) |
55+
| Odroid N2 | Linux® 64bit | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-aarch64-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-aarch64-cpu-gpu-bin.tar.gz) |
56+
| HiKey960 | Linux® 64bit | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-aarch64-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-aarch64-cpu-gpu-bin.tar.gz) |
5757

5858
<br>
5959

6060
| Architecture | Operating System | Release archive (Download) |
6161
| ------------ | ---------------- | -------------------------- |
62-
| armv7 | Linux® | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-armv7a-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-armv7a-cpu-gpu-bin.tar.gz) |
63-
| arm64-v8a | Android™ | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-android-aarch64-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-android-aarch64-cpu-gpu-bin.tar.gz) |
64-
| arm64-v8a | Linux® | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-aarch64-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02/arm_compute-v25.02-linux-aarch64-cpu-gpu-bin.tar.gz) |
62+
| armv7 | Linux® | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-armv7a-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-armv7a-cpu-gpu-bin.tar.gz) |
63+
| arm64-v8a | Android™ | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-android-aarch64-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-android-aarch64-cpu-gpu-bin.tar.gz) |
64+
| arm64-v8a | Linux® | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-aarch64-cpu-bin.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v25.02.1/arm_compute-v25.02.1-linux-aarch64-cpu-gpu-bin.tar.gz) |
6565

6666
<br>
6767

68-
Please refer to the following link for more pre-built binaries: [![](https://img.shields.io/badge/v25.02-bins-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/tag/v25.02)
68+
Please refer to the following link for more pre-built binaries: [![](https://img.shields.io/badge/v25.02.1-bins-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/tag/v25.02.1)
6969

7070
Pre-build binaries are generated with the following security / good coding practices related flags:
7171
> -Wall, -Wextra, -Wformat=2, -Winit-self, -Wstrict-overflow=2, -Wswitch-default, -Woverloaded-virtual, -Wformat-security, -Wctor-dtor-privacy, -Wsign-promo, -Weffc++, -pedantic, -fstack-protector-strong
@@ -107,13 +107,13 @@ Pre-build binaries are generated with the following security / good coding pract
107107

108108
## Experimental builds
109109

110-
**⚠ Important** Bazel and CMake builds are experimental CPU only builds, please see the [documentation](https://artificial-intelligence.sites.arm.com/computelibrary/v25.02/how_to_build.xhtml) for more details.
110+
**⚠ Important** Bazel and CMake builds are experimental CPU only builds, please see the [documentation](https://artificial-intelligence.sites.arm.com/computelibrary/v25.02.1/how_to_build.xhtml) for more details.
111111

112112
<br>
113113

114114
## How to contribute
115115

116-
Contributions to the Compute Library are more than welcome. If you are interested on contributing, please have a look at our [how to contribute guidelines](https://artificial-intelligence.sites.arm.com/computelibrary/v25.02/contribution_guidelines.xhtml).
116+
Contributions to the Compute Library are more than welcome. If you are interested on contributing, please have a look at our [how to contribute guidelines](https://artificial-intelligence.sites.arm.com/computelibrary/v25.02.1/contribution_guidelines.xhtml).
117117

118118
### Developer Certificate of Origin (DCO)
119119
Before the Compute Library accepts your contribution, you need to certify its origin and give us your permission. To manage this process we use the Developer Certificate of Origin (DCO) V1.1 (https://developercertificate.org/)

‎REUSE.toml

-5
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ path = ["README.md"]
5656
SPDX-FileCopyrightText = "2018-2025 Arm Limited"
5757
SPDX-License-Identifier = "MIT"
5858

59-
[[annotations]]
60-
path = ["compute_kernel_writer/README.md"]
61-
SPDX-FileCopyrightText = "2023 Arm Limited"
62-
SPDX-License-Identifier = "MIT"
63-
6459
[[annotations]]
6560
path = ["examples/gemm_tuner/README.md"]
6661
SPDX-FileCopyrightText = "2019-2021 Arm Limited"

‎SConscript

+2-23
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import codecs
3333
import platform
3434
import SCons
3535

36-
VERSION = "v25.02"
37-
LIBRARY_VERSION_MAJOR = 47
36+
VERSION = "v25.02.1"
37+
LIBRARY_VERSION_MAJOR = 48
3838
LIBRARY_VERSION_MINOR = 0
3939
LIBRARY_VERSION_PATCH = 0
4040
SONAME_VERSION = str(LIBRARY_VERSION_MAJOR) + "." + str(LIBRARY_VERSION_MINOR) + "." + str(LIBRARY_VERSION_PATCH)
@@ -146,11 +146,6 @@ def recursive_glob(root_dir, pattern):
146146
return files
147147

148148

149-
def get_ckw_obj_list():
150-
cmake_obj_dir = os.path.abspath("CMakeFiles/ckw.dir/src")
151-
return recursive_glob(root_dir=cmake_obj_dir, pattern=".*.o$")
152-
153-
154149
def build_library(name, build_env, sources, static=False, libs=[]):
155150
cloned_build_env = build_env.Clone()
156151

@@ -188,20 +183,10 @@ def build_library(name, build_env, sources, static=False, libs=[]):
188183
if static:
189184
# Recreate the list to avoid mutating the original
190185
static_sources = list(sources)
191-
192-
# Dynamic Fusion has a direct dependency on the Compute Kernel Writer (CKW) subproject, therefore we collect the
193-
# built CKW objects to pack into the Compute Library archive.
194-
if env['experimental_dynamic_fusion'] and name == "arm_compute-static":
195-
static_sources += get_ckw_obj_list()
196-
197186
obj = cloned_build_env.StaticLibrary(name, source=static_sources, LIBS=arm_compute_env["LIBS"] + libs)
198187

199188
# -- Shared Library --
200189
else:
201-
# Always statically link Compute Library against CKW
202-
if env['experimental_dynamic_fusion'] and name == "arm_compute":
203-
libs.append('libckw.a')
204-
205190
# Add shared library versioning
206191
if env['set_soname']:
207192
obj = cloned_build_env.SharedLibrary(name, source=sources, SHLIBVERSION = SONAME_VERSION, LIBS = arm_compute_env["LIBS"] + libs)
@@ -598,12 +583,6 @@ lib_files = filelist['common']
598583
if env['fixed_format_kernels']:
599584
arm_compute_env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_FIXED_FORMAT_KERNELS'])
600585

601-
# Experimental files
602-
# Dynamic fusion
603-
if env['experimental_dynamic_fusion']:
604-
lib_files += filelist['experimental']['dynamic_fusion']['common']
605-
lib_files += filelist['experimental']['dynamic_fusion']['ckw_driver']
606-
607586
# Logging files
608587
if env["logging"]:
609588
lib_files += filelist['logging']

‎SConstruct

+3-50
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22

3-
# Copyright (c) 2016-2024 Arm Limited.
3+
# Copyright (c) 2016-2025 Arm Limited.
44
#
55
# SPDX-License-Identifier: MIT
66
#
@@ -130,7 +130,6 @@ vars.AddVariables(
130130
    ├── datasets
131131
    ├── fixtures
132132
    └── Neon\n""", "", PathVariable.PathAccept),
133-
BoolVariable("experimental_dynamic_fusion", "Build the experimental dynamic fusion files. This option also enables opencl=1 on which it has a direct dependency.", False),
134133
BoolVariable("fixed_format_kernels", "Enable fixed format kernels for GEMM", False),
135134
BoolVariable("mapfile", "Generate a map file", False),
136135
ListVariable("custom_options", "Custom options that can be used to turn on/off features", "none", ["disable_mmla_fp"]),
@@ -142,6 +141,7 @@ vars.AddVariables(
142141
BoolVariable("undefined_sanitizer", "Enable UndefinedBehaviorSanitizer", False),
143142
BoolVariable("thread_sanitizer", "Enable ThreadSanitizer", False),
144143
("extra_cxx_flags", "Extra CXX flags to be appended to the build command", ""),
144+
("extra_cc_flags", "Extra CC flags to be appended to the build command", ""),
145145
("extra_link_flags", "Extra LD flags to be appended to the build command", ""),
146146
("compiler_cache", "Command to prefix to the C and C++ compiler (e.g ccache)", ""),
147147
("specs_file", "Specs file to use (e.g. rdimon.specs)", ""),
@@ -222,10 +222,6 @@ if env['os'] == 'bare_metal':
222222
print("ERROR: OpenMP and C++11 threads not supported in bare_metal. Use cppthreads=0 openmp=0")
223223
Exit(1)
224224

225-
if env['experimental_dynamic_fusion']:
226-
# Dynamic Fusion on GPU has a direct dependency on OpenCL and Compute Kernel Writer
227-
env['opencl'] = 1
228-
229225
if env['opencl'] and env['embed_kernels'] and env['compress_kernels'] and env['os'] not in ['android']:
230226
print("Compressed kernels are supported only for android builds")
231227
Exit(1)
@@ -429,50 +425,6 @@ print("Using compilers:")
429425
print("CC", env['CC'])
430426
print("CXX", env['CXX'])
431427

432-
"""Build the Compute Kernel Writer subproject"""
433-
if env['experimental_dynamic_fusion']:
434-
# Strip ccache prefix from CC and CXX to obtain only the target triple
435-
CKW_CC = env['CC'].replace(env['compiler_cache'] + " ", "")
436-
CKW_CXX = env['CXX'].replace(env['compiler_cache'] + " ", "")
437-
CKW_CCACHE = 1 if env['compiler_cache'] else 0
438-
439-
CKW_BUILD_TYPE = "Debug" if env['debug'] else "Release"
440-
441-
CKW_ENABLE_OPENCL = env['opencl']
442-
CKW_ENABLE_ASSERTS = env['debug'] or env['asserts']
443-
444-
CKW_PROJECT_DIR = Dir('.').path + "/compute_kernel_writer"
445-
CKW_INCLUDE_DIR = CKW_PROJECT_DIR + "/include"
446-
CKW_BUILD_DIR = build_path.replace("#", "")
447-
448-
CKW_CMAKE_CMD = "CC={CKW_CC} CXX={CKW_CXX} cmake -G \"Unix Makefiles\" " \
449-
"-S {CKW_PROJECT_DIR} -B {CKW_BUILD_DIR} " \
450-
"-DCMAKE_BUILD_TYPE={CKW_BUILD_TYPE} " \
451-
"-DCKW_ENABLE_OPENCL=ON " \
452-
"-DCKW_ENABLE_ASSERTS={CKW_ENABLE_ASSERTS} " \
453-
"-DCKW_CCACHE={CKW_CCACHE} ".format(CKW_CC=CKW_CC,
454-
CKW_CXX=CKW_CXX,
455-
CKW_PROJECT_DIR=CKW_PROJECT_DIR,
456-
CKW_BUILD_DIR=CKW_BUILD_DIR,
457-
CKW_BUILD_TYPE=CKW_BUILD_TYPE,
458-
CKW_ENABLE_OPENCL=CKW_ENABLE_OPENCL,
459-
CKW_ENABLE_ASSERTS=CKW_ENABLE_ASSERTS,
460-
CKW_CCACHE=CKW_CCACHE
461-
)
462-
463-
# Configure CKW static objects with -fPIC (CMAKE_POSITION_INDEPENDENT_CODE) option to enable linking statically to ACL
464-
CKW_CMAKE_CONFIGURE_STATIC = CKW_CMAKE_CMD + "-DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON"
465-
CKW_CMAKE_BUILD = "cmake --build {CKW_BUILD_DIR} --target ckw -j{NUM_JOBS}".format(CKW_BUILD_DIR=CKW_BUILD_DIR,
466-
NUM_JOBS=GetOption('num_jobs')
467-
)
468-
469-
# Build Compute Kernel Writer Static Library
470-
subprocess.check_call(CKW_CMAKE_CONFIGURE_STATIC, stderr=subprocess.STDOUT, shell=True)
471-
subprocess.check_call(CKW_CMAKE_BUILD, stderr=subprocess.STDOUT, shell=True)
472-
473-
# Let ACL know where to find CKW headers
474-
env.Append(CPPPATH = CKW_INCLUDE_DIR)
475-
476428
if not GetOption("help"):
477429
try:
478430
if env['os'] == 'windows':
@@ -632,6 +584,7 @@ if env['thread_sanitizer']:
632584

633585
env.Append(CPPPATH = ['#/include', "#"])
634586
env.Append(CXXFLAGS = env['extra_cxx_flags'])
587+
env.Append(CCFLAGS = env['extra_cc_flags'])
635588
env.Append(LINKFLAGS = env['extra_link_flags'])
636589

637590
if env['multi_isa'] and env['os'] == 'macos':

0 commit comments

Comments
 (0)