numo-narray 0.9.0.4 → 0.9.0.5

data/numo-narray.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{alpha release of Numo::NArray - New NArray class library in Ruby/Numo (NUmerical MOdule)}
   spec.homepage      = "https://github.com/ruby-numo/narray"
   spec.license       = "MIT"
+  spec.required_ruby_version = '~> 2.1'
 
   spec.files         = `git ls-files Gemfile README.md Rakefile lib ext numo-narray.gemspec spec`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/spec/narray_spec.rb

@@ -76,7 +76,7 @@ types.each do |dtype|
         it{expect(@a.stddev).to eq 3.710345895825168}
         it{expect(@a.rms).to eq 5.901977069875258}
       end
-      it{expect(@a.copy.fill(12)).to eq [12]*6}
+      it{expect(@a.dup.fill(12)).to eq [12]*6}
       it{expect((@a + 1)).to eq [2,3,4,6,8,12]}
       it{expect((@a - 1)).to eq [0,1,2,4,6,10]}
       it{expect((@a * 3)).to eq [3,6,9,15,21,33]}
@@ -183,7 +183,7 @@ types.each do |dtype|
         it{expect(@a.sort).to eq @src}
         it{expect(@a.sort_index).to eq [[0,1,2],[3,4,5]]}
       end
-      it{expect(@a.copy.fill(12)).to eq [[12]*3]*2}
+      it{expect(@a.dup.fill(12)).to eq [[12]*3]*2}
       it{expect((@a + 1)).to eq [[2,3,4],[6,8,12]]}
       it{expect((@a + [1,2,3])).to eq [[2,4,6],[6,9,14]]}
       it{expect((@a - 1)).to eq [[0,1,2],[4,6,10]]}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.9.0.4
+  version: 0.9.0.5
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,11 +120,13 @@ files:
 - ext/numo/narray/gen/def/uint32.rb
 - ext/numo/narray/gen/def/uint64.rb
 - ext/numo/narray/gen/def/uint8.rb
-- ext/numo/narray/gen/dtype.erb.c
+- ext/numo/narray/gen/erbpp2.rb
+- ext/numo/narray/gen/narray_def.rb
 - ext/numo/narray/gen/spec.rb
 - ext/numo/narray/gen/tmpl/accum.c
 - ext/numo/narray/gen/tmpl/accum_binary.c
 - ext/numo/narray/gen/tmpl/accum_index.c
+- ext/numo/narray/gen/tmpl/alloc_func.c
 - ext/numo/narray/gen/tmpl/allocate.c
 - ext/numo/narray/gen/tmpl/aref.c
 - ext/numo/narray/gen/tmpl/aset.c
@@ -134,7 +136,8 @@ files:
 - ext/numo/narray/gen/tmpl/bincount.c
 - ext/numo/narray/gen/tmpl/cast.c
 - ext/numo/narray/gen/tmpl/cast_array.c
-- ext/numo/narray/gen/tmpl/cast_numeric.c
+- ext/numo/narray/gen/tmpl/class.c
+- ext/numo/narray/gen/tmpl/clip.c
 - ext/numo/narray/gen/tmpl/coerce_cast.c
 - ext/numo/narray/gen/tmpl/cond_binary.c
 - ext/numo/narray/gen/tmpl/cond_unary.c
@@ -142,22 +145,28 @@ files:
 - ext/numo/narray/gen/tmpl/each.c
 - ext/numo/narray/gen/tmpl/each_with_index.c
 - ext/numo/narray/gen/tmpl/extract.c
+- ext/numo/narray/gen/tmpl/extract_data.c
 - ext/numo/narray/gen/tmpl/eye.c
 - ext/numo/narray/gen/tmpl/fill.c
 - ext/numo/narray/gen/tmpl/format.c
 - ext/numo/narray/gen/tmpl/format_to_a.c
+- ext/numo/narray/gen/tmpl/frexp.c
+- ext/numo/narray/gen/tmpl/init_class.c
+- ext/numo/narray/gen/tmpl/init_module.c
 - ext/numo/narray/gen/tmpl/inspect.c
+- ext/numo/narray/gen/tmpl/lib.c
 - ext/numo/narray/gen/tmpl/logseq.c
 - ext/numo/narray/gen/tmpl/map_with_index.c
 - ext/numo/narray/gen/tmpl/median.c
 - ext/numo/narray/gen/tmpl/minmax.c
+- ext/numo/narray/gen/tmpl/module.c
+- ext/numo/narray/gen/tmpl/new_dim0.c
 - ext/numo/narray/gen/tmpl/poly.c
 - ext/numo/narray/gen/tmpl/pow.c
 - ext/numo/narray/gen/tmpl/powint.c
 - ext/numo/narray/gen/tmpl/qsort.c
 - ext/numo/narray/gen/tmpl/rand.c
 - ext/numo/narray/gen/tmpl/rand_norm.c
