numo-narray-alt 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2567fb1002a21b25cf82239f1ecb39cfd3765c52847d431f814c1c1933f5af9d
-  data.tar.gz: 9737f59071d0078da064bc1fdc983d5bacaf80e90f871297f72cefd3f944d781
+  metadata.gz: 3add9ba11a05a8f7e149d5cc4f00b15b870cedc1ae8dd20a603213c9fa9f87bc
+  data.tar.gz: d2faa61ca233802311b7a77ec70bf1049cde822123d177274f27d667a5aa570b
 SHA512:
-  metadata.gz: b8191bdf1b90645a3ef109a84d6c3446b7e8321a4091ea2acd01469f71add1e4832b9acff113edc5ca5cd151a7e68cede491453e2d8040d1ecadfe3fec3ae3e7
-  data.tar.gz: f7894fd10299190e1b2ec16a8270990edb80cc5524bd2f279983479f4b9ab266c83ec288683a63fbcffcfef09bd68946b2c939b6b91d2c6e1acd06e067f60d12
+  metadata.gz: aceb6275928c5da4b8b2d2ca47faada75eec985ff762740954f76c9620fe73b7edc2346359336c2dd79ad9433998fdf425fbe5ceef8d760fd5d9f0718e2aa653
+  data.tar.gz: ef431dd49b3470c4ffdf5c4eeafa8faee4d2e66b9167c4d0dd4a5816ed8e83ad3e8590701cba491a6265453e9bcbfb6f2612d9f8ef3495a833b79736e08d5aa6

data/ext/numo/narray/index.c

@@ -519,27 +519,33 @@ static void na_index_aref_naview(
   ssize_t total = 1;
 
   for (i = j = 0; i < ndim; i++) {
-    stridx_t sdx1 = na1->stridx[q[i].orig_dim];
-    ssize_t size;
-
-    // numeric index -- trim dimension
-    if (!keep_dim && q[i].n == 1 && q[i].step == 0) {
-      if (SDX_IS_INDEX(sdx1)) {
-        na2->offset += SDX_GET_INDEX(sdx1)[q[i].beg];
-      } else {
-        na2->offset += SDX_GET_STRIDE(sdx1) * q[i].beg;
+    stridx_t sdx1;
+    sdx1.stride = 0;
+    sdx1.index = NULL;
+    const int qi_orig_dim = q[i].orig_dim;
+    if (qi_orig_dim < na1->base.ndim) {
+      sdx1 = na1->stridx[qi_orig_dim];
+
+      // numeric index -- trim dimension
+      if (!keep_dim && q[i].n == 1 && q[i].step == 0) {
+        if (SDX_IS_INDEX(sdx1)) {
+          na2->offset += SDX_GET_INDEX(sdx1)[q[i].beg];
+        } else {
+          na2->offset += SDX_GET_STRIDE(sdx1) * q[i].beg;
+        }
+        continue;
       }
-      continue;
     }
 
-    na2->base.shape[j] = size = q[i].n;
+    const ssize_t size = q[i].n;
+    na2->base.shape[j] = size;
 
     if (q[i].reduce != 0) {
       VALUE m = rb_funcall(INT2FIX(1), id_shift_left, 1, INT2FIX(j));
       na2->base.reduce = rb_funcall(m, '|', 1, na2->base.reduce);
     }
 
-    if (q[i].orig_dim >= na1->base.ndim) {
+    if (qi_orig_dim >= na1->base.ndim) {
       // new dimension
       SDX_SET_STRIDE(na2->stridx[j], elmsz);
     } else if (q[i].idx != NULL && SDX_IS_INDEX(sdx1)) {

data/ext/numo/narray/narray.c

@@ -278,6 +278,10 @@ void na_array_to_internal_shape(VALUE self, VALUE ary, size_t* shape) {
 void na_alloc_shape(narray_t* na, int ndim) {
   na->ndim = ndim;
   na->size = 0;
+  if (na->shape != NULL && na->shape != &(na->size)) {
+    xfree(na->shape);
+    na->shape = NULL;
+  }
   switch (ndim) {
   case 0:
   case 1:
@@ -290,10 +294,6 @@ void na_alloc_shape(narray_t* na, int ndim) {
     if (ndim > NA_MAX_DIMENSION) {
       rb_raise(nary_eDimensionError, "ndim=%d is too many", ndim);
     }
-    if (na->shape != NULL && na->shape != &(na->size)) {
-      xfree(na->shape);
-      na->shape = NULL;
-    }
     na->shape = ALLOC_N(size_t, ndim);
   }
 }

data/ext/numo/narray/numo/narray.h

@@ -13,10 +13,10 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.10.1"
+#define NARRAY_VERSION "0.10.3"
 #define NARRAY_VERSION_MAJOR 0
 #define NARRAY_VERSION_MINOR 10
-#define NARRAY_VERSION_PATCH 1
+#define NARRAY_VERSION_PATCH 3
 #define NARRAY_VERSION_CODE                                                                    \
   (NARRAY_VERSION_MAJOR * 10000 + NARRAY_VERSION_MINOR * 100 + NARRAY_VERSION_PATCH)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray-alt
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - yoshoku
@@ -214,7 +214,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/yoshoku/numo-narray-alt
   changelog_uri: https://github.com/yoshoku/numo-narray-alt/blob/main/CHANGELOG.md
-  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.10.1/
+  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.10.3/
   rubygems_mfa_required: 'true'
 post_install_message: |
   ===
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Numo::NArray Alternative is a project forked from Numo::NArray.
 test_files: []