diff options
| author | Pablo Tello <pablo.tello@arm.com> | 2022-03-07 18:20:12 +0000 |
|---|---|---|
| committer | Pablo Marquez Tello <pablo.tello@arm.com> | 2022-03-10 13:44:39 +0000 |
| commit | 4e66d707a292b90a344e32c59eb1dacb67a0e4c1 (patch) | |
| tree | 48f8548c7a03f3586d27ae7b06d954b958912ee4 /src/core | |
| parent | 17c48f9e518abfcb45477f0eeebf487498c6a270 (diff) | |
| download | ComputeLibrary-4e66d707a292b90a344e32c59eb1dacb67a0e4c1.tar.gz | |
Added windows native build support
Resolves MLCE-739
Signed-off-by: Pablo Tello <pablo.tello@arm.com>
Change-Id: I30a11393e928061c82a5c93d8ec195c04a0e838b
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7279
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/gemm_hybrid_indirect.hpp | 6 | ||||
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/interleave_indirect.cpp | 6 | ||||
| -rw-r--r-- | src/core/NEON/kernels/arm_gemm/transform.cpp | 6 | ||||
| -rw-r--r-- | src/core/utils/misc/MMappedFile.cpp | 4 | ||||
| -rw-r--r-- | src/core/utils/quantization/AsymmHelpers.cpp | 6 |
5 files changed, 15 insertions, 13 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/gemm_hybrid_indirect.hpp b/src/core/NEON/kernels/arm_gemm/gemm_hybrid_indirect.hpp index 79fc65e561..5b3ef4203d 100644 --- a/src/core/NEON/kernels/arm_gemm/gemm_hybrid_indirect.hpp +++ b/src/core/NEON/kernels/arm_gemm/gemm_hybrid_indirect.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -23,9 +23,9 @@ */ #pragma once -#if !defined(__OpenBSD__) +#if !defined(_WIN64) && !defined(__OpenBSD__) #include <alloca.h> -#endif /* !defined(__OpenBSD__) */ +#endif /* !defined(_WIN64) && !defined(__OpenBSD__) */ #include <algorithm> #include <cassert> diff --git a/src/core/NEON/kernels/arm_gemm/interleave_indirect.cpp b/src/core/NEON/kernels/arm_gemm/interleave_indirect.cpp index 91988e8c33..59591935cd 100644 --- a/src/core/NEON/kernels/arm_gemm/interleave_indirect.cpp +++ b/src/core/NEON/kernels/arm_gemm/interleave_indirect.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021 Arm Limited. + * Copyright (c) 2020-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -28,9 +28,9 @@ #include "interleave_indirect.hpp" #include "bfloat.hpp" -#if !defined(__OpenBSD__) +#if !defined(_WIN64) && !defined(__OpenBSD__) #include <alloca.h> -#endif /* !defined(__OpenBSD__) */ +#endif /* !defined(_WIN64) && !defined(__OpenBSD__) */ #include <algorithm> #include <cstddef> diff --git a/src/core/NEON/kernels/arm_gemm/transform.cpp b/src/core/NEON/kernels/arm_gemm/transform.cpp index c6a3bc0edb..ef5a01a578 100644 --- a/src/core/NEON/kernels/arm_gemm/transform.cpp +++ b/src/core/NEON/kernels/arm_gemm/transform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -25,9 +25,9 @@ #include "bfloat.hpp" -#if !defined(__OpenBSD__) +#if !defined(_WIN64) && !defined(__OpenBSD__) #include <alloca.h> -#endif /* !defined(__OpenBSD__) */ +#endif /* !defined(_WIN64) && !defined(__OpenBSD__) */ namespace arm_gemm { diff --git a/src/core/utils/misc/MMappedFile.cpp b/src/core/utils/misc/MMappedFile.cpp index 0b9414107e..adae8a2bf0 100644 --- a/src/core/utils/misc/MMappedFile.cpp +++ b/src/core/utils/misc/MMappedFile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019, 2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#if !defined(BARE_METAL) +#if !defined(_WIN64) && !defined(BARE_METAL) #include "arm_compute/core/utils/misc/MMappedFile.h" diff --git a/src/core/utils/quantization/AsymmHelpers.cpp b/src/core/utils/quantization/AsymmHelpers.cpp index 4ce60996f5..eb008639b1 100644 --- a/src/core/utils/quantization/AsymmHelpers.cpp +++ b/src/core/utils/quantization/AsymmHelpers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -206,7 +206,9 @@ int32_t saturating_rounding_doubling_highmul(int32_t a, int32_t b) int64_t a_64(a); int64_t b_64(b); int64_t ab_64 = a_64 * b_64; - bool is_positive_or_zero = a == 0 || b == 0 || (std::signbit(a) == std::signbit(b)); + const bool is_positive_or_zero = + a == 0 || b == 0 || + (std::signbit(static_cast<double>(a)) == std::signbit(static_cast<double>(b))); int32_t nudge = is_positive_or_zero ? (1 << 30) : (1 - (1 << 30)); int32_t ab_x2_high32 = static_cast<int32_t>((ab_64 + nudge) / (1ll << 31)); return overflow ? std::numeric_limits<int32_t>::max() : ab_x2_high32; |