-- ext/numo/narray/gen/tmpl/robj_allocate.c
 - ext/numo/narray/gen/tmpl/seq.c
 - ext/numo/narray/gen/tmpl/set2.c
 - ext/numo/narray/gen/tmpl/sort.c
@@ -170,6 +179,7 @@ files:
 - ext/numo/narray/gen/tmpl/to_a.c
 - ext/numo/narray/gen/tmpl/unary.c
 - ext/numo/narray/gen/tmpl/unary2.c
+- ext/numo/narray/gen/tmpl/unary_ret2.c
 - ext/numo/narray/gen/tmpl/unary_s.c
 - ext/numo/narray/gen/tmpl_bit/allocate.c
 - ext/numo/narray/gen/tmpl_bit/aref.c
@@ -177,10 +187,6 @@ files:
 - ext/numo/narray/gen/tmpl_bit/binary.c
 - ext/numo/narray/gen/tmpl_bit/bit_count.c
 - ext/numo/narray/gen/tmpl_bit/bit_reduce.c
-- ext/numo/narray/gen/tmpl_bit/cast.c
-- ext/numo/narray/gen/tmpl_bit/cast_array.c
-- ext/numo/narray/gen/tmpl_bit/cast_numeric.c
-- ext/numo/narray/gen/tmpl_bit/coerce_cast.c
 - ext/numo/narray/gen/tmpl_bit/each.c
 - ext/numo/narray/gen/tmpl_bit/each_with_index.c
 - ext/numo/narray/gen/tmpl_bit/extract.c
@@ -188,14 +194,11 @@ files:
 - ext/numo/narray/gen/tmpl_bit/format.c
 - ext/numo/narray/gen/tmpl_bit/format_to_a.c
 - ext/numo/narray/gen/tmpl_bit/inspect.c
-- ext/numo/narray/gen/tmpl_bit/map_with_index.c
 - ext/numo/narray/gen/tmpl_bit/mask.c
 - ext/numo/narray/gen/tmpl_bit/none_p.c
-- ext/numo/narray/gen/tmpl_bit/store.c
 - ext/numo/narray/gen/tmpl_bit/store_array.c
 - ext/numo/narray/gen/tmpl_bit/store_bit.c
 - ext/numo/narray/gen/tmpl_bit/store_from.c
-- ext/numo/narray/gen/tmpl_bit/store_numeric.c
 - ext/numo/narray/gen/tmpl_bit/to_a.c
 - ext/numo/narray/gen/tmpl_bit/unary.c
 - ext/numo/narray/gen/tmpl_bit/where.c
@@ -253,9 +256,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/ext/numo/narray/gen/dtype.erb.c

@@ -1,82 +0,0 @@
-/*
-  <%=type_name%>.c
-  Numerical Array Extension for Ruby
-    (C) Copyright 1999-2011,2013-2016 by Masahiro TANAKA
-*/
-
-#include <ruby.h>
-#include <math.h>
-#include "numo/narray.h"
-#include "numo/template.h"
-#include "SFMT.h"
-
-#define m_map(x) m_num_to_data(rb_yield(m_data_to_num(x)))
-
-<%
-eval open(File.join(File.dirname(__FILE__),"spec.rb")).read
-
-IdVar.declaration.each do |x| %>
-<%= x %><%
-end
-%>
-
-#include "numo/types/<%=type_name%>.h"
-
-VALUE cT;
-extern VALUE cRT;
-#ifdef mTM
-VALUE mTM;
-#endif
-
-static VALUE <%= find_tmpl('store').c_func %>(VALUE,VALUE);
-<%
-Function.codes.each do |x| %>
-<%= x %>
-<% end %>
-
-void
-Init_nary_<%=tp%>()
-{
-    volatile VALUE hCast;
-
-    cT = rb_define_class_under(mNumo, "<%=class_name%>", cNArray);
-    <% for x in class_alias %>
-    // alias of <%=class_name%>
-    rb_define_const(mNumo, "<%=x%>", <%=type_var%>);
-    <% end %>
-    <% if has_math %>
-    mTM = rb_define_module_under(cT, "Math"); <% end %>
-
-    <% if is_bit %>
-    rb_define_const(cT, "ELEMENT_BIT_SIZE",  INT2FIX(1));
-    rb_define_const(cT, "ELEMENT_BYTE_SIZE", rb_float_new(1.0/8));
-    rb_define_const(cT, "CONTIGUOUS_STRIDE", INT2FIX(1));
-    <% else %>
-    rb_define_const(cT, ELEMENT_BIT_SIZE,  INT2FIX(sizeof(dtype)*8));
-    rb_define_const(cT, ELEMENT_BYTE_SIZE, INT2FIX(sizeof(dtype)));
-    rb_define_const(cT, CONTIGUOUS_STRIDE, INT2FIX(sizeof(dtype)));
-    <% end %>
-
-    rb_define_singleton_method(cT, "[]", <%=cast_func%>, -2);
-
-    <% if is_object %>
-    rb_undef_method(rb_singleton_class(cT),"from_binary");
-    rb_undef_method(cT,"to_binary");
-    rb_undef_method(cT,"swap_byte");
-    rb_undef_method(cT,"to_network");
-    rb_undef_method(cT,"to_vacs");
-    rb_undef_method(cT,"to_host");
-    rb_undef_method(cT,"to_swapped");
-    <% end %>
-
-    <% Function.definitions.each do |x| %>
-    <%= x %><% end %>
-    <% IdVar.assignment.each do |x| %>
-    <%= x %><% end %>
-
-    hCast = rb_hash_new();
-    rb_define_const(cT, "UPCAST", hCast);
-    rb_hash_aset(hCast, rb_cArray,   cT);
-    <% for x in upcast %>
-    <%= x %><% end %>
-}

