You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2011/09/20 08:47:59 UTC
svn commit: r1172995 -
/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/
Author: srowen
Date: Tue Sep 20 06:47:58 2011
New Revision: 1172995
URL: http://svn.apache.org/viewvc?rev=1172995&view=rev
Log:
MAHOUT-524 added danbri's setJarByClass() patch and logging
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java?rev=1172995&r1=1172994&r2=1172995&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputJob.java Tue Sep 20 06:47:58 2011
@@ -59,6 +59,8 @@ public final class AffinityMatrixInputJo
FileInputFormat.addInputPath(job, input);
FileOutputFormat.setOutputPath(job, output);
+ job.setJarByClass(AffinityMatrixInputJob.class);
+
job.waitForCompletion(true);
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java?rev=1172995&r1=1172994&r2=1172995&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/AffinityMatrixInputMapper.java Tue Sep 20 06:47:58 2011
@@ -57,7 +57,7 @@ public class AffinityMatrixInputMapper
if (elements.length != 3) {
throw new IOException("Expected input of length 3, received "
+ elements.length + ". Please make sure you adhere to "
- + "the structure of (i,j,value) for representing a graph in text.");
+ + "the structure of (i,j,value) for representing a graph in text. Input line was: '"+value+"'.");
} else if (elements[0].length() == 0 || elements[1].length() == 0 || elements[2].length() == 0) {
throw new IOException("Found an element of 0 length. Please be sure you adhere to the structure of "
+ "(i,j,value) for representing a graph in text.");
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java?rev=1172995&r1=1172994&r2=1172995&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/MatrixDiagonalizeJob.java Tue Sep 20 06:47:58 2011
@@ -67,6 +67,8 @@ public final class MatrixDiagonalizeJob
FileInputFormat.addInputPath(job, affInput);
FileOutputFormat.setOutputPath(job, diagOutput);
+ job.setJarByClass(MatrixDiagonalizeJob.class);
+
job.waitForCompletion(true);
// read the results back from the path
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java?rev=1172995&r1=1172994&r2=1172995&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/UnitVectorizerJob.java Tue Sep 20 06:47:58 2011
@@ -61,6 +61,8 @@ public final class UnitVectorizerJob {
FileInputFormat.addInputPath(job, input);
FileOutputFormat.setOutputPath(job, output);
+ job.setJarByClass(UnitVectorizerJob.class);
+
job.waitForCompletion(true);
}
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java?rev=1172995&r1=1172994&r2=1172995&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorCache.java Tue Sep 20 06:47:58 2011
@@ -19,6 +19,7 @@ package org.apache.mahout.clustering.spe
import java.io.IOException;
import java.net.URI;
+import java.util.Arrays;
import com.google.common.io.Closeables;
import org.apache.hadoop.conf.Configuration;
@@ -32,6 +33,9 @@ import org.apache.mahout.common.HadoopUt
import org.apache.mahout.common.iterator.sequencefile.SequenceFileValueIterator;
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This class handles reading and writing vectors to the Hadoop
@@ -40,6 +44,8 @@ import org.apache.mahout.math.VectorWrit
*/
public final class VectorCache {
+ private static final Logger log = LoggerFactory.getLogger(VectorCache.class);
+
private VectorCache() {
}
@@ -94,6 +100,7 @@ public final class VectorCache {
if (files == null || files.length < 1) {
return null;
}
+ log.info("Files are: {}", Arrays.toString(files));
return load(conf, new Path(files[0].getPath()));
}
@@ -101,6 +108,7 @@ public final class VectorCache {
* Loads a Vector from the specified path. Returns null if no vector exists.
*/
public static Vector load(Configuration conf, Path input) throws IOException {
+ log.info("Loading vector from: {}", input);
SequenceFileValueIterator<VectorWritable> iterator =
new SequenceFileValueIterator<VectorWritable>(input, true, conf);
try {
Modified: mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java?rev=1172995&r1=1172994&r2=1172995&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/clustering/spectral/common/VectorMatrixMultiplicationJob.java Tue Sep 20 06:47:58 2011
@@ -78,6 +78,9 @@ public final class VectorMatrixMultiplic
FileInputFormat.addInputPath(job, markovPath);
FileOutputFormat.setOutputPath(job, outputPath);
+
+ job.setJarByClass(VectorMatrixMultiplicationJob.class);
+
job.waitForCompletion(true);
// build the resulting DRM from the results