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/07/29 16:05:00 UTC
[1/2] incubator-systemml git commit: Preparing development version
0.10.1-SNAPSHOT
Repository: incubator-systemml
Updated Branches:
refs/heads/branch-0.10 [created] c85ebed6b
Preparing development version 0.10.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/d00f8863
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/d00f8863
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/d00f8863
Branch: refs/heads/branch-0.10
Commit: d00f88634bd26f686727db2798bd83a2dba9f30f
Parents: 3d5f9b1
Author: Mike Dusenberry <mw...@us.ibm.com>
Authored: Fri Jul 29 08:59:04 2016 -0700
Committer: Mike Dusenberry <mw...@us.ibm.com>
Committed: Fri Jul 29 08:59:04 2016 -0700
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/d00f8863/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bf9c195..b2e5a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<version>18</version>
</parent>
<groupId>org.apache.systemml</groupId>
- <version>0.10.0-incubating</version>
+ <version>0.10.1-incubating-SNAPSHOT</version>
<artifactId>systemml</artifactId>
<packaging>jar</packaging>
<name>SystemML</name>
@@ -41,7 +41,7 @@
<connection>scm:git:git@github.com:apache/incubator-systemml</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-systemml</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-systemml.git</url>
- <tag>0.10.0-incubating-rc2</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
<system>JIRA</system>
[2/2] incubator-systemml git commit: SYSTEMML-829 Python API Broken
In Python 3 Due To Inclusion Of Tabs In Source File
Posted by du...@apache.org.
SYSTEMML-829 Python API Broken In Python 3 Due To Inclusion Of Tabs In Source File
Currently, our Python Api (SystemML.py) does not support Python 3 due to
accidental inclusion of tabs into the source file. Both Python 2 and
Python 3 heavily discourage the use of any tabs, and Python 3 explicitly
does not allow a file to contain both tabs and spaces. Therefore,
this fix replaces all tabs with spaces, and we must ensure that any
future Python additions *only* include spaces.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/c85ebed6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/c85ebed6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/c85ebed6
Branch: refs/heads/branch-0.10
Commit: c85ebed6bd80adf550cc0c4300f5bb3572db8090
Parents: d00f886
Author: Mike Dusenberry <mw...@us.ibm.com>
Authored: Fri Jul 29 08:49:08 2016 -0700
Committer: Mike Dusenberry <mw...@us.ibm.com>
Committed: Fri Jul 29 09:02:31 2016 -0700
----------------------------------------------------------------------
src/main/java/org/apache/sysml/api/python/SystemML.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/c85ebed6/src/main/java/org/apache/sysml/api/python/SystemML.py
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/python/SystemML.py b/src/main/java/org/apache/sysml/api/python/SystemML.py
index e5d94af..5c656ab 100644
--- a/src/main/java/org/apache/sysml/api/python/SystemML.py
+++ b/src/main/java/org/apache/sysml/api/python/SystemML.py
@@ -210,7 +210,7 @@ class MLOutput(object):
def getBinaryBlockedRDD(self, varName):
raise Exception('Not supported in Python MLContext')
- #try:
+ #try:
# rdd = RDD(self.jmlOut.getBinaryBlockedRDD(varName), self.sc)
# return rdd
#except Py4JJavaError:
@@ -218,7 +218,7 @@ class MLOutput(object):
def getMatrixCharacteristics(self, varName):
raise Exception('Not supported in Python MLContext')
- #try:
+ #try:
# chars = self.jmlOut.getMatrixCharacteristics(varName)
# return chars
#except Py4JJavaError:
@@ -234,14 +234,14 @@ class MLOutput(object):
def getMLMatrix(self, sqlContext, varName):
raise Exception('Not supported in Python MLContext')
- #try:
+ #try:
# mlm = self.jmlOut.getMLMatrix(sqlContext._scala_SQLContext, varName)
# return mlm
#except Py4JJavaError:
# traceback.print_exc()
def getStringRDD(self, varName, format):
- raise Exception('Not supported in Python MLContext')
+ raise Exception('Not supported in Python MLContext')
#try:
# rdd = RDD(self.jmlOut.getStringRDD(varName, format), self.sc)
# return rdd