pnmatrix 1.2.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be16fe762b002a63a7d2542fb5eb50ed02cf9fd86bc9bb783a480dbeee9aca8a
-  data.tar.gz: c0427a16637c1ed803ce4249d238ef419a903340f81e9705d59f99cd376697ad
+  metadata.gz: c61ebac7b89f8d0fd43e09fdbe74aa0ef1564232c1f56224837cf8e1dd3ea7cc
+  data.tar.gz: 19c1789f16a5c87a91b2b0de44dbfa39bc024a117f166a43bd466528b7fe24c7
 SHA512:
-  metadata.gz: 215cd7e47e75a13afb836e630a61d2f34057452601ca7cd9a70dd9a216258cd0b0763d6c064e36754475833c0ff8cec0144bdedf36f774d65a6498ae705c4954
-  data.tar.gz: b6f3078f05c24952b3dc8bab939a9b5f63cd673bda80450c5e229cc909913382d71adb5e9ff361a293c7e762ea741d0bc78d509567fc52fcdd1b13bb840e5670
+  metadata.gz: a53e78fa91ce0d8dbc30a5a0d9ad035d768238f3c9fba3de3f7eb1e181e4f1756c815db600bfc40e608c26aa6810083b69b4442a4a338904c7581209db9d0092
+  data.tar.gz: 2ef44f7c3f1079411c29c189d7c988c6432521f08d3291bcfbf9e555b400ac685a09673db8d07175a281a7973b774ebac4141cb176f004c38e2557b791486373

data/ext/nmatrix/extconf.rb

@@ -54,13 +54,13 @@ $srcs = basenames.map { |b| "#{b}.cpp" }
 create_conf_h("nmatrix_config.h")
 create_makefile("nmatrix")
 
-Dir.mkdir("data") unless Dir.exists?("data")
-Dir.mkdir("util") unless Dir.exists?("util")
-Dir.mkdir("storage") unless Dir.exists?("storage")
+Dir.mkdir("data") unless Dir.exist?("data")
+Dir.mkdir("util") unless Dir.exist?("util")
+Dir.mkdir("storage") unless Dir.exist?("storage")
 Dir.chdir("storage") do
-  Dir.mkdir("yale")  unless Dir.exists?("yale")
-  Dir.mkdir("list")  unless Dir.exists?("list")
-  Dir.mkdir("dense") unless Dir.exists?("dense")
+  Dir.mkdir("yale")  unless Dir.exist?("yale")
+  Dir.mkdir("list")  unless Dir.exist?("list")
+  Dir.mkdir("dense") unless Dir.exist?("dense")
 end
 
 # to clean up object files in subdirectories:

data/ext/nmatrix/math/math.h

@@ -339,12 +339,12 @@ namespace smmp_sort {
     if (a < b) {
       if (b < c) return b; // a b c
       if (a < c) return c; // a c b
-                 return a; // c a b
+      return a; // c a b
 
     } else { // a > b
       if (a < c) return a; // b a c
       if (b < c) return c; // b c a
-                 return b; // c b a
+      return b; // c b a
     }
   }
 

data/ext/nmatrix/nmatrix.h

@@ -338,6 +338,7 @@ NM_DEF_STRUCT_POST(NMATRIX);  // };
 /* Structs for dealing with VALUEs in use so that they don't get GC'd */
 
 NM_DEF_STRUCT_PRE(NM_GC_LL_NODE);       // struct NM_GC_LL_NODE {
+  VALUE* key;                           //   VALUE* key;
   VALUE* val;                           //   VALUE* val;
   size_t n;                             //   size_t n;
   NM_DECL_STRUCT(NM_GC_LL_NODE*, next); //   NM_GC_LL_NODE* next;
@@ -401,7 +402,7 @@ NM_DEF_STRUCT_POST(NM_GC_HOLDER);       // };
 
 #define NM_CHECK_ALLOC(x) if (!x) rb_raise(rb_eNoMemError, "insufficient memory");
 
