Merge pull request #388 from v923z/gc-fix

fix garbage collection problem
v923z · May 13, 2021 · 05e2c57 · 05e2c57
2 parents 90824d2 + c08cba3
commit 05e2c57
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/code/ndarray.c b/code/ndarray.c
@@ -689,6 +689,7 @@ ndarray_obj_t *ndarray_new_ndarray(uint8_t ndim, size_t *shape, int32_t *strides
     // we could, perhaps, leave this step out, and initialise the array only, when needed
     memset(array, 0, len);
     ndarray->array = array;
+    ndarray->origin = array;
     return ndarray;
 }
 
@@ -781,6 +782,7 @@ ndarray_obj_t *ndarray_new_view(ndarray_obj_t *source, uint8_t ndim, size_t *sha
     uint8_t *pointer = (uint8_t *)source->array;
     pointer += offset;
     ndarray->array = pointer;
+    ndarray->origin = source->origin;
     return ndarray;
 }
 

diff --git a/code/ndarray.h b/code/ndarray.h
@@ -80,6 +80,7 @@ typedef struct _ndarray_obj_t {
     size_t shape[ULAB_MAX_DIMS];
     int32_t strides[ULAB_MAX_DIMS];
     void *array;
+    void *origin;
 } ndarray_obj_t;
 
 #if ULAB_HAS_DTYPE_OBJECT

diff --git a/code/ulab.c b/code/ulab.c
@@ -34,7 +34,7 @@
 #include "user/user.h"
 #include "utils/utils.h"
 
-#define ULAB_VERSION 2.7.0
+#define ULAB_VERSION 2.7.1
 #define xstr(s) str(s)
 #define str(s) #s
 #define ULAB_VERSION_STRING xstr(ULAB_VERSION) xstr(-) xstr(ULAB_MAX_DIMS) xstr(D)

diff --git a/docs/ulab-change-log.md b/docs/ulab-change-log.md
@@ -1,3 +1,9 @@
+Thu, 13 May 2021
+
+version 2.7.1
+
+    fix garbage collection problem
+
 Wed, 5 May 2021
 
 version 2.7.0

diff --git a/tests/numpy/gc.py b/tests/numpy/gc.py
@@ -0,0 +1,11 @@
+from ulab import numpy as np
+import gc
+
+data = np.ones(1000)[6:-6]
+print(sum(data))
+print(data)
+
+gc.collect()
+
+print(sum(data))
+print(data)
diff --git a/tests/numpy/gc.py.exp b/tests/numpy/gc.py.exp
@@ -0,0 +1,4 @@
+988.0000000000001
+array([1.0, 1.0, 1.0, ..., 1.0, 1.0, 1.0], dtype=float64)
+988.0000000000001
+array([1.0, 1.0, 1.0, ..., 1.0, 1.0, 1.0], dtype=float64)