nmatrix 0.0.3 → 0.0.4

data/ext/nmatrix/storage/yale.h

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //
@@ -86,7 +86,7 @@ extern "C" {
   // Lifecycle //
   ///////////////
 
-  YALE_STORAGE* nm_yale_storage_create(nm::dtype_t dtype, size_t* shape, size_t dim, size_t init_capacity);
+  YALE_STORAGE* nm_yale_storage_create(nm::dtype_t dtype, size_t* shape, size_t dim, size_t init_capacity, nm::itype_t itype);
   YALE_STORAGE* nm_yale_storage_create_from_old_yale(nm::dtype_t dtype, size_t* shape, void* ia, void* ja, void* a, nm::dtype_t from_dtype);
   YALE_STORAGE*	nm_yale_storage_create_merged(const YALE_STORAGE* merge_template, const YALE_STORAGE* other);
   void          nm_yale_storage_delete(STORAGE* s);
@@ -97,6 +97,7 @@ extern "C" {
   // Accessors //
   ///////////////
 
+  VALUE nm_yale_each_stored_with_indices(VALUE nmatrix);
   void* nm_yale_storage_get(STORAGE* s, SLICE* slice);
   void*	nm_yale_storage_ref(STORAGE* s, SLICE* slice);
   char  nm_yale_storage_set(STORAGE* storage, SLICE* slice, void* v);
@@ -150,7 +151,7 @@ extern "C" {
    * because UINTX_MAX and UINTX_MAX-1 are both reserved for sparse matrix
    * multiplication.
    */
-  inline nm::itype_t nm_yale_storage_itype(const YALE_STORAGE* s) {
+  inline nm::itype_t nm_yale_storage_default_itype(const YALE_STORAGE* s) {
     return nm_yale_storage_itype_by_shape(s->shape);
   }
 

data/ext/nmatrix/ttable_helper.rb

@@ -2,125 +2,125 @@
 
 # A helper file for generating and maintaining template tables.
 
-def nullify(disabled)
-	DTYPES.map { |t| if disabled.include?(t) then :NULL else t end }
+def nullify(disabled) #:nodoc:
+  DTYPES.map { |t| if disabled.include?(t) then :NULL else t end }
 end
 
 DTYPES = [
-	:uint8_t,
-	:int8_t,
-	:int16_t,
-	:int32_t,
-	:int64_t,
-	:float32_t,
-	:float64_t,
-	:'nm::Complex64',
-	:'nm::Complex128',
-	:'nm::Rational32',
-	:'nm::Rational64',
-	:'nm::Rational128',
-	:'nm::RubyObject'
-]
+          :uint8_t,
+          :int8_t,
+          :int16_t,
+          :int32_t,
+          :int64_t,
+          :float32_t,
+          :float64_t,
+          :'nm::Complex64',
+          :'nm::Complex128',
+          :'nm::Rational32',
+          :'nm::Rational64',
+          :'nm::Rational128',
+          :'nm::RubyObject'
+         ]
 
 ITYPES = [
-	:uint8_t,
-	:uint16_t,
-	:uint32_t,
-	:uint64_t
-]
+          :uint8_t,
+          :uint16_t,
+          :uint32_t,
+          :uint64_t
+         ]
 
 EWOPS = [
-	:'nm::EW_ADD',
-	:'nm::EW_SUB',
-	:'nm::EW_MUL',
-	:'nm::EW_DIV',
-	:'nm::EW_MOD',
-  :'nm::EW_EQEQ',
-  :'nm::EW_NEQ',
-  :'nm::EW_LT',
-  :'nm::EW_GT',
-  :'nm::EW_LEQ',
-  :'nm::EW_GEQ'
-]
+         :'nm::EW_ADD',
+         :'nm::EW_SUB',
+         :'nm::EW_MUL',
+         :'nm::EW_DIV',
+         :'nm::EW_MOD',
+         :'nm::EW_EQEQ',
+         :'nm::EW_NEQ',
+         :'nm::EW_LT',
+         :'nm::EW_GT',
+         :'nm::EW_LEQ',
+         :'nm::EW_GEQ'
+        ]
 
 LR_ALLOWED = {
-	:uint8_t	 		=> nullify([:RubyObject]),
-	:int8_t				=> nullify([:RubyObject]),
-	:int16_t			=> nullify([:RubyObject]),
-	:int32_t			=> nullify([:RubyObject]),
-	:int64_t			=> nullify([:RubyObject]),
-	:float32_t		=> nullify([:RubyObject]),
-	:float64_t		=> nullify([:RubyObject]),
-	:Complex64		=> nullify([:RubyObject]),
-	:Complex128		=> nullify([:RubyObject]),
-	:Rational32		=> nullify([:float32_t, :float64_t, :'nm::Complex64', :'nm::Complex128', :'nm::RubyObject']),
-	:Rational64		=> nullify([:float32_t, :float64_t, :'nm::Complex64', :'nm::Complex128', :'nm::RubyObject']),
-	:Rational128	=> nullify([:float32_t, :float64_t, :'nm::Complex64', :'nm::Complex128', :'nm::RubyObject']),
-	:RubyObject		=> nullify(DTYPES - [:RubyObject])
+  :uint8_t	 		=> nullify([:RubyObject]),
+  :int8_t				=> nullify([:RubyObject]),
+  :int16_t			=> nullify([:RubyObject]),
+  :int32_t			=> nullify([:RubyObject]),
+  :int64_t			=> nullify([:RubyObject]),
+  :float32_t		=> nullify([:RubyObject]),
+  :float64_t		=> nullify([:RubyObject]),
+  :Complex64		=> nullify([:RubyObject]),
+  :Complex128		=> nullify([:RubyObject]),
+  :Rational32		=> nullify([:float32_t, :float64_t, :'nm::Complex64', :'nm::Complex128', :'nm::RubyObject']),
+  :Rational64		=> nullify([:float32_t, :float64_t, :'nm::Complex64', :'nm::Complex128', :'nm::RubyObject']),
+  :Rational128	=> nullify([:float32_t, :float64_t, :'nm::Complex64', :'nm::Complex128', :'nm::RubyObject']),
+  :RubyObject		=> nullify(DTYPES - [:RubyObject])
 }
 
 lines =
-case ARGV[0]
-when 'OPLR'
-	'{' +
-	EWOPS.map do |op|
-	
-		'{' +
-		DTYPES.map do |l_dtype|
-		
-			'{' +
-			LR_ALLOWED[l_dtype].map do |r_dtype|
-				if r_dtype == :NULL
-					'NULL'
-				else
-					"fun<#{op}, #{l_dtype}, #{r_dtype}>"
-				end
-			end.join(', ') +
-			'}'
-		
-		end.join(",\n") +
-		'}'
-	
-	end.join(",\n") +
-	'}'
-
-when 'OPID'
-	'{' +
-	EWOPS.map do |op|
-		'{' +
-		ITYPES.map do |itype|
-			'{' +
-			DTYPES.map do |dtype|
-			
-				if dtype == :NULL
-					'NULL'
-				else
-					"fun<#{op}, #{itype}, #{dtype}>"
-				end
-		
-			end.join(",") +
-			'}'
-		end.join(",\\\n") +
-		'}'
-	end.join(",\\\n") +
-	'}'
-
-when 'LR'
-	'{' +
-		DTYPES.map do |l_dtype|
-		
-			'{' +
-			LR_ALLOWED[l_dtype].map do |r_dtype|
-				if r_dtype == :NULL
-					'NULL'
-				else
-					"fun<#{l_dtype}, #{r_dtype}>"
-				end
-			end.join(', ') +
-			'}'
-		
-		end.join(",\n") +
-		'}'
-end
+  case ARGV[0]
+  when 'OPLR'
+    '{' +
+      EWOPS.map do |op|
+
+    '{' +
+      DTYPES.map do |l_dtype|
+
+      '{' +
+        LR_ALLOWED[l_dtype].map do |r_dtype|
+        if r_dtype == :NULL
+          'NULL'
+        else
+          "fun<#{op}, #{l_dtype}, #{r_dtype}>"
+        end
+      end.join(', ') +
+        '}'
+
+    end.join(",\n") +
+      '}'
+
+  end.join(",\n") +
+      '}'
+
+  when 'OPID'
+    '{' +
+      EWOPS.map do |op|
+    '{' +
+      ITYPES.map do |itype|
+      '{' +
+        DTYPES.map do |dtype|
+
+        if dtype == :NULL
+          'NULL'
+        else
+          "fun<#{op}, #{itype}, #{dtype}>"
+        end
+
+      end.join(",") +
+        '}'
+    end.join(",\\\n") +
+      '}'
+  end.join(",\\\n") +
+      '}'
+
+  when 'LR'
+    '{' +
+      DTYPES.map do |l_dtype|
+
+    '{' +
+      LR_ALLOWED[l_dtype].map do |r_dtype|
+      if r_dtype == :NULL
+        'NULL'
+      else
+        "fun<#{l_dtype}, #{r_dtype}>"
+      end
+    end.join(', ') +
+      '}'
+
+  end.join(",\n") +
+      '}'
+  end
 
 puts lines

data/ext/nmatrix/types.h

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //
@@ -34,10 +34,6 @@
 
 #include <stdint.h>
 
-/*
- * Project Includes
- */
-
 /*
  * Macros
  */
@@ -53,13 +49,4 @@
 typedef float		float32_t;
 typedef double	float64_t;
 
-
-/*
- * Data
- */
-
-/*
- * Functions
- */
-
 #endif

data/ext/nmatrix/util/io.cpp

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //

data/ext/nmatrix/util/io.h

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //

data/ext/nmatrix/util/lapack.h

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //

data/ext/nmatrix/util/math.cpp

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //
@@ -219,18 +219,18 @@ inline static void cblas_gemm(const enum CBLAS_ORDER order,
  * For documentation: http://www.netlib.org/lapack/double/dgetrf.f
  */
 template <typename DType>
-inline static bool cblas_gemv(const enum CBLAS_TRANSPOSE trans_a,
-                              int m, int n,
-                              void* alpha,
-                              void* a, int lda,
-                              void* x, int incx,
-                              void* beta,
-                              void* y, int incy)
+inline static bool cblas_gemv(const enum CBLAS_TRANSPOSE trans,
+                              const int m, const int n,
+                              const void* alpha,
+                              const void* a, const int lda,
+                              const void* x, const int incx,
+                              const void* beta,
+                              void* y, const int incy)
 {
-  return gemv<DType>(trans_a,
-                     m, n, reinterpret_cast<DType*>(alpha),
-                     reinterpret_cast<DType*>(a), lda,
-                     reinterpret_cast<DType*>(x), incx, reinterpret_cast<DType*>(beta),
+  return gemv<DType>(trans,
+                     m, n, reinterpret_cast<const DType*>(alpha),
+                     reinterpret_cast<const DType*>(a), lda,
+                     reinterpret_cast<const DType*>(x), incx, reinterpret_cast<const DType*>(beta),
                      reinterpret_cast<DType*>(y), incy);
 }
 
@@ -591,7 +591,7 @@ static VALUE nm_cblas_gemv(VALUE self,
                            VALUE beta,
                            VALUE y, VALUE incy)
 {
-  NAMED_DTYPE_TEMPLATE_TABLE(ttable, nm::math::cblas_gemv, bool, const enum CBLAS_TRANSPOSE trans_a, int m, int n, void* alpha, void* a, int lda, void* x, int incx, void* beta, void* y, int incy);
+  NAMED_DTYPE_TEMPLATE_TABLE(ttable, nm::math::cblas_gemv, bool, const enum CBLAS_TRANSPOSE, const int, const int, const void*, const void*, const int, const void*, const int, const void*, void*, const int)
 
   nm::dtype_t dtype = NM_DTYPE(a);
 

data/ext/nmatrix/util/math.h

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //

data/ext/nmatrix/util/sl_list.cpp

@@ -1,6 +1,6 @@
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //

data/ext/nmatrix/util/sl_list.h

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //

data/ext/nmatrix/util/util.h

@@ -9,8 +9,8 @@
 //
 // == Copyright Information
 //
-// SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-// NMatrix is Copyright (c) 2012, Ruby Science Foundation
+// SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+// NMatrix is Copyright (c) 2013, Ruby Science Foundation
 //
 // Please see LICENSE.txt for additional copyright notices.
 //

data/lib/nmatrix.rb

@@ -8,8 +8,8 @@
 #
 # == Copyright Information
 #
-# SciRuby is Copyright (c) 2010 - 2012, Ruby Science Foundation
-# NMatrix is Copyright (c) 2012, Ruby Science Foundation
+# SciRuby is Copyright (c) 2010 - 2013, Ruby Science Foundation
+# NMatrix is Copyright (c) 2013, Ruby Science Foundation
 #
 # Please see LICENSE.txt for additional copyright notices.
 #
@@ -22,43 +22,21 @@
 #
 # == nmatrix.rb
 #
-# This file loads the C extension for NMatrix and adds an autoload for the
-# NMatrix and NVector classes.
-
-
-#############
-# Autoloads #
-#############
-
-
-############
-# Requires #
-############
+# This file loads the C extension for NMatrix and all the ruby files.
+#
 
-# NMatrix
+# For some reason nmatrix.so ends up in a different place during gem build.
+if File.exist? "lib/nmatrix/nmatrix.so"
+  # Development
+  require "nmatrix/nmatrix.so"
+else
+  # Gem
+  require "nmatrix.so"
+end
 
 require 'nmatrix/nmatrix.rb'
 require 'nmatrix/version.rb'
 require 'nmatrix/nvector.rb'
 require 'nmatrix/blas.rb'
-
-# For some reason nmatrix.so ends up in a different place during gem build.
-if File.exist? 'lib/nmatrix/nmatrix.so'
-	# Development
-	require 'nmatrix/nmatrix.so'
-else
-	# Gem
-	require 'nmatrix.so'
-end
-
-# Monkey patches.
 require 'nmatrix/monkeys'
-
-#############
-# Autoloads #
-#############
-
-autoload :NMatrix, 'nmatrix/nmatrix'
-autoload :NVector, 'nmatrix/nvector'
-
-require "nmatrix/shortcuts.rb"
+require "nmatrix/shortcuts.rb"