Author: edwardyoon
Date: Wed Oct 8 01:20:38 2008
New Revision: 702751
URL: http://svn.apache.org/viewvc?rev=702751&view=rev
Log:
Add setNumMap/ReduceTasks() to HamaConfiguration
Modified:
incubator/hama/trunk/CHANGES.txt
incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixAddition.java
incubator/hama/trunk/src/java/org/apache/hama/HamaConfiguration.java
incubator/hama/trunk/src/test/org/apache/hama/mapred/TestMatrixMapReduce.java
Modified: incubator/hama/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=702751&r1=702750&r2=702751&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Wed Oct 8 01:20:38 2008
@@ -25,6 +25,7 @@
IMPROVEMENTS
+ HAMA-73: Add setNumMap/ReduceTasks() to HamaConfiguration (edwardyoon)
HAMA-60: Add an arguments for handle parallel degree to MatrixAddition
(edwardyoon)
HAMA-68: Shell parser JUnit test cases (samuel via edwardyoon)
HAMA-65: Remove the information of an inactive committers (edwardyoon)
Modified:
incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixAddition.java
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixAddition.java?rev=702751&r1=702750&r2=702751&view=diff
==============================================================================
---
incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixAddition.java
(original)
+++
incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixAddition.java
Wed Oct 8 01:20:38 2008
@@ -56,9 +56,9 @@
for (int i = 0; i < args.length; ++i) {
try {
if ("-m".equals(args[i])) {
- conf.set("mapred.map.tasks", args[++i]);
+ conf.setNumMapTasks(Integer.parseInt(args[++i]));
} else if ("-r".equals(args[i])) {
- conf.set("mapred.reduce.tasks", args[++i]);
+ conf.setNumReduceTasks(Integer.parseInt(args[++i]));
} else {
other_args.add(args[i]);
}
Modified: incubator/hama/trunk/src/java/org/apache/hama/HamaConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/HamaConfiguration.java?rev=702751&r1=702750&r2=702751&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/HamaConfiguration.java
(original)
+++ incubator/hama/trunk/src/java/org/apache/hama/HamaConfiguration.java Wed
Oct 8 01:20:38 2008
@@ -46,6 +46,14 @@
}
}
+ public void setNumMapTasks(int map) {
+ set("mapred.map.tasks",String.valueOf(map));
+ }
+
+ public void setNumReduceTasks(int reduce) {
+ set("mapred.reduce.tasks",String.valueOf(reduce));
+ }
+
private void addHbaseResources() {
addResource("hama-site.xml");
}
Modified:
incubator/hama/trunk/src/test/org/apache/hama/mapred/TestMatrixMapReduce.java
URL:
http://svn.apache.org/viewvc/incubator/hama/trunk/src/test/org/apache/hama/mapred/TestMatrixMapReduce.java?rev=702751&r1=702750&r2=702751&view=diff
==============================================================================
---
incubator/hama/trunk/src/test/org/apache/hama/mapred/TestMatrixMapReduce.java
(original)
+++
incubator/hama/trunk/src/test/org/apache/hama/mapred/TestMatrixMapReduce.java
Wed Oct 8 01:20:38 2008
@@ -70,8 +70,8 @@
VectorWritable.class, jobConf);
MatrixReduce.initJob(output, Add1DLayoutReduce.class, jobConf);
- jobConf.setNumMapTasks(1);
- jobConf.setNumReduceTasks(1);
+ jobConf.setNumMapTasks(2);
+ jobConf.setNumReduceTasks(2);
JobClient.runJob(jobConf);