You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by du...@apache.org on 2016/01/12 23:35:34 UTC
incubator-systemml git commit: Upgrading Spark version to 1.4.1
Repository: incubator-systemml
Updated Branches:
refs/heads/master 65844aa6d -> 5bc92d463
Upgrading Spark version to 1.4.1
Making the versions of spark-related dependencies consistent.
Closes #29.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/5bc92d46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/5bc92d46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/5bc92d46
Branch: refs/heads/master
Commit: 5bc92d4635c400dda7a1a1c9d8e95a8bdb4f49d9
Parents: 65844aa
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Tue Jan 12 14:33:35 2016 -0800
Committer: Mike Dusenberry <mw...@us.ibm.com>
Committed: Tue Jan 12 14:33:35 2016 -0800
----------------------------------------------------------------------
pom.xml | 7 ++++---
src/main/java/org/apache/sysml/api/MLBlock.java | 19 +++++++++++++++++++
2 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/5bc92d46/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3e120a8..e721556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
<properties>
<hadoop.version>2.4.1</hadoop.version>
<antlr.version>4.3</antlr.version>
+ <spark.version>1.4.1</spark.version>
<!-- OS-specific JVM arguments for running integration tests -->
<integrationTestExtraJVMArgs />
@@ -501,14 +502,14 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.10</artifactId>
- <version>1.4.0</version>
+ <version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-mllib_2.10</artifactId>
- <version>1.4.0</version>
+ <version>${spark.version}</version>
<scope>provided</scope>
</dependency>
@@ -516,7 +517,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_2.10</artifactId>
- <version>1.3.1</version>
+ <version>${spark.version}</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/5bc92d46/src/main/java/org/apache/sysml/api/MLBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/MLBlock.java b/src/main/java/org/apache/sysml/api/MLBlock.java
index 350b591..b992d6e 100644
--- a/src/main/java/org/apache/sysml/api/MLBlock.java
+++ b/src/main/java/org/apache/sysml/api/MLBlock.java
@@ -88,6 +88,12 @@ public class MLBlock implements Row {
}
@Override
+ public <T> T getAs(String arg0) {
+ // TODO
+ return null;
+ }
+
+ @Override
public boolean getBoolean(int arg0) {
// TODO
return false;
@@ -151,11 +157,23 @@ public class MLBlock implements Row {
}
@Override
+ public int fieldIndex(String arg0) {
+ // TODO
+ return 0;
+ }
+
+ @Override
public <K, V> scala.collection.Map<K, V> getMap(int arg0) {
// TODO Auto-generated method stub
return null;
}
+ @Override
+ public <T> scala.collection.immutable.Map<String, T> getValuesMap(Seq<String> arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
@SuppressWarnings("unchecked")
@Override
public <T> Seq<T> getSeq(int arg0) {
@@ -217,6 +235,7 @@ public class MLBlock implements Row {
return getDefaultSchemaForBinaryBlock();
}
+
@Override
public int size() {
return 2;