Move zeros(), ones() to base ulab module

This commit is contained in:
Jeff Epler 2020-02-27 09:27:19 -06:00
parent daaacac16f
commit 83479f115b
6 changed files with 22 additions and 14 deletions

View file

@ -429,8 +429,6 @@ STATIC const mp_rom_map_elem_t ulab_linalg_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t)&linalg_size_obj }, { MP_ROM_QSTR(MP_QSTR_size), (mp_obj_t)&linalg_size_obj },
{ MP_ROM_QSTR(MP_QSTR_inv), (mp_obj_t)&linalg_inv_obj }, { MP_ROM_QSTR(MP_QSTR_inv), (mp_obj_t)&linalg_inv_obj },
{ MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t)&linalg_dot_obj }, { MP_ROM_QSTR(MP_QSTR_dot), (mp_obj_t)&linalg_dot_obj },
{ MP_ROM_QSTR(MP_QSTR_zeros), (mp_obj_t)&linalg_zeros_obj },
{ MP_ROM_QSTR(MP_QSTR_ones), (mp_obj_t)&linalg_ones_obj },
{ MP_ROM_QSTR(MP_QSTR_eye), (mp_obj_t)&linalg_eye_obj }, { MP_ROM_QSTR(MP_QSTR_eye), (mp_obj_t)&linalg_eye_obj },
{ MP_ROM_QSTR(MP_QSTR_det), (mp_obj_t)&linalg_det_obj }, { MP_ROM_QSTR(MP_QSTR_det), (mp_obj_t)&linalg_det_obj },
{ MP_ROM_QSTR(MP_QSTR_eig), (mp_obj_t)&linalg_eig_obj }, { MP_ROM_QSTR(MP_QSTR_eig), (mp_obj_t)&linalg_eig_obj },

View file

@ -23,6 +23,9 @@
#define JACOBI_MAX 20 #define JACOBI_MAX 20
MP_DECLARE_CONST_FUN_OBJ_KW(linalg_ones_obj);
MP_DECLARE_CONST_FUN_OBJ_KW(linalg_zeros_obj);
#if ULAB_LINALG_MODULE || ULAB_POLY_MODULE #if ULAB_LINALG_MODULE || ULAB_POLY_MODULE
bool linalg_invert_matrix(mp_float_t *, size_t ); bool linalg_invert_matrix(mp_float_t *, size_t );
#endif #endif

View file

@ -29,7 +29,7 @@
#include "numerical.h" #include "numerical.h"
#include "extras.h" #include "extras.h"
STATIC MP_DEFINE_STR_OBJ(ulab_version_obj, "0.34.0"); STATIC MP_DEFINE_STR_OBJ(ulab_version_obj, "0.35.0");
MP_DEFINE_CONST_FUN_OBJ_KW(ndarray_flatten_obj, 1, ndarray_flatten); MP_DEFINE_CONST_FUN_OBJ_KW(ndarray_flatten_obj, 1, ndarray_flatten);
@ -64,6 +64,8 @@ STATIC const mp_map_elem_t ulab_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_ulab) }, { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_ulab) },
{ MP_ROM_QSTR(MP_QSTR___version__), MP_ROM_PTR(&ulab_version_obj) }, { MP_ROM_QSTR(MP_QSTR___version__), MP_ROM_PTR(&ulab_version_obj) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_array), (mp_obj_t)&ulab_ndarray_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_array), (mp_obj_t)&ulab_ndarray_type },
{ MP_ROM_QSTR(MP_QSTR_zeros), (mp_obj_t)&linalg_zeros_obj },
{ MP_ROM_QSTR(MP_QSTR_ones), (mp_obj_t)&linalg_ones_obj },
#if ULAB_LINALG_MODULE #if ULAB_LINALG_MODULE
{ MP_ROM_QSTR(MP_QSTR_linalg), MP_ROM_PTR(&ulab_linalg_module) }, { MP_ROM_QSTR(MP_QSTR_linalg), MP_ROM_PTR(&ulab_linalg_module) },
#endif #endif

View file

@ -1,3 +1,8 @@
Thu, 27 Feb 2020
version 0.35.0
Move zeros, ones back into top level ulab module
Tue, 18 Feb 2020 Tue, 18 Feb 2020

View file

@ -1,12 +1,12 @@
from ulab import linalg from ulab import linalg
import ulab import ulab
print(linalg.ones(3)) print(ulab.ones(3))
print(linalg.ones((2,3))) print(ulab.ones((2,3)))
print(linalg.zeros(3)) print(ulab.zeros(3))
print(linalg.zeros((2,3))) print(ulab.zeros((2,3)))
print(linalg.eye(3)) print(linalg.eye(3))
print(linalg.ones(1, dtype=ulab.int8)) print(ulab.ones(1, dtype=ulab.int8))
print(linalg.ones(2, dtype=ulab.uint8)) print(ulab.ones(2, dtype=ulab.uint8))
print(linalg.ones(3, dtype=ulab.int16)) print(ulab.ones(3, dtype=ulab.int16))
print(linalg.ones(4, dtype=ulab.uint16)) print(ulab.ones(4, dtype=ulab.uint16))
print(linalg.ones(5, dtype=ulab.float)) print(ulab.ones(5, dtype=ulab.float))

View file

@ -1,5 +1,5 @@
from ulab import linalg import ulab
a = linalg.ones(3) a = ulab.ones(3)
print(a+a) print(a+a)
print(a-a) print(a-a)
print(a*a) print(a*a)