fix concatenate (#575)

Author: v923z

code/numpy/create.c

@@ -248,6 +248,14 @@ mp_obj_t create_concatenate(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     size_t *shape = m_new0(size_t, ULAB_MAX_DIMS);
     mp_obj_tuple_t *ndarrays = MP_OBJ_TO_PTR(args[0].u_obj);
 
+    // first check, whether 
+
+    for(uint8_t i = 0; i < ndarrays->len; i++) {
+        if(!mp_obj_is_type(ndarrays->items[i], &ulab_ndarray_type)) {
+            mp_raise_ValueError(translate("only ndarrays can be concatenated"));
+        }
+    }
+    
     // first check, whether the arrays are compatible
     ndarray_obj_t *_ndarray = MP_OBJ_TO_PTR(ndarrays->items[0]);
     uint8_t dtype = _ndarray->dtype;

code/ulab.c

@@ -33,7 +33,7 @@
 #include "user/user.h"
 #include "utils/utils.h"
 
-#define ULAB_VERSION 6.0.2
+#define ULAB_VERSION 6.0.3
 #define xstr(s) str(s)
 #define str(s) #s
 

docs/ulab-change-log.md

@@ -1,3 +1,9 @@
+Sat, 14 Jan 2023
+
+version 6.0.3
+
+    fix how concatenate deals with scalar inputs
+
 Tue, 3 Jan 2023
 
 version 6.0.2

tests/2d/numpy/concatenate.py

@@ -3,6 +3,18 @@
 except:
     import numpy as np
 
+# test input types; the following should raise ValueErrors
+objects = [([1, 2], [3, 4]),
+            ((1, 2), (3, 4)), 
+            (1, 2, 3)]
+
+for obj in objects:
+    try:
+        np.concatenate(obj)
+    except ValueError as e:
+        print('ValueError: {}; failed with object {}\n'.format(e, obj))
+
+
 a = np.array([1,2,3], dtype=np.float)
 b = np.array([4,5,6], dtype=np.float)
 

tests/2d/numpy/concatenate.py.exp

@@ -1,3 +1,9 @@
+ValueError: only ndarrays can be concatenated; failed with object ([1, 2], [3, 4])
+
+ValueError: only ndarrays can be concatenated; failed with object ((1, 2), (3, 4))
+
+ValueError: only ndarrays can be concatenated; failed with object (1, 2, 3)
+
 array([1.0, 2.0, 3.0, 4.0, 5.0, 6.0], dtype=float64)
 array([1.0, 2.0, 3.0, 4.0, 5.0, 6.0], dtype=float64)
 array([[1.0, 2.0, 3.0],