Merge pull request #425 from v923z/samd-fix

fix compile error on SAMD devices

code/numpy/ndarray/ndarray_iter.c

@@ -18,8 +18,6 @@
 #include "py/runtime.h"
 
 #include "ndarray_iter.h"
-#include "../../ulab.h"
-#include "../../ndarray.h"
 
 #ifdef NDARRAY_HAS_FLATITER
 mp_obj_t ndarray_flatiter_make_new(mp_obj_t self_in) {

code/numpy/ndarray/ndarray_iter.h

@@ -18,9 +18,8 @@
 #include "py/obj.h"
 #include "py/objarray.h"
 
-#include "ulab.h"
-#include "ndarray.h"
-
+#include "../../ulab.h"
+#include "../../ndarray.h"
 
 // TODO: take simply mp_obj_ndarray_it_t from ndarray.c
 typedef struct _mp_obj_ndarray_flatiter_t {

code/ulab.c

@@ -33,7 +33,7 @@
 #include "user/user.h"
 #include "utils/utils.h"
 
-#define ULAB_VERSION 3.3.1
+#define ULAB_VERSION 3.3.2
 #define xstr(s) str(s)
 #define str(s) #s
 #define ULAB_VERSION_STRING xstr(ULAB_VERSION) xstr(-) xstr(ULAB_MAX_DIMS) xstr(D)

docs/ulab-change-log.md

@@ -1,5 +1,11 @@
 Thu, 22 Jul 2021
 
+version 3.3.2
+
+    fix compilation error on SAMD devices
+
+Thu, 22 Jul 2021
+
 version 3.3.1
 
     fix sum for 4D arrays