-#define RB_FILE_EXISTS(fn)   (rb_funcall(rb_const_get(rb_cObject, rb_intern("File")), rb_intern("exists?"), 1, (fn)) == Qtrue)
+#define RB_FILE_EXISTS(fn)   (rb_funcall(rb_const_get(rb_cObject, rb_intern("File")), rb_intern("exist?"), 1, (fn)) == Qtrue)
 
 #define IsNMatrixType(v)  (RB_TYPE_P(v, T_DATA) && (RDATA(v)->dfree == (RUBY_DATA_FUNC)nm_delete || RDATA(v)->dfree == (RUBY_DATA_FUNC)nm_delete_ref))
 #define CheckNMatrixType(v)   if (!IsNMatrixType(v)) rb_raise(rb_eTypeError, "expected NMatrix on left-hand side of operation");

data/ext/nmatrix/ruby_nmatrix.c

@@ -409,6 +409,7 @@ void Init_nmatrix() {
  */
 static VALUE nm_alloc(VALUE klass) {
   NMATRIX* mat = NM_ALLOC(NMATRIX);
+  mat->stype = nm::DENSE_STORE;
   mat->storage = NULL;
 
   // DO NOT MARK This STRUCT. It has no storage allocated, and no stype, so mark will do an invalid something.
@@ -454,6 +455,8 @@ static VALUE nm_capacity(VALUE self) {
  * Mark function.
  */
 void nm_mark(NMATRIX* mat) {
+  if (!mat || !mat->storage) return;
+
   STYPE_MARK_TABLE(mark)
   mark[mat->stype](mat->storage);
 }
@@ -463,12 +466,17 @@ void nm_mark(NMATRIX* mat) {
  * Destructor.
  */
 void nm_delete(NMATRIX* mat) {
+  if (!mat) return;
+
   static void (*ttable[nm::NUM_STYPES])(STORAGE*) = {
     nm_dense_storage_delete,
     nm_list_storage_delete,
     nm_yale_storage_delete
   };
-  ttable[mat->stype](mat->storage);
+
+  if (mat->storage && mat->stype < nm::NUM_STYPES) {
+    ttable[mat->stype](mat->storage);
+  }
 
   NM_FREE(mat);
 }
@@ -477,12 +485,17 @@ void nm_delete(NMATRIX* mat) {
  * Slicing destructor.
  */
 void nm_delete_ref(NMATRIX* mat) {
+  if (!mat) return;
+
   static void (*ttable[nm::NUM_STYPES])(STORAGE*) = {
     nm_dense_storage_delete_ref,
     nm_list_storage_delete_ref,
     nm_yale_storage_delete_ref
   };
-  ttable[mat->stype](mat->storage);
+
+  if (mat->storage && mat->stype < nm::NUM_STYPES) {
+    ttable[mat->stype](mat->storage);
+  }
 
   NM_FREE(mat);
 }
@@ -503,7 +516,9 @@ static void __nm_mark_value_container(NM_GC_HOLDER* gc_value_holder_struct) {
   if (gc_value_holder_struct && gc_value_holder_struct->start) {
     NM_GC_LL_NODE* curr = gc_value_holder_struct->start;
     while (curr) {
-      rb_gc_mark_locations(curr->val, curr->val + curr->n);
+      if (curr->val && curr->n) {
+        rb_gc_mark_locations(curr->val, curr->val + curr->n);
+      }
       curr = curr->next;
     }
   }
@@ -540,7 +555,13 @@ void nm_register_values(VALUE* values, size_t n) {
     } else {
       to_insert = NM_ALLOC_NONRUBY(NM_GC_LL_NODE);
     }
-    to_insert->val = values;
+    to_insert->key = values;
+    if (n) {
+      to_insert->val = NM_ALLOC_N(VALUE, n);
+      memcpy(to_insert->val, values, sizeof(VALUE) * n);
+    } else {
+      to_insert->val = NULL;
+    }
     to_insert->n = n;
     to_insert->next = gc_value_holder_struct->start;
     gc_value_holder_struct->start = to_insert;
@@ -557,13 +578,17 @@ void nm_unregister_values(VALUE* values, size_t n) {
       NM_GC_LL_NODE* curr = gc_value_holder_struct->start;
       NM_GC_LL_NODE* last = NULL;
       while (curr) {
-        if (curr->val == values) {
+        if (curr->key == values) {
           if (last) {
             last->next = curr->next;
           } else {
             gc_value_holder_struct->start = curr->next;
           }
+          if (curr->val) {
+            NM_FREE(curr->val);
+          }
           curr->next = allocated_pool->start;
+          curr->key = NULL;
           curr->val = NULL;
           curr->n = 0;
           allocated_pool->start = curr;
@@ -602,14 +627,18 @@ void nm_completely_unregister_value(VALUE* val) {
     NM_GC_LL_NODE* curr = gc_value_holder_struct->start;
     NM_GC_LL_NODE* last = NULL;
     while (curr) {
-      if (curr->val == val) {
+      if (curr->key == val) {
         if (last) {
           last->next = curr->next;
         } else {
           gc_value_holder_struct->start = curr->next;
         }
         NM_GC_LL_NODE* temp_next = curr->next;
+        if (curr->val) {
+          NM_FREE(curr->val);
+        }
         curr->next = allocated_pool->start;
+        curr->key = NULL;
         curr->val = NULL;
         curr->n = 0;
         allocated_pool->start = curr;
@@ -1144,7 +1173,7 @@ static VALUE nm_init_new_version(int argc, VALUE* argv, VALUE self) {
   // Get the shape.
   size_t  dim;
   size_t* shape = interpret_shape(shape_ary, &dim);
-  void*   init;
+  void*   init = NULL;
   void*   v = NULL;
   size_t  v_size = 0;
 

data/ext/nmatrix/storage/list/list.cpp

@@ -779,7 +779,7 @@ void nm_list_storage_unregister(const STORAGE* s) {
  */
 static NODE* list_storage_get_single_node(LIST_STORAGE* s, SLICE* slice) {
   LIST* l = s->rows;
-  NODE* n;
+  NODE* n = NULL;
 
   for (size_t r = 0; r < s->dim; r++) {
     n = nm::list::find(l, s->offset[r] + slice->coords[r]);
@@ -1160,11 +1160,12 @@ void* nm_list_storage_get(const STORAGE* storage, SLICE* slice) {
 void* nm_list_storage_ref(const STORAGE* storage, SLICE* slice) {
   LIST_STORAGE* s = (LIST_STORAGE*)storage;
   LIST_STORAGE* ns = NULL;
+  NODE* n = NULL;
   nm_list_storage_register(s);
 
   //TODO: It needs a refactoring.
   if (slice->single) {
-    NODE* n = list_storage_get_single_node(s, slice);
+    n = list_storage_get_single_node(s, slice);
     nm_list_storage_unregister(s);
     return (n ? n->val : s->default_val);
   } else {

data/lib/nmatrix/homogeneous.rb

@@ -69,7 +69,7 @@ class NMatrix
       NMatrix.new(4, [1.0, 0.0, 0.0, 0.0,
                       0.0, c,   -s,  0.0,
                       0.0, s,    c,  0.0,
-                      0.0, 0.0, 0.0, 1.0], {dtype: :float64}.merge(opts))
+                      0.0, 0.0, 0.0, 1.0], **{dtype: :float64}.merge(opts))
     end
 
     def y_rotation angle_in_radians, opts={}
@@ -78,7 +78,7 @@ class NMatrix
       NMatrix.new(4, [ c,  0.0,  s,  0.0,
                       0.0, 1.0, 0.0, 0.0,
                       -s,  0.0,  c,  0.0,
-                      0.0, 0.0, 0.0, 1.0], {dtype: :float64}.merge(opts))
+                      0.0, 0.0, 0.0, 1.0], **{dtype: :float64}.merge(opts))
     end
 
     def z_rotation angle_in_radians, opts={}
@@ -87,7 +87,7 @@ class NMatrix
       NMatrix.new(4, [ c,  -s,  0.0, 0.0,
                        s,   c,  0.0, 0.0,
                       0.0, 0.0, 1.0, 0.0,
-                      0.0, 0.0, 0.0, 1.0], {dtype: :float64}.merge(opts))
+                      0.0, 0.0, 0.0, 1.0], **{dtype: :float64}.merge(opts))
     end
 
 

data/lib/nmatrix/mkmf.rb

@@ -69,14 +69,17 @@ if CONFIG['CXX'] == 'clang++'
   $CXX_STANDARD = 'c++11'
 else
   version = gplusplus_version
-  if version < '4.3.0' && CONFIG['CXX'] == 'g++'  # see if we can find a newer G++, unless it's been overridden by user
+  major_version = version.split('.')[0].to_i # string comparison fails past 10.0.0
+
+  if major_version < 5 and
+    version < '4.3.0' && CONFIG['CXX'] == 'g++'  # see if we can find a newer G++, unless it's been overridden by user
     if !find_newer_gplusplus
       raise("You need a version of g++ which supports -std=c++0x or -std=c++11. If you're on a Mac and using Homebrew, we recommend using mac-brew-gcc.sh to install a more recent g++.")
     end
     version = gplusplus_version
   end
 
-  if version < '4.7.0'
+  if major_version < 5 and version < '4.7.0'
     $CXX_STANDARD = 'c++0x'
   else
     $CXX_STANDARD = 'c++11'

data/lib/nmatrix/nmatrix.rb

@@ -1034,7 +1034,7 @@ class NMatrix
   def clone_structure(capacity = nil)
     opts = {stype: self.stype, default: self.default_value, dtype: self.dtype}
     opts = {capacity: capacity}.merge(opts) if self.yale?
-    NMatrix.new(self.shape, opts)
+    NMatrix.new(self.shape, **opts)
   end
 
   #
@@ -1099,7 +1099,7 @@ protected
       # We can generally predict the change in capacity for Yale.
       opts = {capacity: self.capacity - self.shape[0] + new_shape[0]}.merge(opts)
     end
-    NMatrix.new(new_shape, opts)
+    NMatrix.new(new_shape, **opts)
   end
 
 

data/lib/nmatrix/shortcuts.rb

@@ -196,11 +196,8 @@ class NMatrix
         i += 1
       end
 
-      # A row vector should be stored as 1xN, not N
-      #shape.unshift(1) if shape.size == 1
-
       # Then flatten the array.
-      NMatrix.new(shape, params.flatten, options)
+      NMatrix.new(shape, params.flatten, **options)
     end
 
     #
@@ -230,7 +227,7 @@ class NMatrix
     #   NMatrix.zeros([1, 5], dtype: :int32) # =>  0  0  0  0  0
     #
     def zeros(shape, opts = {})
-      NMatrix.new(shape, 0, {:dtype => :float64}.merge(opts))
+      NMatrix.new(shape, 0, **{:dtype => :float64}.merge(opts))
     end
     alias :zeroes :zeros
 
@@ -255,7 +252,7 @@ class NMatrix
     #                                             1  1  1
     #
     def ones(shape, opts={})
-      NMatrix.new(shape, 1, {:dtype => :float64, :default => 1}.merge(opts))
+      NMatrix.new(shape, 1, **{:dtype => :float64}.merge(opts))
     end
 
     # call-seq:
@@ -268,7 +265,7 @@ class NMatrix
     # @return [NMatrix] a new nmatrix filled with ones.
     #
     def ones_like(nm)
-      NMatrix.ones(nm.shape, dtype: nm.dtype, stype: nm.stype, capacity: nm.capacity, default: 1)
+      NMatrix.ones(nm.shape, dtype: nm.dtype, stype: nm.stype, capacity: nm.capacity)
     end
 
     # call-seq:
@@ -281,7 +278,7 @@ class NMatrix
     # @return [NMatrix] a new nmatrix filled with zeros.
     #
     def zeros_like(nm)
-      NMatrix.zeros(nm.shape, dtype: nm.dtype, stype: nm.stype, capacity: nm.capacity, default: 0)
+      NMatrix.zeros(nm.shape, dtype: nm.dtype, stype: nm.stype, capacity: nm.capacity)
     end
 
     #
@@ -345,7 +342,7 @@ class NMatrix
     #            0.3333333333333333          0.25                  0.2
     #
     def hilbert(shape, opts={})
-      m = NMatrix.new([shape,shape], {:dtype => :float64}.merge(opts))
+      m = NMatrix.new([shape,shape], **{:dtype => :float64}.merge(opts))
       0.upto(shape - 1) do |i|
         0.upto(i) do |j|
           m[i,j] = 1.0 / (j + i + 1)
@@ -378,8 +375,8 @@ class NMatrix
     #
     def inv_hilbert(shape, opts={})
       opts = {:dtype => :float64}.merge(opts)
-      m = NMatrix.new([shape,shape],opts)
-      combination = NMatrix.new([2*shape,2*shape],opts)
+      m = NMatrix.new([shape,shape], **opts)
+      combination = NMatrix.new([2*shape,2*shape], **opts)
       #combinations refers to the combination of n things taken k at a time
       0.upto(2*shape-1) do |i|
         0.upto(i) do |j|
@@ -553,7 +550,7 @@ class NMatrix
         NMatrix.size(shape).times { |i| random_values << rng.rand(scale) }
       end
 
-      NMatrix.new(shape, random_values, {:dtype => :float64, :stype => :dense}.merge(opts))
+      NMatrix.new(shape, random_values, **{:dtype => :float64, :stype => :dense}.merge(opts))
     end
     alias :rand :random
     
@@ -595,7 +592,7 @@ class NMatrix
     #
     def magic(shape, opts={})
       raise(ArgumentError, "shape of two is not allowed") if shape == 2
-      nm = NMatrix.new([shape,shape], 0, {:dtype => :float64}.merge(opts))
+      nm = NMatrix.new([shape,shape], 0, **{:dtype => :float64}.merge(opts))
       if shape % 2 != 0
         MagicHelpers.odd_magic nm, shape
       elsif shape % 4 == 0
@@ -841,7 +838,7 @@ class NMatrix
       values = (0 ... NMatrix.size(shape)).to_a
 
       # It'll produce :int32, except if a dtype is provided.
-      NMatrix.new(shape, values, {:stype => :dense}.merge(options))
+      NMatrix.new(shape, values, **{:stype => :dense}.merge(options))
     end
 
     {:bindgen => :byte, :indgen => :int64, :findgen => :float32, :dindgen => :float64,
@@ -969,7 +966,7 @@ module NVector #:nodoc:
       random_values = []
       size.times { |i| random_values << rng.rand }
 
-      NMatrix.new([size,1], random_values, opts)
+      NMatrix.new([size,1], random_values, **opts)
     end
 
     #

data/lib/nmatrix/version.rb

@@ -27,9 +27,9 @@ class NMatrix
   # native IO. If you change the format, please make sure that native
   # IO can still understand NMatrix::VERSION.
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 2
-    TINY = 4
+    MAJOR = 2
+    MINOR = 0
+    TINY = 0
     #PRE = "a"
 
     STRING = [MAJOR, MINOR, TINY].compact.join(".")

data/spec/stress_test_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe NMatrix do
+  specify do
+    200.times do |i|
+      size = rand(500..1000)
+      m1 = NMatrix.new([size, size], 0, stype: :yale, dtype: :int32)
+      m2 = m1.clone
+
+      rand(1000).times do |j|
+        m1[rand(size), rand(size)] = 1
+        m2[rand(size), rand(size)] = 1
+      end
+
+      (m1*m2).det
+    end
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: pnmatrix
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.0.0
 platform: ruby
 authors:
 - John Woods
 - Chris Wailes
 - Aleksey Timin
-autorequire:
 bindir: bin
 cert_chain: []
 date: 1980-01-01 00:00:00.000000000 Z
@@ -16,14 +15,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -44,28 +43,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
@@ -92,28 +91,28 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rspec-longrun
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: NMatrix is a linear algebra library for Ruby, written mostly in C and
@@ -232,6 +231,7 @@ files:
 - spec/slice_set_spec.rb
 - spec/spec_helper.rb
 - spec/stat_spec.rb
+- spec/stress_test_spec.rb
 - spec/test.pcd
 - spec/utm5940.mtx
 homepage: http://sciruby.com
@@ -261,8 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: NMatrix is a linear algebra library for Ruby
 test_files:
@@ -291,5 +290,6 @@ test_files:
 - spec/slice_set_spec.rb
 - spec/spec_helper.rb
 - spec/stat_spec.rb
+- spec/stress_test_spec.rb
 - spec/test.pcd
 - spec/utm5940.mtx