numo-narray 0.9.1.3 → 0.9.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4081b1facf83501be82b2446c10bddefbf2e60530f1249074b880f7729968b4f
-  data.tar.gz: 19b64cf6e4778f25f60f821a6454cc1b5d2e9dc12f60ecb9f3bfb928155e45db
+  metadata.gz: aba2ab60aae2fbf24973f75a9b17c9f35bd7fec15c58e110b6711a62773b2de0
+  data.tar.gz: feae74cc5b9d5dfbe238f78f60b22f017a4558b241fe772b0615ac3fa0c80b68
 SHA512:
-  metadata.gz: a7e32c3a9b208bb23d83c8d4b2f96a7e646e7e9db5bb42c2eea81598b9fdd4072f452f7318f4b9c594152bc9587c596896f1f55d4d41c3cb48ced01b0e764a28
-  data.tar.gz: b2686de4edbcbb35ff180c8a706f23f853740526249ac1f7c9729bd42fb34af5922eca9fd383a8cbea46ecc85280164a9346fbbc2f31fe4839a8bc15c7ccb8c3
+  metadata.gz: f7af93ba0ac1b6732fa9bbe22f72572ecdd8c9142861c0a12ca9124eb2094fef512923ce6040a52576c835ebde4b9a697af973e68c97a9703430f92ad5d6442b
+  data.tar.gz: b413079a3a924e698b074183d462397bd306bad255e619d1e58b52c623c175d93ca5ad72dbf17a84becc21172f10cc0cba4ea6c5d8c291cc706e20e0ff867d2e

data/Rakefile

@@ -68,13 +68,14 @@ namespace :release do
   end
 end
 
+rescue LoadError
+end
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.verbose = true
+  t.verbose = false
+  t.warning = false
   t.test_files = FileList['test/**/*_test.rb']
 end
-
-rescue LoadError
-end

data/ext/numo/narray/data.c

