jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Conditionalize the ulab.numpy code on CIRCUITPY_ULAB

Browse source 
This allows _eve to build without ulab.
This commit is contained in:
James Bowman 2024-09-02 20:21:19 -07:00
parent 61154d81e9
commit 6b82e5cec6
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
shared-bindings/_eve/__init__.c
View file

@ -11,8 +11,10 @@
#include "py/runtime.h"
#include "py/binary.h"
#if CIRCUITPY_ULAB
#include "extmod/ulab/code/ulab.h"
#include "extmod/ulab/code/ndarray.h"
#endif
#include "shared-module/_eve/__init__.h"
#include "shared-bindings/_eve/__init__.h"
@ -847,6 +849,7 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(vertex2ii_obj, 3, 5, _vertex2ii);
// }
#if CIRCUITPY_ULAB
static bool is_vector(mp_obj_t a) {
if (!mp_obj_is_type(a, &ulab_ndarray_type)) {
return false;
@ -857,6 +860,7 @@ static bool is_vector(mp_obj_t a) {
}
return true;
}
#endif
// Hand-written functions {
@ -867,6 +871,7 @@ static bool is_vector(mp_obj_t a) {
//| :param float y: pixel y-coordinate"""
//| ...
static mp_obj_t _vertex2f(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
#if CIRCUITPY_ULAB
if (is_vector(a0) && is_vector(a1)) {
ndarray_obj_t *v0 = MP_OBJ_TO_PTR(a0);
ndarray_obj_t *v1 = MP_OBJ_TO_PTR(a1);
@ -875,11 +880,12 @@ static mp_obj_t _vertex2f(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
for (size_t i = 0; i < v0->len; i++, p0++, p1++) {
common_hal__eve_Vertex2f(EVEHAL(self), *p0, *p1);
}
} else {
mp_float_t x = mp_obj_get_float(a0);
mp_float_t y = mp_obj_get_float(a1);
common_hal__eve_Vertex2f(EVEHAL(self), x, y);
return mp_const_none;
}
#endif
mp_float_t x = mp_obj_get_float(a0);
mp_float_t y = mp_obj_get_float(a1);
common_hal__eve_Vertex2f(EVEHAL(self), x, y);
return mp_const_none;
}
static MP_DEFINE_CONST_FUN_OBJ_3(vertex2f_obj, _vertex2f);