jepler/micropython-ulab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rebasing on master with any/all fix

Browse source
This commit is contained in:
Zoltán Vörös 2021-11-23 20:03:11 +01:00
parent 316f84174d
commit d0b1d40cf1
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/scipy/signal/signal.c
View file

@ -70,11 +70,7 @@ mp_obj_t signal_sosfilt(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
mp_raise_TypeError(translate("sosfilt requires iterable arguments"));
}
#if ULAB_SUPPORTS_COMPLEX
<<<<<<< HEAD
if(mp_obj_is_type(args[1].u_obj, &ulab_ndarray_type)) {
=======
if(MP_OBJ_IS_TYPE(args[1].u_obj, &ulab_ndarray_type)) {
>>>>>>> 92b3513 (ulab can now be compiled with complex support)
ndarray_obj_t *ndarray = MP_OBJ_TO_PTR(args[1].u_obj);
COMPLEX_DTYPE_NOT_IMPLEMENTED(ndarray->dtype)
}