diff options
| author | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2022-05-20 14:30:02 +0100 |
|---|---|---|
| committer | Kshitij Sisodia <kshitij.sisodia@arm.com> | 2022-05-23 16:11:45 +0100 |
| commit | 9c6f9f8afcb003fd72944918d6b6e200d68c0918 (patch) | |
| tree | b1237909970ac74232f4ed81a26edc0847204269 /source/math/include/PlatformMath.hpp | |
| parent | 6f6df0934f991b64fef494b86643b3f5074fca0e (diff) | |
| download | ml-embedded-evaluation-kit-9c6f9f8afcb003fd72944918d6b6e200d68c0918.tar.gz | |
MLECO-3225: Using official support for Arm Cortex-M85 CPU.
* CMake version requirement bumped up to 3.21.0
* CMake 3.22.4 installed in the local Python virtualenv
* CPU flags updated in toolchain files.
* Using __ARM_FEATURE_DSP instead of potentially defining
ARM_MATH_DSP wrongly.
* CMake project version bumped up to 22.05.0
Changes also made for MLECO-3107 (pack generation):
* TensorFlow Lite Micro CMSIS-pack version updated to
1.22.02.
* Change to using __ARM_FEATURE_DSP will also help the
generated pack.
Partial changes for MLECO-3095:
* CMSIS updated to version post 5.9.0
* TensorFlow Lite Micro updated to latest available
* Ethos-U driver and core-platform repositories updated
to 20.05_rc2 tags.
Change-Id: I012c9e65897aed8ce589cff9bfe3a19efc3edeb9
Signed-off-by: Kshitij Sisodia <kshitij.sisodia@arm.com>
Diffstat (limited to 'source/math/include/PlatformMath.hpp')
| -rw-r--r-- | source/math/include/PlatformMath.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/math/include/PlatformMath.hpp b/source/math/include/PlatformMath.hpp index 2bf7733..859716f 100644 --- a/source/math/include/PlatformMath.hpp +++ b/source/math/include/PlatformMath.hpp @@ -18,12 +18,12 @@ #define PLATFORM_MATH_HPP /* See if ARM DSP functions can be used. */ -#if defined(ARM_MATH_DSP) - #include "arm_math.h" - #define M_PI (PI) -#else - #include <cmath> -#endif +#if (defined(__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)) +#include "arm_math.h" +#define M_PI (PI) +#else /* (defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)) */ +#include <cmath> +#endif /* (defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)) */ #include <vector> #include <cstdint> @@ -39,10 +39,10 @@ namespace math { }; struct FftInstance { -#if ARM_MATH_DSP +#if (defined(__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)) arm_rfft_fast_instance_f32 m_instanceReal; arm_cfft_instance_f32 m_instanceComplex; -#endif +#endif /* (defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)) */ uint16_t m_fftLen{0}; FftType m_type{FftType::real}; bool m_optimisedOptionAvailable{false}; @@ -177,4 +177,4 @@ namespace math { } /* namespace app */ } /* namespace arm */ -#endif /* PLATFORM_MATH_HPP */
\ No newline at end of file +#endif /* PLATFORM_MATH_HPP */ |