fixed blocks_coords_from_pointer

Author: v923z

code/blocks/blocks.c

@@ -33,16 +33,17 @@ size_t *blocks_coords_from_pointer(void *p1, ndarray_obj_t *ndarray) {
     // This is a utility function, and is not exposed to the python interpreter
     blocks_block_obj_t *block = ndarray->block;
     size_t diff = (uint8_t *)p1 - (uint8_t *)block->origin;
-    printf("pointer: 0x%p, 0x%p, 0x%p, %ld\n", p1, ndarray->array, block->origin, diff);
-    size_t accumulator = ndarray->itemsize;
+    size_t stride = ndarray->itemsize;
     size_t *coords = m_new(size_t, ULAB_MAX_DIMS);
 
-    for(uint8_t i = 0; i < ndarray->ndim; i++) {
-        accumulator *= block->shape[ULAB_MAX_DIMS - i - 1];
-        coords[ULAB_MAX_DIMS - i] = diff % accumulator;
-        // diff -= coords[ULAB_MAX_DIMS - i] * block->shape[ULAB_MAX_DIMS - i];
-        diff -= coords[ULAB_MAX_DIMS - i - 1] * block->shape[ULAB_MAX_DIMS - i - 1];
-        printf("accumulator: %ld\n", diff);
+    // first, calculate the very first stride
+    for(uint8_t i = 0; i < block->ndim - 1; i++) {
+        stride *= block->shape[ULAB_MAX_DIMS - i - 1];
+    }
+    for(uint8_t i = block->ndim; i > 1; i--) {
+        coords[ULAB_MAX_DIMS - i] = diff / stride;
+        diff -= coords[ULAB_MAX_DIMS - i] * block->shape[ULAB_MAX_DIMS - i];
+        stride /= block->shape[ULAB_MAX_DIMS - i + 1];
     }
     return coords;
 }
@@ -113,6 +114,7 @@ mp_obj_t blocks_new_ndarray(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     ndarray->flags = BLOCK_IS_READ_ONLY;
     blocks_block_obj_t *block = m_new_obj(blocks_block_obj_t);
     block->base.type = &blocks_block_type;
+    block->ndim = ndarray->ndim;
     // store a pointer to the ndarray
     block->ndarray = ndarray;
 

code/ndarray.h

@@ -69,6 +69,7 @@ typedef struct _dtype_dtype {
 
 typedef struct _blocks_block_obj_t {
     mp_obj_base_t base;
+    uint8_t ndim;
     void *ndarray;
     void *arrfunc;
     uint8_t *subarray;

code/numpy/numerical/numerical.c

@@ -279,16 +279,6 @@ static mp_obj_t numerical_sum_mean_std_ndarray(ndarray_obj_t *ndarray, mp_obj_t
         uint8_t *rarray = NULL;
         mp_float_t *farray = NULL;
 
-        // #if ULAB_HAS_BLOCKS
-        // blocks_block_obj_t *block = NULL;
-        // if(ndarray->flags) {
-        //     block = ndarray->block;
-        //     // return mp_const_none;
-        // }
-        // #else
-        // uint8_t block = 0;
-        // #endif
-
         if(optype == NUMERICAL_SUM) {
             results = ndarray_new_dense_ndarray(_shape_strides.ndim, _shape_strides.shape, ndarray->dtype.type);
             rarray = (uint8_t *)results->array;

code/user/user.c

@@ -91,11 +91,10 @@ void imreader_imreader(ndarray_obj_t *ndarray, void *array, int32_t *strides, si
     // if necessary, get the coordinates in the original reference frame, i.e.,
     // in the coordinates used at the time of the creation of the object
     size_t *coords = blocks_coords_from_pointer(array, ndarray);
-    uint8_t x = (uint8_t)coords[ULAB_MAX_DIMS - 2] * (uint8_t)coords[ULAB_MAX_DIMS - 1];
-    printf("coords: %ld, %ld\n", coords[ULAB_MAX_DIMS - 2], coords[ULAB_MAX_DIMS - 1]);
+    uint8_t x = (uint8_t)coords[ULAB_MAX_DIMS - 2] * (uint8_t)block->shape[ULAB_MAX_DIMS - 2];
     for(size_t i = 0; i < count; i++) {
         // fill up the array with dummy data
-        *barray++ = (uint8_t)(x + i) * (x + i);
+        *barray++ = (uint8_t)((x + i) * (x + i));
     }
     // The subarray is a forward propagating dense array, so set the strides to the itemsize
     *strides = ndarray->itemsize;