Merge pull request #313 from v923z/norm-fix

removed redundant exception from linalg.norm

Author: v923z

code/numpy/linalg/linalg.c

@@ -365,12 +365,7 @@ static mp_obj_t linalg_norm(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     mp_obj_t x = args[0].u_obj;
     mp_obj_t axis = args[1].u_obj;
-    if((axis != mp_const_none) && (!MP_OBJ_IS_INT(axis))) {
-        mp_raise_TypeError(translate("axis must be None, or an integer"));
-    }
-
 
-// static mp_obj_t linalg_norm(mp_obj_t x) {
     mp_float_t dot = 0.0, value;
     size_t count = 1;
 

code/ulab.c

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

code/ulab_tools.c

@@ -162,7 +162,7 @@ void *ndarray_set_float_function(uint8_t dtype) {
 shape_strides tools_reduce_axes(ndarray_obj_t *ndarray, mp_obj_t axis) {
     // TODO: replace numerical_reduce_axes with this function, wherever applicable
     if(!mp_obj_is_int(axis) & (axis != mp_const_none)) {
-        mp_raise_TypeError(translate("axis must be an interable or ndarray"));
+        mp_raise_TypeError(translate("axis must be None, or an integer"));
     }
     shape_strides _shape_strides;
     size_t *shape = m_new(size_t, ULAB_MAX_DIMS);

docs/ulab-change-log.md

@@ -1,5 +1,11 @@
 Tue, 9 Feb 2021
 
+version 2.3.4
+
+    removed redundant exception from linalg.norm, fixed exception message in tools_reduce_axes
+
+Tue, 9 Feb 2021
+
 version 2.3.3
 
     linalg.norm should now work with the axis keyword argument