Commit 3ebc686f authored by Christophe Favergeon's avatar Christophe Favergeon
Browse files

Updates to Python wrapper 

Python 3.12 support
Bug corrections
Remove dependencies to compute graph (now is CMSIS-Stream on
another repository).
parents 5f5086fa b8db1e48

MANIFEST.in

+0 −1
Original line number Diff line number Diff line
@@ -2,6 +2,5 @@ include PythonWrapper_README.md 
recursive-include Include *.h 

recursive-include PrivateInclude *.h 

recursive-include PythonWrapper/cmsisdsp_pkg/src *.h 

include cmsisdsp/cg/scheduler/templates/*

include Source/DistanceFunctions/arm_boolean_distance_template.h

PythonWrapper/build_linux/create.sh

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ cmake -DHOST=YES \ 
  -DLOOPUNROLL=ON \

  -DWRAPPER=YES \

  -DCMAKE_POSITION_INDEPENDENT_CODE=YES \

  -DCMSISDSP="path to CMSIS-DSP folder" \

  -DCMSISDSP=".." \

  -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" ..

PythonWrapper/cmsisdsp_pkg/src/cmsisdsp_distance.c

+4 −4
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ cmsis_arm_dtw_init_window_q7(PyObject *obj, 
  arm_matrix_instance_q7 pSrc_converted; // input

   



  if (PyArg_ParseTuple(args,"iiO",&winType,&winSize,&pSrc));

  if (PyArg_ParseTuple(args,"iiO",&winType,&winSize,&pSrc))

  {



    q7MatrixFromNumpy(&pSrc_converted,pSrc);
@@ -267,7 +267,7 @@ cmsis_arm_dtw_distance_f32(PyObject *obj, 
  arm_matrix_instance_f32 dtw_converted;





  if (PyArg_ParseTuple(args,"OO",&pDist,&pWin));

  if (PyArg_ParseTuple(args,"OO",&pDist,&pWin))

  {



    f32MatrixFromNumpy(&pDist_converted,pDist);
@@ -348,7 +348,7 @@ cmsis_arm_dtw_path_f32(PyObject *obj, 
     Py_DECREF(pDstOBJ);

     return(pythonResult);

  }



  Py_RETURN_NONE;

}



static PyMethodDef CMSISDSPMethods[] = {

PythonWrapper/cmsisdsp_pkg/src/cmsisdsp_module.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
#include <numpy/numpyconfig.h>



// API version used on google colab

// List on https://github.com/numpy/numpy/blob/main/numpy/core/include/numpy/numpyconfig.h

// https://github.com/numpy/numpy/blob/main/numpy/_core/include/numpy/numpyconfig.h

#if (NPY_API_VERSION != 0x0000000F )

#error("Error building with wrong NumPy API version")

//#error("Error building with wrong NumPy API version")

#endif



#ifdef WIN

PythonWrapper/cmsisdsp_pkg/src/cmsisdsp_window.c

+20 −20
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ cmsis_arm_welch_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -125,7 +125,7 @@ cmsis_arm_bartlett_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -178,7 +178,7 @@ cmsis_arm_hamming_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -231,7 +231,7 @@ cmsis_arm_hanning_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -284,7 +284,7 @@ cmsis_arm_nuttall3_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -337,7 +337,7 @@ cmsis_arm_nuttall4_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -390,7 +390,7 @@ cmsis_arm_nuttall3a_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -443,7 +443,7 @@ cmsis_arm_nuttall3b_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -496,7 +496,7 @@ cmsis_arm_nuttall4a_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -549,7 +549,7 @@ cmsis_arm_blackman_harris_92db_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -602,7 +602,7 @@ cmsis_arm_nuttall4b_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -655,7 +655,7 @@ cmsis_arm_nuttall4c_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -708,7 +708,7 @@ cmsis_arm_hft90d_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -761,7 +761,7 @@ cmsis_arm_hft95_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -814,7 +814,7 @@ cmsis_arm_hft116d_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -867,7 +867,7 @@ cmsis_arm_hft144d_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -920,7 +920,7 @@ cmsis_arm_hft169d_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -973,7 +973,7 @@ cmsis_arm_hft196d_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -1026,7 +1026,7 @@ cmsis_arm_hft223d_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))
@@ -1079,7 +1079,7 @@ cmsis_arm_hft248d_f64(PyObject *obj, PyObject *args) 
{



  

  float32_t *pDst=NULL; // output

  float64_t *pDst=NULL; // output

  int nb; // input



  if (PyArg_ParseTuple(args,"i",&nb))

CRA Git | Maintained and supported by SUSTech CRA and CCSE