nmatrix 0.2.0 → 0.2.1

data/ext/nmatrix/extconf.rb

@@ -105,9 +105,6 @@ basenames = %w{nmatrix ruby_constants data/data util/io math util/sl_list storag
 $objs = basenames.map { |b| "#{b}.o"   }
 $srcs = basenames.map { |b| "#{b}.cpp" }
 
-#CONFIG['CXX'] = 'clang++'
-CONFIG['CXX'] = 'g++'
-
 def find_newer_gplusplus #:nodoc:
   print "checking for apparent GNU g++ binary with C++0x/C++11 support... "
   [9,8,7,6,5,4,3].each do |minor|
@@ -135,7 +132,7 @@ end
 
 
 if CONFIG['CXX'] == 'clang++'
-  $CPP_STANDARD = 'c++11'
+  $CXX_STANDARD = 'c++11'
 
 else
   version = gplusplus_version
@@ -147,11 +144,11 @@ else
   end
 
   if version < '4.7.0'
-    $CPP_STANDARD = 'c++0x'
+    $CXX_STANDARD = 'c++0x'
   else
-    $CPP_STANDARD = 'c++11'
+    $CXX_STANDARD = 'c++11'
   end
-  puts "using C++ standard... #{$CPP_STANDARD}"
+  puts "using C++ standard... #{$CXX_STANDARD}"
   puts "g++ reports version... " + `#{CONFIG['CXX']} --version|head -n 1|cut -f 3 -d " "`
 end
 
@@ -160,13 +157,18 @@ end
 # For release, these next two should both be changed to -O3.
 $CFLAGS += " -O3 "
 #$CFLAGS += " -static -O0 -g "
-$CPPFLAGS += " -O3 -std=#{$CPP_STANDARD} " #-fmax-errors=10 -save-temps
-#$CPPFLAGS += " -static -O0 -g -std=#{$CPP_STANDARD} "
+$CXXFLAGS += " -O3 -std=#{$CXX_STANDARD} " #-fmax-errors=10 -save-temps
+#$CXXFLAGS += " -static -O0 -g -std=#{$CXX_STANDARD} "
 
 CONFIG['warnflags'].gsub!('-Wshorten-64-to-32', '') # doesn't work except in Mac-patched gcc (4.2)
 CONFIG['warnflags'].gsub!('-Wdeclaration-after-statement', '')
 CONFIG['warnflags'].gsub!('-Wimplicit-function-declaration', '')
 
+have_func("rb_array_const_ptr", "ruby.h")
+have_macro("FIX_CONST_VALUE_PTR", "ruby.h")
+have_macro("RARRAY_CONST_PTR", "ruby.h")
+have_macro("RARRAY_AREF", "ruby.h")
+
 create_conf_h("nmatrix_config.h")
 create_makefile("nmatrix")
 

data/ext/nmatrix/math.cpp

@@ -126,6 +126,7 @@
  */
 
 
+#include <ruby.h>
 #include <algorithm>
 #include <limits>
 #include <cmath>
@@ -232,8 +233,8 @@ namespace nm {
     template <typename DType>
     void inverse(const int M, void* a_elements) {
       DType* matrix   = reinterpret_cast<DType*>(a_elements);
-      int* row_index = new int[M]; // arrays for keeping track of column scrambling
-      int* col_index = new int[M];
+      int row_index[M]; // arrays for keeping track of column scrambling
+      int col_index[M];
 
       for (int k = 0;k < M; ++k) {
         DType akk = std::abs( matrix[k * (M + 1)] ) ; // diagonal element
@@ -294,9 +295,6 @@ namespace nm {
           }
         }
       }
-
-      delete[] row_index;
-      delete[] col_index;
     }
 
     /*
@@ -599,8 +597,8 @@ static VALUE nm_cblas_rotg(VALUE self, VALUE ab) {
       rb_ary_store(result, 0, *reinterpret_cast<VALUE*>(pC));
       rb_ary_store(result, 1, *reinterpret_cast<VALUE*>(pS));
     } else {
-      rb_ary_store(result, 0, rubyobj_from_cval(pC, dtype).rval);
-      rb_ary_store(result, 1, rubyobj_from_cval(pS, dtype).rval);
+      rb_ary_store(result, 0, nm::rubyobj_from_cval(pC, dtype).rval);
+      rb_ary_store(result, 1, nm::rubyobj_from_cval(pS, dtype).rval);
     }
     NM_CONSERVATIVE(nm_unregister_value(&ab));
     NM_CONSERVATIVE(nm_unregister_value(&self));
@@ -724,7 +722,7 @@ static VALUE nm_cblas_nrm2(VALUE self, VALUE n, VALUE x, VALUE incx) {
 
     ttable[dtype](FIX2INT(n), NM_STORAGE_DENSE(x)->elements, FIX2INT(incx), Result);
 
-    return rubyobj_from_cval(Result, rdtype).rval;
+    return nm::rubyobj_from_cval(Result, rdtype).rval;
   }
 }
 
@@ -773,7 +771,7 @@ static VALUE nm_cblas_asum(VALUE self, VALUE n, VALUE x, VALUE incx) {
 
   ttable[dtype](FIX2INT(n), NM_STORAGE_DENSE(x)->elements, FIX2INT(incx), Result);
 
-  return rubyobj_from_cval(Result, rdtype).rval;
+  return nm::rubyobj_from_cval(Result, rdtype).rval;
 }
 
 /*
@@ -1005,7 +1003,7 @@ static VALUE nm_clapack_getrs(VALUE self, VALUE order, VALUE trans, VALUE n, VAL
   } else {
     ipiv_ = NM_ALLOCA_N(int, RARRAY_LEN(ipiv));
     for (int index = 0; index < RARRAY_LEN(ipiv); ++index) {
-      ipiv_[index] = FIX2INT( RARRAY_PTR(ipiv)[index] );
+      ipiv_[index] = FIX2INT( RARRAY_AREF(ipiv, index) );
     }
   }
 
@@ -1057,7 +1055,7 @@ static VALUE nm_clapack_laswp(VALUE self, VALUE n, VALUE a, VALUE lda, VALUE k1,
   } else {
     ipiv_ = NM_ALLOCA_N(int, RARRAY_LEN(ipiv));
     for (int index = 0; index < RARRAY_LEN(ipiv); ++index) {
-      ipiv_[index] = FIX2INT( RARRAY_PTR(ipiv)[index] );
+      ipiv_[index] = FIX2INT( RARRAY_AREF(ipiv, index) );
     }
   }
 

data/ext/nmatrix/math/math.h

@@ -72,6 +72,7 @@
 
 #include <algorithm> // std::min, std::max
 #include <limits> // std::numeric_limits
+#include <memory> // std::unique_ptr
 
 /*
  * Project Includes
@@ -123,8 +124,8 @@ template <typename DType>
 inline void numbmm(const unsigned int n, const unsigned int m, const unsigned int l, const IType* ia, const IType* ja, const DType* a, const bool diaga,
             const IType* ib, const IType* jb, const DType* b, const bool diagb, IType* ic, IType* jc, DType* c, const bool diagc) {
   const unsigned int max_lmn = std::max(std::max(m, n), l);
-  IType next[max_lmn];
-  DType sums[max_lmn];
+  std::unique_ptr<IType[]> next(new IType[max_lmn]);
+  std::unique_ptr<DType[]> sums(new DType[max_lmn]);
 
   DType v;
 

data/ext/nmatrix/math/trsm.h

@@ -88,183 +88,183 @@ inline void trsm_nothrow(const enum CBLAS_SIDE side, const enum CBLAS_UPLO uplo,
         b[i + j * ldb] = 0;
       }
     }
-	  return;
+    return;
   }
 
   if (side == CblasLeft) {
-	  if (trans_a == CblasNoTrans) {
+    if (trans_a == CblasNoTrans) {
 
       /* Form  B := alpha*inv( A )*B. */
-	    if (uplo == CblasUpper) {
-    		for (int j = 0; j < n; ++j) {
-		      if (alpha != 1) {
-			      for (int i = 0; i < m; ++i) {
-			        b[i + j * ldb] = alpha * b[i + j * ldb];
-			      }
-		      }
-		      for (int k = m-1; k >= 0; --k) {
-			      if (b[k + j * ldb] != 0) {
-			        if (diag == CblasNonUnit) {
-				        b[k + j * ldb] /= a[k + k * lda];
-			        }
+      if (uplo == CblasUpper) {
+        for (int j = 0; j < n; ++j) {
+          if (alpha != 1) {
+            for (int i = 0; i < m; ++i) {
+              b[i + j * ldb] = alpha * b[i + j * ldb];
+            }
+          }
+          for (int k = m-1; k >= 0; --k) {
+            if (b[k + j * ldb] != 0) {
+              if (diag == CblasNonUnit) {
+                b[k + j * ldb] /= a[k + k * lda];
+              }
 
               for (int i = 0; i < k-1; ++i) {
                 b[i + j * ldb] -= b[k + j * ldb] * a[i + k * lda];
               }
-			      }
-  		    }
-		    }
-	    } else {
-    		for (int j = 0; j < n; ++j) {
-		      if (alpha != 1) {
+            }
+          }
+        }
+      } else {
+        for (int j = 0; j < n; ++j) {
+          if (alpha != 1) {
             for (int i = 0; i < m; ++i) {
               b[i + j * ldb] = alpha * b[i + j * ldb];
-			      }
-		      }
-  		    for (int k = 0; k < m; ++k) {
-      			if (b[k + j * ldb] != 0.) {
-			        if (diag == CblasNonUnit) {
-				        b[k + j * ldb] /= a[k + k * lda];
-			        }
-    			    for (int i = k+1; i < m; ++i) {
-        				b[i + j * ldb] -= b[k + j * ldb] * a[i + k * lda];
-    			    }
-      			}
-  		    }
-    		}
-	    }
-	  } else { // CblasTrans
+            }
+          }
+          for (int k = 0; k < m; ++k) {
+            if (b[k + j * ldb] != 0.) {
+              if (diag == CblasNonUnit) {
+                b[k + j * ldb] /= a[k + k * lda];
+              }
+              for (int i = k+1; i < m; ++i) {
+                b[i + j * ldb] -= b[k + j * ldb] * a[i + k * lda];
+              }
+            }
+          }
+        }
+      }
+    } else { // CblasTrans
 
       /*           Form  B := alpha*inv( A**T )*B. */
-	    if (uplo == CblasUpper) {
-    		for (int j = 0; j < n; ++j) {
-		      for (int i = 0; i < m; ++i) {
-			      DType temp = alpha * b[i + j * ldb];
+      if (uplo == CblasUpper) {
+        for (int j = 0; j < n; ++j) {
+          for (int i = 0; i < m; ++i) {
+            DType temp = alpha * b[i + j * ldb];
             for (int k = 0; k < i; ++k) { // limit was i-1. Lots of similar bugs in this code, probably.
               temp -= a[k + i * lda] * b[k + j * ldb];
-      			}
-			      if (diag == CblasNonUnit) {
-			        temp /= a[i + i * lda];
-			      }
-			      b[i + j * ldb] = temp;
-  		    }
-    		}
-	    } else {
-    		for (int j = 0; j < n; ++j) {
-		      for (int i = m-1; i >= 0; --i) {
-			      DType temp= alpha * b[i + j * ldb];
-      			for (int k = i+1; k < m; ++k) {
-			        temp -= a[k + i * lda] * b[k + j * ldb];
-      			}
-			      if (diag == CblasNonUnit) {
-			        temp /= a[i + i * lda];
-			      }
-			      b[i + j * ldb] = temp;
-  		    }
-    		}
-	    }
-	  }
+            }
+            if (diag == CblasNonUnit) {
+              temp /= a[i + i * lda];
+            }
+            b[i + j * ldb] = temp;
+          }
+        }
+      } else {
+        for (int j = 0; j < n; ++j) {
+          for (int i = m-1; i >= 0; --i) {
+            DType temp= alpha * b[i + j * ldb];
+            for (int k = i+1; k < m; ++k) {
+              temp -= a[k + i * lda] * b[k + j * ldb];
+            }
+            if (diag == CblasNonUnit) {
+              temp /= a[i + i * lda];
+            }
+            b[i + j * ldb] = temp;
+          }
+        }
+      }
+    }
   } else { // right side
 
-	  if (trans_a == CblasNoTrans) {
+    if (trans_a == CblasNoTrans) {
 
       /*           Form  B := alpha*B*inv( A ). */
 
-	    if (uplo == CblasUpper) {
-    		for (int j = 0; j < n; ++j) {
-		      if (alpha != 1) {
-      			for (int i = 0; i < m; ++i) {
-			        b[i + j * ldb] = alpha * b[i + j * ldb];
-      			}
-		      }
-  		    for (int k = 0; k < j-1; ++k) {
-	      		if (a[k + j * lda] != 0) {
-    			    for (int i = 0; i < m; ++i) {
-				        b[i + j * ldb] -= a[k + j * lda] * b[i + k * ldb];
-			        }
-			      }
-  		    }
-	  	    if (diag == CblasNonUnit) {
-		      	DType temp = 1 / a[j + j * lda];
-			      for (int i = 0; i < m; ++i) {
-			        b[i + j * ldb] = temp * b[i + j * ldb];
-      			}
-		      }
-    		}
-	    } else {
-		    for (int j = n-1; j >= 0; --j) {
-		      if (alpha != 1) {
-			      for (int i = 0; i < m; ++i) {
-			        b[i + j * ldb] = alpha * b[i + j * ldb];
-      			}
-  		    }
+      if (uplo == CblasUpper) {
+        for (int j = 0; j < n; ++j) {
+          if (alpha != 1) {
+            for (int i = 0; i < m; ++i) {
+              b[i + j * ldb] = alpha * b[i + j * ldb];
+            }
+          }
+          for (int k = 0; k < j-1; ++k) {
+            if (a[k + j * lda] != 0) {
+              for (int i = 0; i < m; ++i) {
+                b[i + j * ldb] -= a[k + j * lda] * b[i + k * ldb];
+              }
+            }
+          }
+          if (diag == CblasNonUnit) {
+            DType temp = 1 / a[j + j * lda];
+            for (int i = 0; i < m; ++i) {
+              b[i + j * ldb] = temp * b[i + j * ldb];
+            }
+          }
+        }
+      } else {
+        for (int j = n-1; j >= 0; --j) {
+          if (alpha != 1) {
+            for (int i = 0; i < m; ++i) {
+              b[i + j * ldb] = alpha * b[i + j * ldb];
+            }
+          }
 
-  		    for (int k = j+1; k < n; ++k) {
-	      		if (a[k + j * lda] != 0.) {
-    			    for (int i = 0; i < m; ++i) {
-				        b[i + j * ldb] -= a[k + j * lda] * b[i + k * ldb];
-    			    }
-		      	}
-  		    }
-	  	    if (diag == CblasNonUnit) {
-		      	DType temp = 1 / a[j + j * lda];
+          for (int k = j+1; k < n; ++k) {
+            if (a[k + j * lda] != 0.) {
+              for (int i = 0; i < m; ++i) {
+                b[i + j * ldb] -= a[k + j * lda] * b[i + k * ldb];
+              }
+            }
+          }
+          if (diag == CblasNonUnit) {
+            DType temp = 1 / a[j + j * lda];
 
-			      for (int i = 0; i < m; ++i) {
-			        b[i + j * ldb] = temp * b[i + j * ldb];
-      			}
-		      }
-    		}
-	    }
-	  } else { // CblasTrans
+            for (int i = 0; i < m; ++i) {
+              b[i + j * ldb] = temp * b[i + j * ldb];
+            }
+          }
+        }
+      }
+    } else { // CblasTrans
 
       /*           Form  B := alpha*B*inv( A**T ). */
 
-	    if (uplo == CblasUpper) {
-		    for (int k = n-1; k >= 0; --k) {
-		      if (diag == CblasNonUnit) {
-			      DType temp= 1 / a[k + k * lda];
-	      		for (int i = 0; i < m; ++i) {
-  			      b[i + k * ldb] = temp * b[i + k * ldb];
-      			}
-		      }
-  		    for (int j = 0; j < k-1; ++j) {
-	      		if (a[j + k * lda] != 0.) {
-			        DType temp= a[j + k * lda];
-    			    for (int i = 0; i < m; ++i) {
-		        		b[i + j * ldb] -= temp * b[i + k *	ldb];
-    			    }
-      			}
-  		    }
-	  	    if (alpha != 1) {
-      			for (int i = 0; i < m; ++i) {
-			        b[i + k * ldb] = alpha * b[i + k * ldb];
-      			}
-		      }
-    		}
-	    } else {
-    		for (int k = 0; k < n; ++k) {
-		      if (diag == CblasNonUnit) {
-      			DType temp = 1 / a[k + k * lda];
-			      for (int i = 0; i < m; ++i) {
-			        b[i + k * ldb] = temp * b[i + k * ldb];
-      			}
-		      }
-  		    for (int j = k+1; j < n; ++j) {
-	      		if (a[j + k * lda] != 0.) {
-			        DType temp = a[j + k * lda];
-			        for (int i = 0; i < m; ++i) {
-				        b[i + j * ldb] -= temp * b[i + k * ldb];
-    			    }
-		      	}
-  		    }
-	  	    if (alpha != 1) {
-      			for (int i = 0; i < m; ++i) {
-			        b[i + k * ldb] = alpha * b[i + k * ldb];
-      			}
-  		    }
-    		}
-	    }
-	  }
+      if (uplo == CblasUpper) {
+        for (int k = n-1; k >= 0; --k) {
+          if (diag == CblasNonUnit) {
+            DType temp= 1 / a[k + k * lda];
+            for (int i = 0; i < m; ++i) {
+              b[i + k * ldb] = temp * b[i + k * ldb];
+            }
+          }
+          for (int j = 0; j < k-1; ++j) {
+            if (a[j + k * lda] != 0.) {
+              DType temp= a[j + k * lda];
+              for (int i = 0; i < m; ++i) {
+                b[i + j * ldb] -= temp * b[i + k *  ldb];
+              }
+            }
+          }
+          if (alpha != 1) {
+            for (int i = 0; i < m; ++i) {
+              b[i + k * ldb] = alpha * b[i + k * ldb];
+            }
+          }
+        }
+      } else {
+        for (int k = 0; k < n; ++k) {
+          if (diag == CblasNonUnit) {
+            DType temp = 1 / a[k + k * lda];
+            for (int i = 0; i < m; ++i) {
+              b[i + k * ldb] = temp * b[i + k * ldb];
+            }
+          }
+          for (int j = k+1; j < n; ++j) {
+            if (a[j + k * lda] != 0.) {
+              DType temp = a[j + k * lda];
+              for (int i = 0; i < m; ++i) {
+                b[i + j * ldb] -= temp * b[i + k * ldb];
+              }
+            }
+          }
+          if (alpha != 1) {
+            for (int i = 0; i < m; ++i) {
+              b[i + k * ldb] = alpha * b[i + k * ldb];
+            }
+          }
+        }
+      }
+    }
   }
 }