numo-narray-alt 0.10.2 → 0.10.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/numo/narray/index.c +18 -12
- data/ext/numo/narray/numo/narray.h +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3add9ba11a05a8f7e149d5cc4f00b15b870cedc1ae8dd20a603213c9fa9f87bc
|
|
4
|
+
data.tar.gz: d2faa61ca233802311b7a77ec70bf1049cde822123d177274f27d667a5aa570b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: aceb6275928c5da4b8b2d2ca47faada75eec985ff762740954f76c9620fe73b7edc2346359336c2dd79ad9433998fdf425fbe5ceef8d760fd5d9f0718e2aa653
|
|
7
|
+
data.tar.gz: ef431dd49b3470c4ffdf5c4eeafa8faee4d2e66b9167c4d0dd4a5816ed8e83ad3e8590701cba491a6265453e9bcbfb6f2612d9f8ef3495a833b79736e08d5aa6
|
data/ext/numo/narray/index.c
CHANGED
|
@@ -519,27 +519,33 @@ static void na_index_aref_naview(
|
|
|
519
519
|
ssize_t total = 1;
|
|
520
520
|
|
|
521
521
|
for (i = j = 0; i < ndim; i++) {
|
|
522
|
-
stridx_t sdx1
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
if (
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
522
|
+
stridx_t sdx1;
|
|
523
|
+
sdx1.stride = 0;
|
|
524
|
+
sdx1.index = NULL;
|
|
525
|
+
const int qi_orig_dim = q[i].orig_dim;
|
|
526
|
+
if (qi_orig_dim < na1->base.ndim) {
|
|
527
|
+
sdx1 = na1->stridx[qi_orig_dim];
|
|
528
|
+
|
|
529
|
+
// numeric index -- trim dimension
|
|
530
|
+
if (!keep_dim && q[i].n == 1 && q[i].step == 0) {
|
|
531
|
+
if (SDX_IS_INDEX(sdx1)) {
|
|
532
|
+
na2->offset += SDX_GET_INDEX(sdx1)[q[i].beg];
|
|
533
|
+
} else {
|
|
534
|
+
na2->offset += SDX_GET_STRIDE(sdx1) * q[i].beg;
|
|
535
|
+
}
|
|
536
|
+
continue;
|
|
531
537
|
}
|
|
532
|
-
continue;
|
|
533
538
|
}
|
|
534
539
|
|
|
535
|
-
|
|
540
|
+
const ssize_t size = q[i].n;
|
|
541
|
+
na2->base.shape[j] = size;
|
|
536
542
|
|
|
537
543
|
if (q[i].reduce != 0) {
|
|
538
544
|
VALUE m = rb_funcall(INT2FIX(1), id_shift_left, 1, INT2FIX(j));
|
|
539
545
|
na2->base.reduce = rb_funcall(m, '|', 1, na2->base.reduce);
|
|
540
546
|
}
|
|
541
547
|
|
|
542
|
-
if (
|
|
548
|
+
if (qi_orig_dim >= na1->base.ndim) {
|
|
543
549
|
// new dimension
|
|
544
550
|
SDX_SET_STRIDE(na2->stridx[j], elmsz);
|
|
545
551
|
} else if (q[i].idx != NULL && SDX_IS_INDEX(sdx1)) {
|
|
@@ -13,10 +13,10 @@ extern "C" {
|
|
|
13
13
|
#endif
|
|
14
14
|
#endif
|
|
15
15
|
|
|
16
|
-
#define NARRAY_VERSION "0.10.
|
|
16
|
+
#define NARRAY_VERSION "0.10.3"
|
|
17
17
|
#define NARRAY_VERSION_MAJOR 0
|
|
18
18
|
#define NARRAY_VERSION_MINOR 10
|
|
19
|
-
#define NARRAY_VERSION_PATCH
|
|
19
|
+
#define NARRAY_VERSION_PATCH 3
|
|
20
20
|
#define NARRAY_VERSION_CODE \
|
|
21
21
|
(NARRAY_VERSION_MAJOR * 10000 + NARRAY_VERSION_MINOR * 100 + NARRAY_VERSION_PATCH)
|
|
22
22
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: numo-narray-alt
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.10.
|
|
4
|
+
version: 0.10.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- yoshoku
|
|
@@ -214,7 +214,7 @@ licenses:
|
|
|
214
214
|
metadata:
|
|
215
215
|
homepage_uri: https://github.com/yoshoku/numo-narray-alt
|
|
216
216
|
changelog_uri: https://github.com/yoshoku/numo-narray-alt/blob/main/CHANGELOG.md
|
|
217
|
-
documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.10.
|
|
217
|
+
documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.10.3/
|
|
218
218
|
rubygems_mfa_required: 'true'
|
|
219
219
|
post_install_message: |
|
|
220
220
|
===
|