jepler/micropython-ulab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add ULAB_HASH

Browse source
This commit is contained in:
Zoltán Vörös 2022-02-03 21:23:11 +01:00
parent e852f7fd42
commit effbd3cf38
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.sh
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
GIT_HASH=`git describe --abbrev=8 --always`
# POSIX compliant version # POSIX compliant version
readlinkf_posix() { readlinkf_posix() {
[ "${1:-}" ] || return 1 [ "${1:-}" ] || return 1
@ -42,7 +45,7 @@ HERE="$(dirname -- "$(readlinkf_posix -- "${0}")" )"
dims=${1-2} dims=${1-2}
make -C micropython/mpy-cross -j${NPROC} make -C micropython/mpy-cross -j${NPROC}
make -C micropython/ports/unix -j${NPROC} axtls make -C micropython/ports/unix -j${NPROC} axtls
make -C micropython/ports/unix -j${NPROC} USER_C_MODULES="${HERE}" DEBUG=1 STRIP=: MICROPY_PY_FFI=0 MICROPY_PY_BTREE=0 CFLAGS_EXTRA=-DULAB_MAX_DIMS=$dims BUILD=build-$dims PROG=micropython-$dims make -C micropython/ports/unix -j${NPROC} USER_C_MODULES="${HERE}" DEBUG=1 STRIP=: MICROPY_PY_FFI=0 MICROPY_PY_BTREE=0 CFLAGS_EXTRA=-DULAB_MAX_DIMS=$dims CFLAGS_EXTRA=-DULAB_HASH=$GIT_HASH BUILD=build-$dims PROG=micropython-$dims
bash test-common.sh "${dims}" "micropython/ports/unix/micropython-$dims" bash test-common.sh "${dims}" "micropython/ports/unix/micropython-$dims"

8
code/ulab.c
View file

@ -33,7 +33,7 @@
#include "user/user.h" #include "user/user.h"
#include "utils/utils.h" #include "utils/utils.h"
#define ULAB_VERSION 5.0.0 #define ULAB_VERSION 5.0.1
#define xstr(s) str(s) #define xstr(s) str(s)
#define str(s) #s #define str(s) #s
@ -45,6 +45,9 @@
STATIC MP_DEFINE_STR_OBJ(ulab_version_obj, ULAB_VERSION_STRING); STATIC MP_DEFINE_STR_OBJ(ulab_version_obj, ULAB_VERSION_STRING);
#ifdef ULAB_HASH
STATIC MP_DEFINE_STR_OBJ(ulab_sha_obj, xstr(ULAB_HASH));
#endif
STATIC const mp_rom_map_elem_t ulab_ndarray_locals_dict_table[] = { STATIC const mp_rom_map_elem_t ulab_ndarray_locals_dict_table[] = {
#if ULAB_MAX_DIMS > 1 #if ULAB_MAX_DIMS > 1
@ -149,6 +152,9 @@ const mp_obj_type_t ndarray_flatiter_type = {
STATIC const mp_map_elem_t ulab_globals_table[] = { 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) },
#ifdef ULAB_HASH
{ MP_ROM_QSTR(MP_QSTR___sha__), MP_ROM_PTR(&ulab_sha_obj) },
#endif
#if ULAB_HAS_DTYPE_OBJECT #if ULAB_HAS_DTYPE_OBJECT
{ MP_OBJ_NEW_QSTR(MP_QSTR_dtype), (mp_obj_t)&ulab_dtype_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_dtype), (mp_obj_t)&ulab_dtype_type },
#else #else

6
docs/ulab-change-log.md
View file

@ -1,3 +1,9 @@
Thu, 3 Feb 2022
version 5.0.1
add optional ULAB_HASH string
Tue, 1 Feb 2022 Tue, 1 Feb 2022
version 5.0.0 version 5.0.0