Repository: incubator-systemml Updated Branches: refs/heads/master f2ea8770e -> 955526046
[HOTFIX] Update JavaConversions from Scala 2.10 to Scala 2.11 Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/95552604 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/95552604 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/95552604 Branch: refs/heads/master Commit: 955526046e1c1d4057a05e3646ed0f74972bebe1 Parents: f2ea877 Author: Deron Eriksson <[email protected]> Authored: Sat Jul 30 12:48:33 2016 -0700 Committer: Deron Eriksson <[email protected]> Committed: Sat Jul 30 12:48:33 2016 -0700 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/api/mlcontext/Script.java | 2 +- .../apache/sysml/test/integration/mlcontext/MLContextTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/95552604/src/main/java/org/apache/sysml/api/mlcontext/Script.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/api/mlcontext/Script.java b/src/main/java/org/apache/sysml/api/mlcontext/Script.java index 65d3338..782f2c6 100644 --- a/src/main/java/org/apache/sysml/api/mlcontext/Script.java +++ b/src/main/java/org/apache/sysml/api/mlcontext/Script.java @@ -257,7 +257,7 @@ public class Script { * @return {@code this} Script object to allow chaining of methods */ public Script in(scala.collection.Seq<Object> inputs) { - List<Object> list = JavaConversions.asJavaList(inputs); + List<Object> list = JavaConversions.seqAsJavaList(inputs); for (Object obj : list) { if (obj instanceof Tuple3) { @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/95552604/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java index 4441105..1e58902 100644 --- a/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java +++ b/src/test/java/org/apache/sysml/test/integration/mlcontext/MLContextTest.java @@ -648,7 +648,7 @@ public class MLContextTest extends AutomatedTestBase { } }; - scala.collection.mutable.Map<String, Object> scalaMap = JavaConversions.asScalaMap(inputs); + scala.collection.mutable.Map<String, Object> scalaMap = JavaConversions.mapAsScalaMap(inputs); String s = "M = M + $X; print('sum: ' + sum(M));"; Script script = dml(s).in(scalaMap); @@ -673,7 +673,7 @@ public class MLContextTest extends AutomatedTestBase { } }; - scala.collection.mutable.Map<String, Object> scalaMap = JavaConversions.asScalaMap(inputs); + scala.collection.mutable.Map<String, Object> scalaMap = JavaConversions.mapAsScalaMap(inputs); String s = "M = M + $X\nprint('sum: ' + sum(M))"; Script script = pydml(s).in(scalaMap);
