From d7e4dea51ad19724adcd2c9f82eb42af12e0f5fc Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Tue, 21 Feb 2023 11:26:04 +0100 Subject: [PATCH] Update to PythonWrapper build Added cmake script for building darwin version. --- PythonWrapper/build_darwin/clean.sh | 5 +++++ PythonWrapper/build_darwin/create.sh | 12 ++++++++++++ setup.py | 7 ++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 PythonWrapper/build_darwin/clean.sh create mode 100644 PythonWrapper/build_darwin/create.sh diff --git a/PythonWrapper/build_darwin/clean.sh b/PythonWrapper/build_darwin/clean.sh new file mode 100644 index 00000000..611b023c --- /dev/null +++ b/PythonWrapper/build_darwin/clean.sh @@ -0,0 +1,5 @@ +rm -f CMakeCache.txt +rm -rf CMakeFiles +rm -f Makefile +rm -rf bin_dsp +rm -f cmake_install.cmake \ No newline at end of file diff --git a/PythonWrapper/build_darwin/create.sh b/PythonWrapper/build_darwin/create.sh new file mode 100644 index 00000000..219c1c2c --- /dev/null +++ b/PythonWrapper/build_darwin/create.sh @@ -0,0 +1,12 @@ +cmake -DHOST=YES \ + -DLOOPUNROLL=ON \ + -DWRAPPER=YES \ + -DCMAKE_POSITION_INDEPENDENT_CODE=YES \ + -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ + -DCMSISDSP="path to CMSIS-DSP folder" \ + -DCMAKE_C_FLAGS_RELEASE="-std=c11 -Ofast -ffast-math -DNDEBUG -Wall -Wextra" \ + -DCMAKE_CXX_FLAGS_RELEASE="-fno-rtti -std=c++11 -Ofast -ffast-math -DNDEBUG -Wall -Wextra -Wno-unused-parameter" \ + -G "Unix Makefiles" .. + +# For Mac universal lib +# -arch x86_64 -arch arm64 -mmacosx-version-min=11.0 \ No newline at end of file diff --git a/setup.py b/setup.py index a0748d73..4818c69f 100644 --- a/setup.py +++ b/setup.py @@ -104,11 +104,16 @@ def mkModule(name,srcs,funcDir): lib = ["CMSISDSP"] extraobjs=[] - if sys.platform.startswith('linux') or sys.platform.startswith('darwin'): + if sys.platform.startswith('linux'): lib = [] extraobjs = [os.path.join(ROOT,"PythonWrapper","build_linux","bin_dsp","libCMSISDSP.a")] libdir = [] + if sys.platform.startswith('darwin'): + lib = [] + extraobjs = [os.path.join(ROOT,"PythonWrapper","build_darwin","bin_dsp","libCMSISDSP.a")] + libdir = [] + return(Extension(name, sources = (srcs )