numo-narray 0.9.1.4 → 0.9.1.5

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

@@ -44,44 +44,68 @@ static void
                 SET_DATA_INDEX(p2,idx2,dtype,x);
             }
         } else {
-<% if is_simd and !is_complex and %w[sqrt].include? name %>
-            // Check number of elements. & Check same alignment.
-            if ((n >= num_pack) && is_same_aligned2(&((dtype*)p1)[i], &((dtype*)p2)[i], SIMD_ALIGNMENT_SIZE)){
-                // Calculate up to the position just before the start of SIMD computation.
-                cnt = get_count_of_elements_not_aligned_to_simd_size(&((dtype*)p1)[i], SIMD_ALIGNMENT_SIZE, sizeof(dtype));
-                for (i=0; i < cnt; i++) {
-                    ((dtype*)p2)[i] = m_<%=name%>(((dtype*)p1)[i]);
-                }
+            //<% if need_align %>
+            if (is_aligned(p1,sizeof(dtype)) &&
+                is_aligned(p2,sizeof(dtype)) ) {
+                if (s1 == sizeof(dtype) &&
+                    s2 == sizeof(dtype) ) {
+                    //<% if is_simd and !is_complex and %w[sqrt].include? name %>
+                    // Check number of elements. & Check same alignment.
+                    if ((n >= num_pack) && is_same_aligned2(&((dtype*)p1)[i], &((dtype*)p2)[i], SIMD_ALIGNMENT_SIZE)){
+                        // Calculate up to the position just before the start of SIMD computation.
+                        cnt = get_count_of_elements_not_aligned_to_simd_size(&((dtype*)p1)[i], SIMD_ALIGNMENT_SIZE, sizeof(dtype));
+                        for (i=0; i < cnt; i++) {
+                            ((dtype*)p2)[i] = m_<%=name%>(((dtype*)p1)[i]);
+                        }
 
-                // Get the count of SIMD computation loops.
-                cnt_simd_loop = (n - i) % num_pack;
+                        // Get the count of SIMD computation loops.
+                        cnt_simd_loop = (n - i) % num_pack;
+
+                        // SIMD computation.
+                        if (p1 == p2) { // inplace case
+                            for(; i < n - cnt_simd_loop; i += num_pack){
+                                a = _mm_load_<%=simd_type%>(&((dtype*)p1)[i]);
+                                a = _mm_<%=name%>_<%=simd_type%>(a);
+                                _mm_store_<%=simd_type%>(&((dtype*)p1)[i], a);
+                            }
+                        } else {
+                            for(; i < n - cnt_simd_loop; i += num_pack){
+                                a = _mm_load_<%=simd_type%>(&((dtype*)p1)[i]);
+                                a = _mm_<%=name%>_<%=simd_type%>(a);
+                                _mm_stream_<%=simd_type%>(&((dtype*)p2)[i], a);
+                            }
+                        }
 
-                // SIMD computation.
-                if (p1 == p2) { // inplace case
-                    for(; i < n - cnt_simd_loop; i += num_pack){
-                        a = _mm_load_<%=simd_type%>(&((dtype*)p1)[i]);
-                        a = _mm_<%=name%>_<%=simd_type%>(a);
-                        _mm_store_<%=simd_type%>(&((dtype*)p1)[i], a);
                     }
-                } else {
-                    for(; i < n - cnt_simd_loop; i += num_pack){
-                        a = _mm_load_<%=simd_type%>(&((dtype*)p1)[i]);
-                        a = _mm_<%=name%>_<%=simd_type%>(a);
-                        _mm_stream_<%=simd_type%>(&((dtype*)p2)[i], a);
+                    // Compute the remainder of the SIMD operation.
+                    if (cnt_simd_loop != 0){
+                        //<% end %>
+                        for (; i<n; i++) {
+                            ((dtype*)p2)[i] = m_<%=name%>(((dtype*)p1)[i]);
+                        }
+                        //<% if is_simd and !is_complex and %w[sqrt].include? name %>
                     }
+                    //<% end %>
+                    return;
                 }
-
-            }
-            // Compute the remainder of the SIMD operation.
-            if (cnt_simd_loop != 0){
-<% end %>
-                for (; i<n; i++) {
-                    ((dtype*)p2)[i] = m_<%=name%>(((dtype*)p1)[i]);
+                if (is_aligned_step(s1,sizeof(dtype)) &&
+                    is_aligned_step(s2,sizeof(dtype)) ) {
+                    //<% end %>
+                    for (i=0; i<n; i++) {
+                        *(dtype*)p2 = m_<%=name%>(*(dtype*)p1);
+                        p1 += s1;
+                        p2 += s2;
+                    }
+                    return;
+                    //<% if need_align %>
                 }
-<% if is_simd and !is_complex and %w[sqrt].include? name %>
             }
-<% end %>
-            return;
+            for (i=0; i<n; i++) {
+                GET_DATA_STRIDE(p1,s1,dtype,x);
+                x = m_<%=name%>(x);
+                SET_DATA_STRIDE(p2,s2,dtype,x);
+            }
+            //<% end %>
         }
     }
 }

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

@@ -1,40 +1,32 @@
 /*
-  Array element referenece or slice view.
+  Multi-dimensional element reference.
   @overload [](dim0,...,dimL)
-  @param [Numeric,Range,etc] dim0,...,dimL  Multi-dimensional Index.
-  @return [Numeric,NArray::<%=class_name%>] Element object or NArray view.
-
-  --- Returns the element at +dim0+, +dim1+, ... are Numeric indices
-  for each dimension, or returns a NArray View as a sliced subarray if
-  +dim0+, +dim1+, ... includes other than Numeric index, e.g., Range
-  or Array or true.
+  @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,Symbol] dim0,...,dimL  multi-dimensional indices.
+  @return [Numeric,Numo::Bit] an element or NArray view.
+  @see Numo::NArray#[]
+  @see #[]=
 
   @example
-      a = Numo::DFloat.new(4,5).seq
-      => Numo::DFloat#shape=[4,5]
-      [[0, 1, 2, 3, 4],
-       [5, 6, 7, 8, 9],
-       [10, 11, 12, 13, 14],
-       [15, 16, 17, 18, 19]]
-
-      a[1,1]
-      => 6.0
+      a = Numo::Int32.new(3,4).seq
+      # => Numo::Int32#shape=[3,4]
+      # [[0, 1, 2, 3],
+      #  [4, 5, 6, 7],
+      #  [8, 9, 10, 11]]
 
-      a[1..3,1]
-      => Numo::DFloat#shape=[3]
-      [6, 11, 16]
+      b = (a%2).eq(0)
+      # => Numo::Bit#shape=[3,4]
+      # [[1, 0, 1, 0],
+      #  [1, 0, 1, 0],
+      #  [1, 0, 1, 0]]
 
-      a[1,[1,3,4]]
-      => Numo::DFloat#shape=[3]
-      [6, 8, 9]
+      b[true,(0..-1)%2]
+      # => Numo::Bit(view)#shape=[3,2]
+      # [[1, 1],
+      #  [1, 1],
+      #  [1, 1]]
 
-      a[true,2].fill(99)
-      a
-      => Numo::DFloat#shape=[4,5]
-      [[0, 1, 99, 3, 4],
-       [5, 6, 99, 8, 9],
-       [10, 11, 99, 13, 14],
-       [15, 16, 99, 18, 19]]
+      b[1,1]
+      # => 0
  */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)

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

@@ -1,41 +1,27 @@
 /*
-  Array element(s) set.
-  @overload []=(dim0,..,dimL,val)
-  @param [Numeric,Range,etc] dim0,..,dimL  Multi-dimensional Index.
-  @param [Numeric,Numo::NArray,etc] val  Value(s) to be set to self.
-  @return [Numeric] returns val (last argument).
-
-  --- Replace element(s) at +dim0+, +dim1+, ... (index/range/array/true
-  for each dimention). Broadcasting mechanism is applied.
+  Multi-dimensional element assignment.
+  @overload []=(dim0,...,dimL,val)
+  @param [Numeric,Range,Array,Numo::Int32,Numo::Int64,Numo::Bit,TrueClass,FalseClass,Symbol] dim0,...,dimL  multi-dimensional indices.
+  @param [Numeric,Numo::NArray,Array] val  Value(s) to be set to self.
+  @return [Numeric,Numo::NArray,Array] returns `val` (last argument).
+  @see Numo::NArray#[]=
+  @see #[]
 
   @example
-      a = Numo::DFloat.new(3,4).seq
-      => Numo::DFloat#shape=[3,4]
-      [[0, 1, 2, 3],
-       [4, 5, 6, 7],
-       [8, 9, 10, 11]]
-
-      a[1,2]=99
-      a
-      => Numo::DFloat#shape=[3,4]
-      [[0, 1, 2, 3],
-       [4, 5, 99, 7],
-       [8, 9, 10, 11]]
-
-      a[1,[0,2]] = [101,102]
+      a = Numo::Bit.new(4,5).fill(0)
+      # => Numo::Bit#shape=[4,5]
+      # [[0, 0, 0, 0, 0],
+      #  [0, 0, 0, 0, 0],
+      #  [0, 0, 0, 0, 0],
+      #  [0, 0, 0, 0, 0]]
+
+      a[(0..-1)%2,(1..-1)%2] = 1
       a
-      => Numo::DFloat#shape=[3,4]
-      [[0, 1, 2, 3],
-       [101, 5, 102, 7],
-       [8, 9, 10, 11]]
-
-      a[1,true]=99
-      a
-      => Numo::DFloat#shape=[3,4]
-      [[0, 1, 2, 3],
-       [99, 99, 99, 99],
-       [8, 9, 10, 11]]
-
+      # => Numo::Bit#shape=[4,5]
+      # [[0, 1, 0, 1, 0],
+      #  [0, 0, 0, 0, 0],
+      #  [0, 1, 0, 1, 0],
+      #  [0, 0, 0, 0, 0]]
 */
 static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)

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

@@ -21,10 +21,8 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, x);
         }
     } else {
-        o1 =  p1 % NB;
-        o1 -= p3;
-        o2 =  p2 % NB;
-        o2 -= p3;
+        o1 =  p1-p3;
+        o2 =  p2-p3;
         l1 =  NB+o1;
         r1 =  NB-o1;
         l2 =  NB+o2;
@@ -54,23 +52,53 @@ static void
             }
         } else {
             for (; n>=NB; n-=NB) {
-                x = *a1>>o1;
-                if (o1<0)  x |= *(a1-1)>>l1;
-                if (o1>0)  x |= *(a1+1)<<r1;
+                if (o1==0) {
+                    x = *a1;
+                } else if (o1>0) {
+                    x = *a1>>o1  | *(a1+1)<<r1;
+                } else {
+                    x = *a1<<-o1 | *(a1-1)>>l1;
+                }
                 a1++;
-                y = *a2>>o2;
-                if (o2<0)  y |= *(a2-1)>>l2;
-                if (o2>0)  y |= *(a2+1)<<r2;
+                if (o2==0) {
+                    y = *a2;
+                } else if (o2>0) {
+                    y = *a2>>o2  | *(a2+1)<<r2;
+                } else {
+                    y = *a2<<-o2 | *(a2-1)>>l2;
+                }
                 a2++;
                 x = m_<%=name%>(x,y);
                 *(a3++) = x;
             }
         }
         if (n>0) {
-            x = *a1>>o1;
-            if (o1<0)  x |= *(a1-1)>>l1;
-            y = *a2>>o2;
-            if (o2<0)  y |= *(a2-1)>>l2;
+            if (o1==0) {
+                x = *a1;
+            } else if (o1>0) {
+                x = *a1>>o1;
+                if ((int)n>r1) {
+                    x |= *(a1+1)<<r1;
+                }
+            } else {
+                x = *(a1-1)>>l1;
+                if ((int)n>-o1) {
+                    x |= *a1<<-o1;
+                }
+            }
+            if (o2==0) {
+                y = *a2;
+            } else if (o2>0) {
+                y = *a2>>o2;
+                if ((int)n>r2) {
+                    y |= *(a2+1)<<r2;
+                }
+            } else {
+                y = *(a2-1)>>l2;
+                if ((int)n>-o2) {
+                    y |= *a2<<-o2;
+                }
+            }
             x = m_<%=name%>(x,y);
             *a3 = (x & SLB(n)) | (*a3 & BALL<<n);
         }

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

