narray 0.5.9.9 → 0.6.0.0

data/src/na_linalg.c

@@ -32,6 +32,7 @@ typedef struct NARRAY_FUNCSET {
   void (*sbt)();
   void (*mul)();
   void (*div)();
+  void (*mod)();
   void (*muladd)();
   void (*mulsbt)();
   void (*cmp)();
@@ -590,6 +591,7 @@ void Init_na_linalg()
     na_funcset[i].sbt = SbtUFuncs[i];
     na_funcset[i].mul = MulUFuncs[i];
     na_funcset[i].div = DivUFuncs[i];
+    na_funcset[i].mod = ModUFuncs[i];
     na_funcset[i].muladd = MulAddFuncs[i];
     na_funcset[i].mulsbt = MulSbtFuncs[i];
     na_funcset[i].cmp = CmpFuncs[i];

data/src/narray.c

@@ -101,7 +101,7 @@ static void
 {
   if ( ary->total > 0 ) {
     if (ary->ref == Qnil || ary->ref == Qtrue) {  /* non reference */
-      xfree(ary->ptr); 
+      xfree(ary->ptr);
     }
     xfree(ary->shape);
 #ifdef DEBUG
@@ -117,17 +117,22 @@ static void
 struct NARRAY*
  na_alloc_struct(int type, int rank, int *shape)
 {
-  int total=1;
+  int total=1, total_bak;
   int i, memsz;
   struct NARRAY *ary;
 
-  for (i=0; i<rank; ++i)
-    total *= shape[i];
+  for (i=0; i<rank; ++i) {
+    total_bak = total;
+    total = total_bak * shape[i];
+    if (total>2147483647 || total/shape[i] != total_bak) {
+      rb_raise(rb_eArgError, "array size is too large");
+    }
+  }
 
   if (rank<=0 || total<=0) {
     /* empty array */
     ary = ALLOC(struct NARRAY);
-    ary->rank  = 
+    ary->rank  =
     ary->total = 0;
     ary->shape = NULL;
     ary->ptr   = NULL;
@@ -136,6 +141,10 @@ struct NARRAY*
   else {
     memsz = na_sizeof[type] * total;
 
+    if (memsz>2147483647 || memsz/na_sizeof[type] != total) {
+      rb_raise(rb_eArgError, "allocation size is too large");
+    }
+
     /* Garbage Collection */
 #ifdef NARRAY_GC
     mem_count += memsz;
@@ -231,7 +240,7 @@ VALUE
   if (type==NA_ROBJ) {
     rb_mem_clear((VALUE*)(na->ptr), na->total);
   }
-  return na_wrap_struct_class(na, klass);  
+  return na_wrap_struct_class(na, klass);
 }
 
 
@@ -257,7 +266,7 @@ VALUE
   struct NARRAY *na;
 
   na = na_alloc_struct(type, 0, NULL);
-  return na_wrap_struct_class(na, klass);  
+  return na_wrap_struct_class(na, klass);
 }
 
 
@@ -610,7 +619,7 @@ static VALUE
     if ( len != str_len )
       rb_raise(rb_eArgError, "size mismatch");
   }
-  
+
   v = na_make_object( type, rank, shape, cNArray );
   GetNArray(v,ary);
   memcpy( ary->ptr, RSTRING_PTR(str), ary->total*na_sizeof[type] );
@@ -720,7 +729,7 @@ static VALUE
 }
 
 
-/* singleton method: 
+/* singleton method:
    NArray.to_na( string, type, size1,size2,...,sizeN )
    NArray.to_na( array )
 */
@@ -751,7 +760,7 @@ static VALUE
 }
 
 
-/* singleton method: 
+/* singleton method:
    NArray[object]
 */
 static VALUE
@@ -986,7 +995,7 @@ VALUE na_fill(VALUE self, volatile VALUE val)
   if (a2->total != 1)
     rb_raise(rb_eArgError, "single-element argument required");
 
-  SetFuncs[a1->type][a2->type]( a1->total, 
+  SetFuncs[a1->type][a2->type]( a1->total,
 				a1->ptr, na_sizeof[a1->type],
 				a2->ptr, 0 );
   return self;
@@ -1010,7 +1019,7 @@ VALUE
   }
 
   GetNArray(self,ary);
-  IndGenFuncs[ary->type]( ary->total, 
+  IndGenFuncs[ary->type]( ary->total,
 			  ary->ptr, na_sizeof[ary->type],
 			  start, step );
   return self;

data/src/narray.h

@@ -1,7 +1,7 @@
 /*
   narray.h
   Numerical Array Extention for Ruby
-    (C) Copyright 1999-2008 by Masahiro TANAKA
+    (C) Copyright 1999-2011 by Masahiro TANAKA
 
   This program is free software.
   You can distribute/modify this program
@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.5.9p9"
-#define NARRAY_VERSION_CODE 599
+#define NARRAY_VERSION "0.6.0.0"
+#define NARRAY_VERSION_CODE 600
 
 /*
   Data types used in NArray :

data/src/narray_local.h

@@ -53,6 +53,7 @@ extern na_ufunc_t  AddUFuncs;
 extern na_ufunc_t  SbtUFuncs;
 extern na_ufunc_t  MulUFuncs;
 extern na_ufunc_t  DivUFuncs;
+extern na_ufunc_t  ModUFuncs;
 extern na_bifunc_t AddBFuncs;
 extern na_bifunc_t SbtBFuncs;
 extern na_bifunc_t MulBFuncs;

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: narray
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 9
-  - 9
-  version: 0.5.9.9
+  version: 0.6.0.0
 platform: ruby
 authors: 
 - Masahiro Tanaka
@@ -15,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +09:00
+date: 2011-08-27
 default_executable: 
 dependencies: []
 
-description: 
+description: Numerical N-dimensional Array class
 email: masa16.tanaka@gmail.com
 executables: []
 
@@ -50,38 +44,7 @@ files:
 - src/narray_local.h
 - src/lib/narray_ext.rb
 - src/lib/nmatrix.rb
-- src/test/statistics.rb
-- src/test/testarray.rb
-- src/test/testbit.rb
-- src/test/testcast.rb
-- src/test/testcomplex.rb
-- src/test/testfftw.rb
-- src/test/testindex.rb
-- src/test/testindexary.rb
-- src/test/testindexset.rb
-- src/test/testmask.rb
-- src/test/testmath.rb
-- src/test/testmath2.rb
-- src/test/testmatrix.rb
-- src/test/testmatrix2.rb
-- src/test/testmatrix3.rb
-- src/test/testminmax.rb
-- src/test/testobject.rb
-- src/test/testpow.rb
-- src/test/testrandom.rb
-- src/test/testround.rb
-- src/test/testsort.rb
-- src/test/teststr.rb
-- src/test/testtrans.rb
-- src/test/testwhere.rb
-- src/bench/all.rb
-- src/bench/bench.m
-- src/bench/bench.py
-- src/bench/bench.rb
-- src/bench/dummy.m
-- src/bench/dummy.py
-- src/bench/dummy.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://narray.rubyforge.org/
 licenses: []
 
@@ -91,27 +54,23 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: narray
 rubygems_version: 1.3.7
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: N-dimensional Numerical Array class for Ruby
 test_files: []
 

data/src/bench/all.rb

@@ -1,88 +0,0 @@
-require "narray"
-T = (RUBY_VERSION<"1.8.0") ? Time : Process
-
-ruby_narray = system( "ruby -r narray dummy.rb" )
-python_numeric = system( "python dummy.py numeric" )
-python_numarray = system( "python dummy.py numarray" )
-python_numpy = system( "python dummy.py numpy" )
-octave = system( "octave -qf dummy.m" )
-
-def array_size
-  list = [
-    100000, 200000, 500000,
-    1000000, 2000000, 5000000,
-    10000000, 20000000, 50000000
-  ]
-  mlist = [
-    150, 200, 300, 500, 700, 1000, 1500, 2000, 3000
-    #300, 400, 700, 1000, 1400, 2000, 3000, 4000, 7000
-  ]
-
-  r = 50
-  n = nil
-  i = nil
-  list.each_with_index do |n,i|
-    a = NArray.float(n)
-    b = NArray.float(n)
-    t = bench_time(r) { c = a+b }
-    break if t>0.5
-  end
-  [n, mlist[i], r*2]
-end
-
-def bench_time(n)
-  t1 = T.times.utime
-   for i in 1..n
-     yield
-   end
-  t = T.times.utime - t1
-  puts " Time: %.2f sec\n" % [t]
-  t
-end
-
-n,m,r = array_size
-puts "array size = #{n}, repeat = #{r}\n\n"
-
-system "ruby   bench.rb          float  mul #{n} #{r}" if ruby_narray
-system "python bench.py numeric  float  mul #{n} #{r}" if python_numeric
-system "python bench.py numarray float  mul #{n} #{r}" if python_numarray
-system "python bench.py numpy    float  mul #{n} #{r}" if python_numpy
-system "octave -qf bench.m       float  mul #{n} #{r}" if octave         
-puts
-
-system "ruby   bench.rb          int  add #{n} #{r}" if ruby_narray	 
-system "python bench.py numeric  int  add #{n} #{r}" if python_numeric 
-system "python bench.py numarray int  add #{n} #{r}" if python_numarray
-system "python bench.py numpy    int  add #{n} #{r}" if python_numpy	 
-system "octave -qf bench.m       int  add #{n} #{r}" if octave         
-puts
-
-system "ruby   bench.rb          complex  mul #{n} #{r}" if ruby_narray	 
-system "python bench.py numeric  complex  mul #{n} #{r}" if python_numeric 
-system "python bench.py numarray complex  mul #{n} #{r}" if python_numarray
-system "python bench.py numpy    complex  mul #{n} #{r}" if python_numpy	 
-system "octave -qf bench.m       complex  mul #{n} #{r}" if octave         
-puts
-
-system "ruby   bench.rb          float_cross mul    #{m*2} #{r}" if ruby_narray	 
-system "python bench.py numeric  float_cross mul    #{m*2} #{r}" if python_numeric 
-system "python bench.py numarray float_cross mul    #{m*2} #{r}" if python_numarray
-system "python bench.py numpy    float_cross mul    #{m*2} #{r}" if python_numpy	 
-system "octave -qf bench.m       float_cross matmul #{m*2} #{r}" if octave         
-puts
-
-system "ruby   bench.rb          float_matrix mul    #{m} 4" if ruby_narray	 
-system "python bench.py numeric  float_matrix matmul #{m} 4" if python_numeric 
-system "python bench.py numarray float_matrix matmul #{m} 4" if python_numarray
-system "python bench.py numpy    float_matrix matmul #{m} 4" if python_numpy	 
-system "octave -qf bench.m       float_matrix matmul #{m} 4" if octave         
-puts
-
-system "ruby   bench.rb          float_solve solve #{m} 2" if ruby_narray	 
-system "python bench.py numeric  float_solve solve #{m} 2" if python_numeric 
-system "python bench.py numarray float_solve solve #{m} 2" if python_numarray
-system "python bench.py numpy    float_solve solve #{m} 2" if python_numpy	 
-system "octave -qf bench.m       float_solve solve #{m} 2" if octave         
-puts
-
-exit

data/src/bench/bench.m

@@ -1,61 +0,0 @@
-#! /bin/octave -qf
-
-arg_list = argv();
-TYPE   = arg_list{1};
-OP     = arg_list{2};
-ARRSZ  = str2num(arg_list{3});
-REPEAT = str2num(arg_list{4});
-n = ARRSZ;
-
-switch(TYPE)
-  case "float"
-    a = linspace(0,n-1,n);
-    b = linspace(0,n-1,n);
-  case "int"
-    a = int32(linspace(0,n-1,n));
-    b = int32(linspace(0,n-1,n));
-  case "complex"
-    a = complex(linspace(0,n-1,n));
-    b = complex(linspace(0,n-1,n));
-  case "float_cross"
-    a = linspace(0,n-1,n)';
-    b = linspace(0,n-1,n);
-  case "float_matrix"
-    a = linspace(0,n*n-1,n*n);
-    a = rem(a, n+1) + 1;
-    a = reshape(a,n,n);
-    b = linspace(0,n*n-1,n*n);
-    b = rem(b, n-1) + 1;
-    b = reshape(b,n,n);
-  case "float_solve"
-    a = linspace(0,n*n-1,n*n);
-    a = rem(a, n+1) + 1;
-    a = reshape(a,n,n);
-    b = reshape(linspace(1,n*n,n*n),n,n);
-endswitch
-
-[t1, u1, s1] = cputime ();
-switch(OP)
-  case "add"
-    for i = 1:REPEAT
-      c = a + b;
-    endfor
-  case "mul"
-    for i = 1:REPEAT
-      c = a .* b;
-    endfor
-  case "matmul"
-    for i = 1:REPEAT
-      c = a * b;
-    endfor
-    #size(c)
-  case "solve"
-    for i = 1:REPEAT
-      c = a \ b;
-    endfor
-    #size(c)
-endswitch
-[t2, u2, s2] = cputime ();
-
-printf ("Octave type=%s size=%d op=%s repeat=%d  Time: %.2f sec", 
-	TYPE,ARRSZ,OP,REPEAT,u2 - u1);

data/src/bench/bench.py

@@ -1,89 +0,0 @@
-import time
-import sys
-
-MODULE = sys.argv[1]
-TYPE   = sys.argv[2]
-OP     = sys.argv[3]
-ARRSZ  = int(sys.argv[4])
-REPEAT = int(sys.argv[5])
-
-if MODULE=="numeric":
-    from Numeric import *
-    from LinearAlgebra import *
-elif MODULE=="numarray":
-    from numarray import *
-    from LinearAlgebra import *
-elif MODULE=="numpy":
-    from numpy import *
-    from numpy.linalg import solve
-
-def bench_time(func,repeat=REPEAT):
-  start = time.clock()
-  for i in range(repeat):
-    c = func()
-    stop = time.clock()
-  print "Python %s type=%s size=%d op=%s repeat=%d  Time: %.2f sec" % \
-      (MODULE,TYPE,ARRSZ,OP,REPEAT,stop-start)
-  #print shape(c)
-
-n = ARRSZ
-
-if MODULE=="numpy":
-    def bench_array(type=float):
-        return arange(ARRSZ,dtype=type)
-    
-    if TYPE=="float":
-        a = bench_array(float)
-        b = bench_array(float)
-    elif TYPE=="int":
-        a = bench_array(int)
-        b = bench_array(int)
-    elif TYPE=="complex":
-        a = bench_array(complex)
-        b = bench_array(complex)
-    elif TYPE=="float_cross":
-        a = reshape(arange(ARRSZ,dtype=float),(ARRSZ,1))
-        b = reshape(arange(ARRSZ,dtype=float),(1,ARRSZ))
-    elif TYPE=="float_matrix":
-        a = reshape(arange(ARRSZ**2,dtype=float),(ARRSZ,ARRSZ))
-        b = reshape(arange(ARRSZ**2,dtype=float),(ARRSZ,ARRSZ))
-    elif TYPE=="float_solve":
-        a = reshape(arange(n**2,dtype=float)%(n+1)+1,(n,n))
-        b = reshape(arange(n**2,dtype=float)+1,(n,n))
-else:
-    def bench_array(type=float):
-        return arrayrange(ARRSZ).astype(type)
-    if TYPE=="float":
-        a = bench_array(Float64)
-        b = bench_array(Float64)
-    elif TYPE=="int":
-        a = bench_array(Int32)
-        b = bench_array(Int32)
-    elif TYPE=="complex":
-        a = bench_array(Complex64)
-        b = bench_array(Complex64)
-    elif TYPE=="float_cross":
-        a = reshape(arrayrange(ARRSZ),(ARRSZ,1)).astype(Float64)
-        b = reshape(arrayrange(ARRSZ),(1,ARRSZ)).astype(Float64)
-    elif TYPE=="float_matrix":
-        a = reshape(arrayrange(ARRSZ**2),(ARRSZ,ARRSZ)).astype(Float64)
-        b = reshape(arrayrange(ARRSZ**2),(ARRSZ,ARRSZ)).astype(Float64)
-    elif TYPE=="float_solve":
-        a = reshape(arrayrange(n*n)%(n+1)+1,(n,n)).astype(Float64)
-        b = reshape(arrayrange(n*n)+1,(n,n)).astype(Float64)
-    dot = matrixmultiply
-    solve = solve_linear_equations
-
-def lambda_add(a=a,b=b):    c = a+b; return c;
-def lambda_mul(a=a,b=b):    c = a*b; return c;
-def lambda_matmul(a=a,b=b): c = dot(a,b); return c;
-def lambda_solve(a=a,b=b):  c = solve(a,b); return c;
-
-if OP=="add":
-    bench_time(lambda_add)
-elif OP=="mul":
-    bench_time(lambda_mul)
-elif OP=="matmul":
-    bench_time(lambda_matmul)
-elif OP=="solve":
-    bench_time(lambda_solve)