data/ext/numo/narray/gen/tmpl/cast_numeric.c

@@ -1,22 +0,0 @@
-static VALUE
- numo_<%=tp%>_new_dim0(dtype x)
-{
-    narray_t *na;
-    VALUE v;
-    dtype *ptr;
-
-    v = rb_narray_new(cT, 0, NULL);
-    GetNArray(v,na);
-    ptr = (dtype*)(char*)na_get_pointer_for_write(v);
-    *ptr = x;
-    na_release_lock(v);
-    return v;
-}
-
-static VALUE
-<%=c_func%>(VALUE x)
-{
-    dtype y;
-    y = m_num_to_data(x);
-    return numo_<%=tp%>_new_dim0(y);
-}

data/ext/numo/narray/gen/tmpl/robj_allocate.c

@@ -1,32 +0,0 @@
-static void
-na_gc_mark_robj(narray_data_t* na)
-{
-    size_t n, i;
-    VALUE *a;
-
-    if (na->ptr) {
-        a = (VALUE*)(na->ptr);
-        n = na->base.size;
-        for (i=0; i<n; i++) {
-            rb_gc_mark(a[i]);
-        }
-    }
-}
-
-void na_free(narray_data_t* na);
-
-VALUE
-<%=c_func%>(VALUE klass)
-{
-    narray_data_t *na = ALLOC(narray_data_t);
-
-    na->base.ndim = 0;
-    na->base.type = NARRAY_DATA_T;
-    na->base.flag[0] = 0;
-    na->base.flag[1] = 0;
-    na->base.size = 0;
-    na->base.shape = NULL;
-    na->base.reduce = INT2FIX(0);
-    na->ptr = NULL;
-    return Data_Wrap_Struct(klass, na_gc_mark_robj, na_free, na);
-}

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

@@ -1,37 +0,0 @@
-/*
-  Cast object to Numo::<%=class_name%>.
-  @overload [](elements)
-  @overload <%=method%>(array)
-  @param [Numeric,Array] elements
-  @param [Array] array
-  @return [Numo::<%=class_name%>]
-*/
-static VALUE
-<%=c_func%>(VALUE type, VALUE obj)
-{
-    VALUE v;
-    narray_t *na;
-    dtype x;
-
-    if (CLASS_OF(obj)==cT) {
-        return obj;
-    }
-    if (RTEST(rb_obj_is_kind_of(obj,rb_cNumeric))) {
-        x = m_num_to_data(obj);
-        return numo_<%=tp%>_new_dim0(x);
-    }
-    if (RTEST(rb_obj_is_kind_of(obj,rb_cArray))) {
-        return <%=find_tmpl("cast_array").c_func%>(obj);
-    }
-    if (IsNArray(obj)) {
-        GetNArray(obj,na);
-        v = rb_narray_new(cT, NA_NDIM(na), NA_SHAPE(na));
-        if (NA_SIZE(na) > 0) {
-            <%=find_tmpl("allocate").c_func%>(v);
-            <%=find_tmpl("store").c_func%>(v,obj);
-        }
-        return v;
-    }
-    rb_raise(nary_eCastError,"cannot cast to %s",rb_class2name(type));
-    return Qnil;
-}

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

