8000 found and fixed macro error in vectorise.h · adafruit/circuitpython-ulab@107587d · GitHub
[go: up one dir, main page]
Skip to content

Commit 107587d

Browse files
v923zv923z
committed
found and fixed macro error in vectorise.h
1 parent 22f85e0 commit 107587d

File tree

4 files changed

+35
-43
lines changed

4 files changed

+35
-43
lines changed

‎code/ulab.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "fft.h"
2525
#include "numerical.h"
2626

27-
#define ULAB_VERSION 0.261
27+
#define ULAB_VERSION 0.262
2828

2929
typedef struct _mp_obj_float_t {
3030
mp_obj_base_t base;

‎code/vectorise.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ mp_obj_t vectorise_sqrt(mp_obj_t );
3737
mp_obj_t vectorise_tan(mp_obj_t );
3838
mp_obj_t vectorise_tanh(mp_obj_t );
3939

40-
#define ITERATE_VECTOR(type, souce, out) do {\
40+
#define ITERATE_VECTOR(type, source, out) do {\
4141
type *input = (type *)(source)->array->items;\
4242
for(size_t i=0; i < (source)->array->len; i++) {\
4343
(out)[i] = f(input[i]);\

‎docs/ulab-change-log.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11

2+
Fri, 29 Nov 2019
3+
4+
version 0.262
5+
6+
fixed error in macro in vectorise.h
7+
28
Thu, 28 Nov 2019
39

410
version 0.261

‎docs/ulab.ipynb

Lines changed: 27 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5701,19 +5701,19 @@
57015701
},
57025702
{
57035703
"cell_type": "code",
5704-
"execution_count": 1287,
5704+
"execution_count": 29,
57055705
"metadata": {
57065706
"ExecuteTime": {
5707-
"end_time": "2019-10-11T16:58:25.434208Z",
5708-
"start_time": "2019-10-11T16:58:25.426658Z"
5707+
"end_time": "2019-11-29T06:58:41.845181Z",
5708+
"start_time": "2019-11-29T06:58:41.839893Z"
57095709
}
57105710
},
57115711
"outputs": [
57125712
{
57135713
"name": "stdout",
57145714
"output_type": "stream",
57155715
"text": [
5716-
"written 1477 bytes to vectorise.h\n"
5716+
"written 1478 bytes to vectorise.h\n"
57175717
]
57185718
}
57195719
],
@@ -5749,7 +5749,7 @@
57495749
"mp_obj_t vectorise_tan(mp_obj_t );\n",
57505750
"mp_obj_t vectorise_tanh(mp_obj_t );\n",
57515751
"\n",
5752-
"#define ITERATE_VECTOR(type, souce, out) do {\\\n",
5752+
"#define ITERATE_VECTOR(type, source, out) do {\\\n",
57535753
" type *input = (type *)(source)->array->items;\\\n",
57545754
" for(size_t i=0; i < (source)->array->len; i++) {\\\n",
57555755
" (out)[i] = f(input[i]);\\\n",
@@ -7843,11 +7843,11 @@
78437843
},
78447844
{
78457845
"cell_type": "code",
7846-
"execution_count": 25,
7846+
"execution_count": 34,
78477847
"metadata": {
78487848
"ExecuteTime": {
7849-
"end_time": "2019-11-28T18:14:35.176118Z",
7850-
"start_time": "2019-11-28T18:14:35.167956Z"
7849+
"end_time": "2019-11-29T07:00:45.792518Z",
7850+
"start_time": "2019-11-29T07:00:45.787301Z"
78517851
}
78527852
},
78537853
"outputs": [
@@ -7878,7 +7878,7 @@
78787878
"#include \"fft.h\"\n",
78797879
"#include \"numerical.h\"\n",
78807880
"\n",
7881-
"#define ULAB_VERSION 0.261\n",
7881+
"#define ULAB_VERSION 0.262\n",
78827882
"\n",
78837883
"typedef struct _mp_obj_float_t {\n",
78847884
" mp_obj_base_t base;\n",
@@ -8129,11 +8129,11 @@
81298129
},
81308130
{
81318131
"cell_type": "code",
8132-
"execution_count": 10,
8132+
"execution_count": 30,
81338133
"metadata": {
81348134
"ExecuteTime": {
8135-
"end_time": "2019-11-28T18:03:43.401789Z",
8136-
"start_time": "2019-11-28T18:03:43.099209Z"
8135+
"end_time": "2019-11-29T06:59:01.155825Z",
8136+
"start_time": "2019-11-29T06:59:00.779150Z"
81378137
}
81388138
},
81398139
"outputs": [
@@ -8154,35 +8154,15 @@
81548154
},
81558155
{
81568156
"cell_type": "code",
8157-
"execution_count": 23,
8157+
"execution_count": null,
81588158
"metadata": {
81598159
"ExecuteTime": {
8160-
"end_time": "2019-11-28T18:13:26.899898Z",
8161-
"start_time": "2019-11-28T18:13:25.781385Z"
8160+
"end_time": "2019-11-29T06:59:30.206401Z",
8161+
"start_time": "2019-11-29T06:59:03.404517Z"
81628162
},
81638163
"scrolled": false
81648164
},
8165-
"outputs": [
8166-
{
8167-
"name": "stdout",
8168-
"output_type": "stream",
8169-
"text": [
8170-
"Use make V=1 or set BUILD_VERBOSE in your environment to increase build verbosity.\n",
8171-
"Including User C Module from ../../../ulab/code\n",
8172-
"GEN build/genhdr/moduledefs.h\n",
8173-
"GEN build/genhdr/qstr.i.last\n",
8174-
"GEN build/genhdr/qstr.split\n",
8175-
"GEN build/genhdr/qstrdefs.collected.h\n",
8176-
"QSTR not updated\n",
8177-
"CC ../../py/objmodule.c\n",
8178-
"CC ../../../ulab/code/linalg.c\n",
8179-
"LINK micropython\n",
8180-
" text\t data\t bss\t dec\t hex\tfilename\n",
8181-
" 2119\t 6545\t 0\t 8664\t 21d8\tbuild/build/frozen_content.o\n",
8182-
" 498432\t 58336\t 2120\t 558888\t 88728\tmicropython\n"
8183-
]
8184-
}
8185-
],
8165+
"outputs": [],
81868166
"source": [
81878167
"!make USER_C_MODULES=../../../ulab all"
81888168
]
@@ -8240,11 +8220,11 @@
82408220
},
82418221
{
82428222
"cell_type": "code",
8243-
"execution_count": 26,
8223+
"execution_count": 35,
82448224
"metadata": {
82458225
"ExecuteTime": {
8246-
"end_time": "2019-11-28T18:15:03.402974Z",
8247-
"start_time": "2019-11-28T18:15:03.394292Z"
8226+
"end_time": "2019-11-29T07:01:25.832268Z",
8227+
"start_time": "2019-11-29T07:01:25.825600Z"
82488228
}
82498229
},
82508230
"outputs": [
@@ -8259,11 +8239,17 @@
82598239
"source": [
82608240
"%%writefile ../../../ulab/docs/ulab-change-log.md\n",
82618241
"\n",
8242+
"Fri, 29 Nov 2019\n",
8243+
"\n",
8244+
"version 0.262\n",
8245+
"\n",
8246+
" fixed error in macro in vectorise.h\n",
8247+
"\n",
82628248
"Thu, 28 Nov 2019\n",
82638249
"\n",
82648250
"version 0.261\n",
8265-
" \n",
8266-
" fixed bad indexing error in linalg.dot\n",
8251+
"\n",
8252+
" fixed bad indexing error in linalg.dot\n",
82678253
"\n",
82688254
"Tue, 6 Nov 2019\n",
82698255
"\n",

0 commit comments

Comments
 (0)
0