Add missing constant constraints (#594)

Author: HugoNumworks

code/ndarray.h

@@ -230,11 +230,25 @@ mp_obj_t ndarray_flatten(size_t , const mp_obj_t *, mp_map_t *);
 MP_DECLARE_CONST_FUN_OBJ_KW(ndarray_flatten_obj);
 #endif
 
+#if NDARRAY_HAS_DTYPE
 mp_obj_t ndarray_dtype(mp_obj_t );
+#endif
+
+#if NDARRAY_HAS_ITEMSIZE
 mp_obj_t ndarray_itemsize(mp_obj_t );
+#endif
+
+#if NDARRAY_HAS_SIZE
 mp_obj_t ndarray_size(mp_obj_t );
+#endif
+
+#if NDARRAY_HAS_SHAPE
 mp_obj_t ndarray_shape(mp_obj_t );
+#endif
+
+#if NDARRAY_HAS_STRIDES
 mp_obj_t ndarray_strides(mp_obj_t );
+#endif
 
 #if NDARRAY_HAS_RESHAPE
 mp_obj_t ndarray_reshape_core(mp_obj_t , mp_obj_t , bool );
@@ -247,7 +261,7 @@ mp_obj_t ndarray_tobytes(mp_obj_t );
 MP_DECLARE_CONST_FUN_OBJ_1(ndarray_tobytes_obj);
 #endif
 
-#if NDARRAY_HAS_TOBYTES
+#if NDARRAY_HAS_TOLIST
 mp_obj_t ndarray_tolist(mp_obj_t );
 MP_DECLARE_CONST_FUN_OBJ_1(ndarray_tolist_obj);
 #endif

code/ndarray_properties.h

@@ -92,12 +92,29 @@ STATIC const mp_obj_property_t ndarray_strides_obj = {
 
 void ndarray_properties_attr(mp_obj_t , qstr , mp_obj_t *);
 
+#if NDARRAY_HAS_DTYPE
 MP_DEFINE_CONST_FUN_OBJ_1(ndarray_dtype_obj, ndarray_dtype);
+#endif
+
+#if NDARRAY_HAS_FLATITER
 MP_DEFINE_CONST_FUN_OBJ_1(ndarray_flatiter_make_new_obj, ndarray_flatiter_make_new);
+#endif
+
+#if NDARRAY_HAS_ITEMSIZE
 MP_DEFINE_CONST_FUN_OBJ_1(ndarray_itemsize_obj, ndarray_itemsize);
+#endif
+
+#if NDARRAY_HAS_SHAPE
 MP_DEFINE_CONST_FUN_OBJ_1(ndarray_shape_obj, ndarray_shape);
+#endif
+
+#if NDARRAY_HAS_SIZE
 MP_DEFINE_CONST_FUN_OBJ_1(ndarray_size_obj, ndarray_size);
+#endif
+
+#if NDARRAY_HAS_STRIDES
 MP_DEFINE_CONST_FUN_OBJ_1(ndarray_strides_obj, ndarray_strides);
+#endif
 
 #endif /* CIRCUITPY */
 

code/numpy/numerical.c

@@ -569,9 +569,11 @@ static mp_obj_t numerical_function(size_t n_args, const mp_obj_t *pos_args, mp_m
         mp_raise_TypeError(translate("axis must be None, or an integer"));
     }
 
+#if ULAB_NUMPY_HAS_ALL | ULAB_NUMPY_HAS_ANY
     if((optype == NUMERICAL_ALL) || (optype == NUMERICAL_ANY)) {
         return numerical_all_any(oin, axis, optype);
     }
+#endif
     if(mp_obj_is_type(oin, &mp_type_tuple) || mp_obj_is_type(oin, &mp_type_list) ||
         mp_obj_is_type(oin, &mp_type_range)) {
         switch(optype) {