Correction to python wrapper build so that the result can be used on google colab

pull/94/head
Christophe Favergeon 3 years ago
parent d1a2633be0
commit fab8a1e6a8

@ -27,7 +27,14 @@
*/
#ifndef CMSISMODULE_H
#define CMSISMODULE_H
#define NPY_NO_DEPRECATED_API NPY_1_15_API_VERSION
#define NPY_NO_DEPRECATED_API NPY_1_21_API_VERSION
#include <numpy/numpyconfig.h>
// API version used on google colab
#if (NPY_API_VERSION != 0x0000000E )
#error("Error building with wrong NumPy API version")
#endif
#ifdef WIN
#pragma warning( disable : 4013 )

@ -7,7 +7,6 @@ from colorama import init,Fore, Back, Style
from numpy.testing import assert_allclose
from numpy.linalg import norm
from dtw import *
import matplotlib
import matplotlib as mpl

@ -239,6 +239,10 @@ The wrapper is now containing the compute graph Python scripts and you should re
# Change history
## Version 1.9.5:
Same as 1.9.4 but will work in Google Colab.
## Version 1.9.4:
* Dynamic Time Warping API

@ -1,2 +1,2 @@
# Python wrapper version
__version__ = "1.9.4"
__version__ = "1.9.5"

@ -2,6 +2,6 @@
requires = [
"setuptools>=42",
"wheel",
"numpy>=1.19"
"numpy>=1.21, < 1.22"
]
build-backend = "setuptools.build_meta"

@ -299,11 +299,11 @@ def build():
"Intended Audience :: Developers",
],
keywords=['development','dsp','cmsis','cmsis-dsp','Arm','signal processing','maths','ml','cortex-m','cortex-a'],
install_requires=['numpy>=1.19',
'networkx>=2.5',
'jinja2>= 2.0, <3.0',
'sympy>=1.6',
'markupsafe<2.1'
install_requires=['numpy>=1.21, < 1.22 ',
'networkx>=3.0',
'jinja2>= 2.11.3, <3.0',
'sympy>=1.7.1',
'markupsafe>=2.0.1, <2.1'
],
project_urls={ # Optional
'Bug Reports': 'https://github.com/ARM-software/CMSIS-DSP/issues',

Loading…
Cancel
Save