You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ac...@apache.org on 2012/09/12 22:33:29 UTC
svn commit: r1384112 - in /giraph/trunk: CHANGELOG
src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
src/main/java/org/apache/giraph/benchmark/ShortestPathsBenchmark.java
Author: aching
Date: Wed Sep 12 20:33:29 2012
New Revision: 1384112
URL: http://svn.apache.org/viewvc?rev=1384112&view=rev
Log:
GIRAPH-324: Add option to use combiner in benchmarks. (apresta via
aching)
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
giraph/trunk/src/main/java/org/apache/giraph/benchmark/ShortestPathsBenchmark.java
Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1384112&r1=1384111&r2=1384112&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Wed Sep 12 20:33:29 2012
@@ -1,7 +1,12 @@
Giraph Change Log
Release 0.2.0 - unreleased
- GIRAPH-191: Random walks on graphs (Gianmarco De Francisci Morales via ereisman)
+
+ GIRAPH-324: Add option to use combiner in benchmarks. (apresta via
+ aching)
+
+ GIRAPH-191: Random walks on graphs (Gianmarco De Francisci Morales
+ via ereisman)
GIRAPH-320: Provide a runtime configuration for choosing the
log level (aching via ereisman)
Modified: giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java?rev=1384112&r1=1384111&r2=1384112&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/benchmark/PageRankBenchmark.java Wed Sep 12 20:33:29 2012
@@ -23,6 +23,7 @@ import org.apache.commons.cli.CommandLin
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
+import org.apache.giraph.examples.DoubleSumCombiner;
import org.apache.giraph.graph.BspUtils;
import org.apache.giraph.graph.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;
@@ -87,6 +88,10 @@ public class PageRankBenchmark extends E
"vertexClass",
true,
"Vertex class (0 for HashMapVertex, 1 for EdgeListVertex)");
+ options.addOption("nc",
+ "noCombiner",
+ false,
+ "Don't use a combiner");
HelpFormatter formatter = new HelpFormatter();
if (args.length == 0) {
formatter.printHelp(getClass().getName(), options, true);
@@ -126,6 +131,9 @@ public class PageRankBenchmark extends E
}
LOG.info("Using class " +
BspUtils.getVertexClass(job.getConfiguration()).getName());
+ if (!cmd.hasOption("nc")) {
+ job.setVertexCombinerClass(DoubleSumCombiner.class);
+ }
job.setVertexInputFormatClass(PseudoRandomVertexInputFormat.class);
job.setWorkerConfiguration(workers, workers, 100.0f);
job.getConfiguration().setLong(
Modified: giraph/trunk/src/main/java/org/apache/giraph/benchmark/ShortestPathsBenchmark.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/benchmark/ShortestPathsBenchmark.java?rev=1384112&r1=1384111&r2=1384112&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/benchmark/ShortestPathsBenchmark.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/benchmark/ShortestPathsBenchmark.java Wed Sep 12 20:33:29 2012
@@ -84,6 +84,10 @@ public class ShortestPathsBenchmark exte
"vertexClass",
true,
"Vertex class (0 for HashMapVertex, 1 for EdgeListVertex)");
+ options.addOption("nc",
+ "noCombiner",
+ false,
+ "Don't use a combiner");
HelpFormatter formatter = new HelpFormatter();
if (args.length == 0) {
formatter.printHelp(getClass().getName(), options, true);
@@ -120,7 +124,9 @@ public class ShortestPathsBenchmark exte
LOG.info("Using class " +
BspUtils.getVertexClass(job.getConfiguration()).getName());
job.setVertexInputFormatClass(PseudoRandomVertexInputFormat.class);
- job.setVertexCombinerClass(MinimumDoubleCombiner.class);
+ if (!cmd.hasOption("nc")) {
+ job.setVertexCombinerClass(MinimumDoubleCombiner.class);
+ }
job.setWorkerConfiguration(workers, workers, 100.0f);
job.getConfiguration().setLong(
PseudoRandomVertexInputFormat.AGGREGATE_VERTICES,