diff --git a/apps/code/catalog.universal.i18n b/apps/code/catalog.universal.i18n index 2dd492f00..08487fcad 100644 --- a/apps/code/catalog.universal.i18n +++ b/apps/code/catalog.universal.i18n @@ -204,6 +204,9 @@ PythonCommandNumpyTranspose = "ndarray.transpose()" PythonCommandNumpyTransposeWithoutArg = ".transpose()" PythonCommandNumpySort = "ndarray.sort()" PythonCommandNumpySortWithoutArg = ".sort()" +PythonCommandNumpyFromBuffer = "ndarray.frombuffer(b)" +PythonCommandNumpyToBytes = "ndarray.tobytes()" +PythonCommandNumpyToBytesWithoutArg = ".tobytes()" PythonCommandNumpySetPrintOptions = "np.set_printoptions()" PythonCommandNumpyGetPrintOptions = "np.get_printoptions()" PythonCommandNumpyNdinfo = "np.ndinfo(a)" diff --git a/apps/code/python_toolbox.cpp b/apps/code/python_toolbox.cpp index f78040216..bde91dc63 100644 --- a/apps/code/python_toolbox.cpp +++ b/apps/code/python_toolbox.cpp @@ -149,15 +149,17 @@ const ToolboxMessageTree NumpyNdarrayModuleChildren[] = { ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFull), ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLinspace), ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyLogspace), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCopy), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDtype), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlat), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlatten), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyShape), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyReshape), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySize), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTranspose), - ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySort), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFromBuffer), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyCopy, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyCopyWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyDtype, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyDtypeWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlat, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyFlatWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyFlatten, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyFlattenWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyShape, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyShapeWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyReshape, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyReshapeWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySize, I18n::Message::Default, false, I18n::Message::PythonCommandNumpySizeWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyTranspose, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyTransposeWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpySort, I18n::Message::Default, false, I18n::Message::PythonCommandNumpySortWithoutArg), + ToolboxMessageTree::Leaf(I18n::Message::PythonCommandNumpyToBytes, I18n::Message::Default, false, I18n::Message::PythonCommandNumpyToBytesWithoutArg) }; const ToolboxMessageTree NumpyFunctionsModuleChildren[] = { diff --git a/python/port/mod/ulab/ulab.h b/python/port/mod/ulab/ulab.h index 93cb77abe..f57db68c6 100644 --- a/python/port/mod/ulab/ulab.h +++ b/python/port/mod/ulab/ulab.h @@ -223,7 +223,7 @@ #endif #ifndef NDARRAY_HAS_TOBYTES -#define NDARRAY_HAS_TOBYTES (0) +#define NDARRAY_HAS_TOBYTES (1) #endif #ifndef NDARRAY_HAS_TRANSPOSE @@ -264,7 +264,7 @@ // frombuffer adds 600 bytes to the firmware #ifndef ULAB_NUMPY_HAS_FROMBUFFER -#define ULAB_NUMPY_HAS_FROMBUFFER (0) +#define ULAB_NUMPY_HAS_FROMBUFFER (1) #endif // functions that create an array diff --git a/python/port/mpconfigport.h b/python/port/mpconfigport.h index ba9baba18..0da15cb98 100644 --- a/python/port/mpconfigport.h +++ b/python/port/mpconfigport.h @@ -55,7 +55,7 @@ #define MICROPY_PY_ASYNC_AWAIT (0) // Whether to support bytearray object -#define MICROPY_PY_BUILTINS_BYTEARRAY (0) +#define MICROPY_PY_BUILTINS_BYTEARRAY (1) // Whether to support frozenset object #define MICROPY_PY_BUILTINS_FROZENSET (1)