@@ -393,6 +393,10 @@ na_reshape_bang(int argc, VALUE *argv, VALUE self)
 {
     size_t *shape;
     narray_t *na;
+    narray_view_t *na2;
+    ssize_t stride;
+    stridx_t *stridx;
+    int i;
 
     if (na_check_contiguous(self)==Qfalse) {
         rb_raise(rb_eStandardError, "cannot change shape of non-contiguous NArray");
@@ -401,6 +405,23 @@ na_reshape_bang(int argc, VALUE *argv, VALUE self)
     na_check_reshape(argc, argv, self, shape);
 
     GetNArray(self, na);
+    if (na->type == NARRAY_VIEW_T) {
+        GetNArrayView(self, na2);
+        if (na->ndim < argc) {
+            stridx = ALLOC_N(stridx_t,argc);
+        } else {
+            stridx = na2->stridx;
+        }
+        stride = SDX_GET_STRIDE(na2->stridx[na->ndim-1]);
+        for (i=argc; i--;) {
+            SDX_SET_STRIDE(stridx[i],stride);
+            stride *= shape[i];
+        }
+        if (stridx != na2->stridx) {
+            xfree(na2->stridx);
+            na2->stridx = stridx;
+        }
+    }
     na_setup_shape(na, argc, shape);
     return self;
 }

data/ext/numo/narray/gen/tmpl_bit/mask.c

@@ -75,6 +75,10 @@ static void
 #define cIndex numo_cInt32
 #endif
 
+static void shape_error() {
+    rb_raise(nary_eShapeError,"mask and masked arrays must have the same shape");
+}
+
 /*
   Return subarray of argument masked with self bit array.
   @overload <%=op_map%>(array)
@@ -84,17 +88,33 @@ static void
 static VALUE
 <%=c_func(1)%>(VALUE mask, VALUE val)
 {
-    volatile VALUE idx_1, view;
+    int i;
+    VALUE idx_1, view;
     narray_data_t *nidx;
-    narray_view_t *nv;
-    narray_t      *na;
-    narray_view_t *na1;
+    narray_view_t *nv, *nv_val;
+    narray_t      *na, *na_mask;
     stridx_t stridx0;
     size_t n_1;
     where_opt_t g;
     ndfunc_arg_in_t ain[2] = {{cT,0},{Qnil,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP, 2, 0, ain, 0};
 
+    // cast val to NArray
+    if (!rb_obj_is_kind_of(val, numo_cNArray)) {
+        val = rb_funcall(numo_cNArray, id_cast, 1, val);
+    }
+    // shapes of mask and val must be same
+    GetNArray(val, na);
+    GetNArray(mask, na_mask);
+    if (na_mask->ndim != na->ndim) {
+        shape_error();
+    }
+    for (i=0; i<na->ndim; i++) {
+        if (na_mask->shape[i] != na->shape[i]) {
+            shape_error();
+        }
+    }
+
     n_1 = NUM2SIZET(<%=find_tmpl("count_true").c_func%>(0, NULL, mask));
     idx_1 = nary_new(cIndex, 1, &n_1);
     g.count = 0;
@@ -110,19 +130,19 @@ static VALUE
     GetNArrayData(idx_1,nidx);
     SDX_SET_INDEX(stridx0,(size_t*)nidx->ptr);
     nidx->ptr = NULL;
+    RB_GC_GUARD(idx_1);
 
     nv->stridx = ALLOC_N(stridx_t,1);
     nv->stridx[0] = stridx0;
     nv->offset = 0;
 
-    GetNArray(val, na);
     switch(NA_TYPE(na)) {
     case NARRAY_DATA_T:
         nv->data = val;
         break;
     case NARRAY_VIEW_T:
-        GetNArrayView(val, na1);
-        nv->data = na1->data;
+        GetNArrayView(val, nv_val);
+        nv->data = nv_val->data;
         break;
     default:
         rb_raise(rb_eRuntimeError,"invalid NA_TYPE: %d",NA_TYPE(na));

data/ext/numo/narray/narray.c

@@ -922,6 +922,39 @@ na_check_contiguous(VALUE self)
     return Qfalse;
 }
 
+VALUE
+na_check_fortran_contiguous(VALUE self)
+{
+    int i;
+    ssize_t st0;
+    narray_t *na;
+
+    switch(RNARRAY_TYPE(self)) {
+    case NARRAY_DATA_T:
+    case NARRAY_FILEMAP_T:
+        return Qfalse;
+    case NARRAY_VIEW_T:
+        GetNArray(self,na);
+
+        // not contiguous if it has index
+        for (i=0; i < NA_NDIM(na); i++) {
+            if (NA_IS_INDEX_AT(na,i))
+                return Qfalse;
+        }
+
+        // check f-contiguous
+        st0 = nary_element_stride(self); // elmsz
+        for (i=0; i < NA_NDIM(na); i++) {
+            if (NA_SHAPE(na)[i] == 1)
+                continue;
+            if (NA_STRIDE_AT(na, i) != st0)
+                return Qfalse;
+            st0 *= NA_SHAPE(na)[i];
+        }
+    }
+    return Qtrue;
+}
+
 //----------------------------------------------------------------------
 
 /*
@@ -1904,6 +1937,7 @@ Init_narray()
     rb_define_method(cNArray, "debug_info", nary_debug_info, 0);
 
     rb_define_method(cNArray, "contiguous?", na_check_contiguous, 0);
+    rb_define_method(cNArray, "fortran_contiguous?", na_check_fortran_contiguous, 0);
 
     rb_define_method(cNArray, "view", na_make_view, 0);
     rb_define_method(cNArray, "expand_dims", na_expand_dims, 1);

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

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.9.1.3"
-#define NARRAY_VERSION_CODE 913
+#define NARRAY_VERSION "0.9.1.4"
+#define NARRAY_VERSION_CODE 914
 
 #include <math.h>
 #include "numo/compat.h"

data/numo-narray.gemspec

@@ -28,8 +28,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/numo/narray/extconf.rb"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "bundler"
+  if RUBY_VERSION <'2.2' # Ruby 2.1.x
+    spec.add_development_dependency "rake", "<= 10.5", ">=10.1.1"
+  else
+    spec.add_development_dependency "rake"
+  end
   spec.add_development_dependency "test-unit"
   spec.add_development_dependency 'rake-compiler', "~> 1.0", ">= 1.0.1"
   spec.add_development_dependency "rake-compiler-dock", "~> 0"

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.1.3
+  version: 0.9.1.4
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -264,8 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: alpha release of Numo::NArray - New NArray class library in Ruby/Numo (NUmerical