Set dims in C code

Author: Bisaloo

R/read_npy.R

@@ -227,60 +227,60 @@ convert_bytes_to_array <- function(bytes, what, shape, size, endian) {
     for (j in seq_len(n_records)) {
       res[[j]] <- lapply(res_fields, `[[`, j)
     }
-  } else {
-    if (is.na(endian)) {
-      endian <- .Platform$endian
-    }
-    # FIXME: optimize this
-    if (what != "unicode" && endian != .Platform$endian) {
-      ind <- rep_len(rev(seq_len(size)), length(bytes)) +
-        (seq_along(bytes) - 1L) %/% size * size
-      bytes <- bytes[ind]
-    }
-    res <- switch(
-      what,
-      float = .Call(
-        C_type_convert_float,
-        bytes,
-        size,
-        PACKAGE = "grumpy"
-      ),
-      int = .Call(
-        C_type_convert_int,
-        bytes,
-        size,
-        PACKAGE = "grumpy"
-      ),
-      uint = .Call(
-        C_type_convert_uint,
-        bytes,
-        size,
-        PACKAGE = "grumpy"
-      ),
-      bool = .Call(
-        C_type_convert_bool,
-        bytes,
-        size,
-        PACKAGE = "grumpy"
-      ),
-      string = .Call(
-        C_type_convert_string,
-        bytes,
-        size,
-        PACKAGE = "grumpy"
-      ),
-      unicode = .Call(
-        C_type_convert_unicode,
-        bytes,
-        size,
-        endian,
-        PACKAGE = "grumpy"
-      ),
-      stop("Unsupported data type: ", what, call. = FALSE)
-    )
+    dim(res) <- shape
+    return(res)
   }
 
-  dim(res) <- shape
+  if (is.na(endian)) {
+    endian <- .Platform$endian
+  }
+  # FIXME: optimize this
+  if (what != "unicode" && endian != .Platform$endian) {
+    ind <- rep_len(rev(seq_len(size)), length(bytes)) +
+      (seq_along(bytes) - 1L) %/% size * size
+    bytes <- bytes[ind]
+  }
+  res <- switch(
+    what,
+    float = .Call(
+      C_type_convert_float,
+      bytes,
+      size,
+      PACKAGE = "grumpy"
+    ),
+    int = .Call(
+      C_type_convert_int,
+      bytes,
+      size,
+      PACKAGE = "grumpy"
+    ),
+    uint = .Call(
+      C_type_convert_uint,
+      bytes,
+      size,
+      PACKAGE = "grumpy"
+    ),
+    bool = .Call(
+      C_type_convert_bool,
+      bytes,
+      size,
+      PACKAGE = "grumpy"
+    ),
+    string = .Call(
+      C_type_convert_string,
+      bytes,
+      size,
+      PACKAGE = "grumpy"
+    ),
+    unicode = .Call(
+      C_type_convert_unicode,
+      bytes,
+      size,
+      endian,
+      PACKAGE = "grumpy"
+    ),
+    stop("Unsupported data type: ", what, call. = FALSE)
+  )
 
   return(res)
 }

src/type_conversion.c

@@ -35,6 +35,10 @@ SEXP type_convert_int(SEXP input, SEXP _n_bytes) {
     }
   }
 
+  /* Set dim attribute if chunk_dim is not NULL / NA */
+  if (!isNull(chunk_dim) && xlength(chunk_dim) > 0) {
+    setAttrib(data, R_DimSymbol, chunk_dim);
+  }
   UNPROTECT(1);
   return(data);
 }
@@ -73,6 +77,11 @@ SEXP type_convert_uint(SEXP input, SEXP _n_bytes) {
     }
   }
 
+  /* Set dim attribute if chunk_dim is not NULL / NA */
+  if (!isNull(chunk_dim) && xlength(chunk_dim) > 0) {
+    setAttrib(data, R_DimSymbol, chunk_dim);
+  }
+
   UNPROTECT(1);
   return(data);
 }
@@ -111,6 +120,11 @@ SEXP type_convert_float(SEXP input, SEXP _n_bytes){
     error("%d byte floating point values are not currently supported\n", n_bytes);
   }
 
+  /* Set dim attribute if chunk_dim is not NULL / NA */
+  if (!isNull(chunk_dim) && xlength(chunk_dim) > 0) {
+    setAttrib(data, R_DimSymbol, chunk_dim);
+  }
+
   UNPROTECT(1);
   return(data);
 }
@@ -133,6 +147,11 @@ SEXP type_convert_bool(SEXP input, SEXP _n_bytes) {
     p_data[i] = ((const int8_t *)raw_buffer)[i];
   }
 
+  /* Set dim attribute if chunk_dim is not NULL / NA */
+  if (!isNull(chunk_dim) && xlength(chunk_dim) > 0) {
+    setAttrib(data, R_DimSymbol, chunk_dim);
+  }
+
   UNPROTECT(1);
   return(data);
 }
@@ -171,6 +190,11 @@ SEXP type_convert_string(SEXP input, SEXP _n_bytes) {
       SET_STRING_ELT(data, i, mkCharCE(field, CE_BYTES));
   }
 
+  /* Set dim attribute if chunk_dim is not NULL / NA */
+  if (!isNull(chunk_dim) && xlength(chunk_dim) > 0) {
+    setAttrib(data, R_DimSymbol, chunk_dim);
+  }
+
   UNPROTECT(1);
   return(data);
 }
@@ -232,8 +256,13 @@ SEXP type_convert_unicode(SEXP input, SEXP _n_bytes, SEXP _endian) {
 
     SET_STRING_ELT(data, i, mkCharCE(utf8_buf, CE_UTF8));
   }
-
   Riconv_close(cd);
+
+  /* Set dim attribute if chunk_dim is not NULL / NA */
+  if (!isNull(chunk_dim) && xlength(chunk_dim) > 0) {
+    setAttrib(data, R_DimSymbol, chunk_dim);
+  }
+
   UNPROTECT(1);
   return(data);
 }