incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r711159 - in /incubator/hama/trunk/src/examples/org/apache/hama/examples: ExampleDriver.java MatrixAddition.java MatrixMultiplication.java
Date Tue, 04 Nov 2008 02:33:57 GMT
Author: edwardyoon
Date: Mon Nov  3 18:33:57 2008
New Revision: 711159

URL: http://svn.apache.org/viewvc?rev=711159&view=rev
Log:
Add mult example.

Added:
    incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixMultiplication.java
Modified:
    incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java
    incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixAddition.java

Modified: incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java?rev=711159&r1=711158&r2=711159&view=diff
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java (original)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/ExampleDriver.java Mon Nov
 3 18:33:57 2008
@@ -25,7 +25,8 @@
   public static void main(String[] args) {
     ProgramDriver pgd = new ProgramDriver();
     try {
-      pgd.addClass("addition", MatrixAddition.class, "A matrix addition.");
+      pgd.addClass("add", MatrixAddition.class, "matrix-matrix addition.");
+      pgd.addClass("mult", MatrixAddition.class, "matrix-matrix multiplication.");
       pgd.driver(args);
     } catch (Throwable e) {
       e.printStackTrace();

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=711159&r1=711158&r2=711159&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 Mon Nov
 3 18:33:57 2008
@@ -34,7 +34,7 @@
 
   public static void main(String[] args) throws IOException {
     if (args.length < 2) {
-      System.out.println("addition  [-m maps] [-r reduces] <row_m> <column_n>");
+      System.out.println("add  [-m maps] [-r reduces] <row_m> <column_n>");
       System.exit(-1);
     } else {
       parseArgs(args);

Added: incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixMultiplication.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixMultiplication.java?rev=711159&view=auto
==============================================================================
--- incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixMultiplication.java (added)
+++ incubator/hama/trunk/src/examples/org/apache/hama/examples/MatrixMultiplication.java Mon
Nov  3 18:33:57 2008
@@ -0,0 +1,75 @@
+/**
+ * Copyright 2007 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.examples;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.hama.DenseMatrix;
+import org.apache.hama.HamaConfiguration;
+import org.apache.hama.Matrix;
+
+public class MatrixMultiplication {
+  private static HamaConfiguration conf = new HamaConfiguration();
+  private static int row;
+  private static int column;
+
+  public static void main(String[] args) throws IOException {
+    if (args.length < 2) {
+      System.out.println("mult  [-m maps] [-r reduces] <row_m> <column_n>");
+      System.exit(-1);
+    } else {
+      parseArgs(args);
+    }
+
+    Matrix a = DenseMatrix.random(conf, row, column);
+    Matrix b = DenseMatrix.random(conf, row, column);
+
+    Matrix c = a.mult(b);
+
+    a.close();
+    b.close();
+    c.close();
+  }
+
+  private static void parseArgs(String[] args) {
+    List<String> other_args = new ArrayList<String>();
+    for (int i = 0; i < args.length; ++i) {
+      try {
+        if ("-m".equals(args[i])) {
+          conf.setNumMapTasks(Integer.parseInt(args[++i]));
+        } else if ("-r".equals(args[i])) {
+          conf.setNumReduceTasks(Integer.parseInt(args[++i]));
+        } else {
+          other_args.add(args[i]);
+        }
+      } catch (NumberFormatException except) {
+        System.out.println("ERROR: Integer expected instead of " + args[i]);
+      } catch (ArrayIndexOutOfBoundsException except) {
+        System.out.println("ERROR: Required parameter missing from "
+            + args[i - 1]);
+      }
+    }
+
+    row = Integer.parseInt(other_args.get(0));
+    column = Integer.parseInt(other_args.get(1));
+  }
+}



Mime
View raw message