@@ -1,18 +0,0 @@
-static VALUE
-<%=c_func%>(VALUE rary)
-{
-    VALUE vnc, nary;
-    narray_t *na;
-    na_compose_t *nc;
-
-    vnc = na_ary_composition(rary);
-    Data_Get_Struct(vnc, na_compose_t, nc);
-    nary = rb_narray_new(cT, nc->ndim, nc->shape);
-    RB_GC_GUARD(vnc);
-    GetNArray(nary,na);
-    if (na->size > 0) {
-        <%=find_tmpl("allocate").c_func%>(nary);
-        <%=find_tmpl("store_array").c_func%>(nary, rary);
-    }
-    return nary;
-}

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

@@ -1,22 +0,0 @@
-static VALUE
- numo_<%=tp%>_new_dim0(dtype x)
-{
-    narray_t *na;
-    VALUE v;
-    dtype *ptr;
-
-    v = rb_narray_new(cT, 0, NULL);
-    GetNArray(v,na);
-    ptr = (dtype*)(char*)na_get_pointer_for_write(v);
-    *ptr = x;
-    na_release_lock(v);
-    return v;
-}
-
-static VALUE
-<%=c_func%>(VALUE x)
-{
-    dtype y;
-    y = m_num_to_data(x);
-    return numo_<%=tp%>_new_dim0(y);
-}

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

@@ -1,8 +0,0 @@
-/*
-   @return [nil]
-*/
-static VALUE
-<%=c_func %>(VALUE value, VALUE type)
-{
-    return Qnil;
-}

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

@@ -1,94 +0,0 @@
-static inline dtype
-yield_map_with_index(dtype x, size_t *c, VALUE *a, int nd, int md)
-{
-    int j;
-    VALUE y;
-
-    a[0] = m_data_to_num(x);
-    for (j=0; j<=nd; j++) {
-        a[j+1] = SIZET2NUM(c[j]);
-    }
-    y = rb_yield(rb_ary_new4(md,a));
-    return m_num_to_data(y);
-}
-
-void
-<%=c_iter%>(na_loop_t *const lp)
-{
-    size_t  i;
-    char   *p1, *p2;
-    ssize_t s1, s2;
-    size_t *idx1, *idx2;
-    dtype x;
-    VALUE *a;
-    size_t *c;
-    int nd, md;
-
-    c = (size_t*)(lp->opt_ptr);
-    nd = lp->ndim - 1;
-    md = lp->ndim + 1;
-    a = ALLOCA_N(VALUE,md);
-
-    INIT_COUNTER(lp, i);
-    INIT_PTR_IDX(lp, 0, p1, s1, idx1);
-    INIT_PTR_IDX(lp, 1, p2, s2, idx2);
-
-    c[nd] = 0;
-    if (idx1) {
-        if (idx2) {
-            for (; i--;) {
-                GET_DATA_INDEX(p1,idx1,dtype,x);
-                x = yield_map_with_index(x,c,a,nd,md);
-                SET_DATA_INDEX(p2,idx2,dtype,x);
-                c[nd]++;
-            }
-        } else {
-            for (; i--;) {
-                GET_DATA_INDEX(p1,idx1,dtype,x);
-                x = yield_map_with_index(x,c,a,nd,md);
-                SET_DATA_STRIDE(p2,s2,dtype,x);
-                c[nd]++;
-            }
-        }
-    } else {
-        if (idx2) {
-            for (; i--;) {
-                GET_DATA_STRIDE(p1,s1,dtype,x);
-                x = yield_map_with_index(x,c,a,nd,md);
-                SET_DATA_INDEX(p2,idx2,dtype,x);
-                c[nd]++;
-            }
-        } else {
-            for (; i--;) {
-                GET_DATA_STRIDE(p1,s1,dtype,x);
-                x = yield_map_with_index(x,c,a,nd,md);
-                SET_DATA_STRIDE(p2,s2,dtype,x);
-                c[nd]++;
-            }
-        }
-    }
-}
-
-/*
-  Invokes the given block once for each element of self,
-  passing that element and indices along each axis as parameters.
-  Creates a new NArray containing the values returned by the block.
-  Inplace option is allowed, i.e., `nary.inplace.map` overwrites `nary`.
-
-  @overload <%=method%>
-
-  For a block {|x,i,j,...| ... }
-  @yield [x,i,j,...]  x is an element, i,j,... are multidimensional indices.
-
-  @return [Numo::NArray] mapped array
-
-*/
-static VALUE
-<%=c_func%>(VALUE self)
-{
-    ndfunc_arg_in_t ain[1] = {{Qnil,0}};
-    ndfunc_arg_out_t aout[1] = {{cT,0}};
-    ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP, 1,1, ain,aout};
-
-    return na_ndloop_with_index(&ndf, 1, self);
-}