@@ -75,10 +75,15 @@ static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     VALUE v, reduce;
+    narray_t *na;
     ndfunc_arg_in_t ain[3] = {{cT,0},{sym_reduce,0},{sym_init,0}};
     ndfunc_arg_out_t aout[1] = {{numo_cInt64,0}};
     ndfunc_t ndf = { <%=c_iter%>, FULL_LOOP_NIP, 3, 1, ain, aout };
 
+    GetNArray(self,na);
+    if (NA_SIZE(na)==0) {
+        return INT2FIX(0);
+    }
     reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, 0);
     v = na_ndloop(&ndf, 3, self, reduce, INT2FIX(0));
     return rb_funcall(v,rb_intern("extract"),0);

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

@@ -107,10 +107,15 @@ static VALUE
 <%=c_func(-1)%>(int argc, VALUE *argv, VALUE self)
 {
     VALUE v, reduce;
+    narray_t *na;
     ndfunc_arg_in_t ain[3] = {{cT,0},{sym_reduce,0},{sym_init,0}};
     ndfunc_arg_out_t aout[1] = {{numo_cBit,0}};
     ndfunc_t ndf = {<%=c_iter%>, FULL_LOOP_NIP, 3,1, ain,aout};
 
+    GetNArray(self,na);
+    if (NA_SIZE(na)==0) {
+        return Qfalse;
+    }
     reduce = na_reduce_dimension(argc, argv, 1, &self, &ndf, 0);
     v = na_ndloop(&ndf, 3, self, reduce, INT2FIX(<%=init_bit%>));
     if (argc > 0) {

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

@@ -48,7 +48,13 @@ static void
     if (idx1) {
         for (i=i1=0; i1<n1 && i<n; i++,i1++) {
             x = ptr[i1];
-            if (rb_obj_is_kind_of(x, rb_cRange) || rb_obj_is_kind_of(x, na_cStep)) {
+            if (rb_obj_is_kind_of(x, rb_cRange)
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+                || rb_obj_is_kind_of(x, rb_cArithSeq)
+#else
+                || rb_obj_is_kind_of(x, rb_cEnumerator)
+#endif
+                ) {
                 nary_step_sequence(x,&len,&beg,&step);
                 for (c=0; c<len && i<n; c++,i++) {
                     y = beg + step * c;
@@ -65,7 +71,13 @@ static void
     } else {
         for (i=i1=0; i1<n1 && i<n; i++,i1++) {
             x = ptr[i1];
-            if (rb_obj_is_kind_of(x, rb_cRange) || rb_obj_is_kind_of(x, na_cStep)) {
+            if (rb_obj_is_kind_of(x, rb_cRange)
+#ifdef HAVE_RB_ARITHMETIC_SEQUENCE_EXTRACT
+                || rb_obj_is_kind_of(x, rb_cArithSeq)
+#else
+                || rb_obj_is_kind_of(x, rb_cEnumerator)
+#endif
+                ) {
                 nary_step_sequence(x,&len,&beg,&step);
                 for (c=0; c<len && i<n; c++,i++) {
                     y = beg + step * c;

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

@@ -18,8 +18,7 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, x);
         }
     } else {
-        o1 =  p1 % NB;
-        o1 -= p3;
+        o1 =  p1-p3;
         l1 =  NB+o1;
         r1 =  NB-o1;
         if (p3>0 || n<NB) {
@@ -40,16 +39,31 @@ static void
             }
         } else {
             for (; n>=NB; n-=NB) {
-                x = *a1>>o1;
-                if (o1<0)  x |= *(a1-1)>>l1;
-                if (o1>0)  x |= *(a1+1)<<r1;
+                if (o1==0) {
+                    x = *a1;
+                } else if (o1>0) {
+                    x = *a1>>o1  | *(a1+1)<<r1;
+                } else {
+                    x = *a1<<-o1 | *(a1-1)>>l1;
+                }
                 a1++;
                 *(a3++) = x;
             }
         }
         if (n>0) {
-            x = *a1>>o1;
-            if (o1<0)  x |= *(a1-1)>>l1;
+            if (o1==0) {
+                x = *a1;
+            } else if (o1>0) {
+                x = *a1>>o1;
+                if ((int)n>r1) {
+                    x |= *(a1+1)<<r1;
+                }
+            } else {
+                x = *(a1-1)>>l1;
+                if ((int)n>-o1) {
+                    x |= *a1<<-o1;
+                }
+            }
             *a3 = (x & SLB(n)) | (*a3 & BALL<<n);
         }
     }

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

@@ -20,8 +20,7 @@ static void
             STORE_BIT_STEP(a3, p3, s3, idx3, y);
         }
     } else {
-        o1 =  p1 % NB;
-        o1 -= p3;
+        o1 =  p1-p3;
         l1 =  NB+o1;
         r1 =  NB-o1;
         if (p3>0 || n<NB) {
@@ -44,17 +43,32 @@ static void
             }
         } else {
             for (; n>=NB; n-=NB) {
-                x = *a1>>o1;
-                if (o1<0)  x |= *(a1-1)>>l1;
-                if (o1>0)  x |= *(a1+1)<<r1;
+                if (o1==0) {
+                    x = *a1;
+                } else if (o1>0) {
+                    x = *a1>>o1  | *(a1+1)<<r1;
+                } else {
+                    x = *a1<<-o1 | *(a1-1)>>l1;
+                }
                 a1++;
                 y = m_<%=name%>(x);
                 *(a3++) = y;
             }
         }
         if (n>0) {
-            x = *a1>>o1;
-            if (o1<0)  x |= *(a1-1)>>l1;
+            if (o1==0) {
+                x = *a1;
+            } else if (o1>0) {
+                x = *a1>>o1;
+                if ((int)n>r1) {
+                    x |= *(a1+1)<<r1;
+                }
+            } else {
+                x = *(a1-1)>>l1;
+                if ((int)n>-o1) {
+                    x |= *a1<<-o1;
+                }
+            }
             y = m_<%=name%>(x);
             *a3 = (y & SLB(n)) | (*a3 & BALL<<n);
         }