You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ro...@apache.org on 2010/02/10 13:08:44 UTC
svn commit: r908463 - in /lucene/mahout/trunk/math: pom.xml
src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java
src/main/java/org/apache/mahout/math/matrix/linalg/Smp.java
src/main/java/org/apache/mahout/math/matrix/linalg/SmpBlas.java
Author: robinanil
Date: Wed Feb 10 12:08:44 2010
New Revision: 908463
URL: http://svn.apache.org/viewvc?rev=908463&view=rev
Log:
Kicking out concurrent library. And with it the SMP implementation of Blas
Removed:
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Smp.java
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/SmpBlas.java
Modified:
lucene/mahout/trunk/math/pom.xml
lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java
Modified: lucene/mahout/trunk/math/pom.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/pom.xml?rev=908463&r1=908462&r2=908463&view=diff
==============================================================================
--- lucene/mahout/trunk/math/pom.xml (original)
+++ lucene/mahout/trunk/math/pom.xml Wed Feb 10 12:08:44 2010
@@ -76,16 +76,6 @@
<artifactId>mahout-collections</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
<!-- Gson: Java to Json conversion -->
<dependency>
Modified: lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java?rev=908463&r1=908462&r2=908463&view=diff
==============================================================================
--- lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java (original)
+++ lucene/mahout/trunk/math/src/main/java/org/apache/mahout/math/matrix/linalg/Algebra.java Wed Feb 10 12:08:44 2010
@@ -428,8 +428,11 @@
public DoubleMatrix2D pow(DoubleMatrix2D A, int p) {
// matrix multiplication based on log2 method: A*A*....*A is slow, ((A * A)^2)^2 * ... is faster
// allocates two auxiliary matrices as work space
-
- Blas blas = SmpBlas.getSmpBlas(); // for parallel matrix mult; if not initialized defaults to sequential blas
+
+ // Could be replaced by parallel matrix mult libary
+ // Was: for parallel matrix mult; if not initialized defaults to sequential blas
+ Blas blas = SeqBlas.seqBlas;
+
Property.DEFAULT.checkSquare(A);
if (p < 0) {
A = inverse(A);