From 0e4318b7476f936543dea6277dcce4d36d9c63cc Mon Sep 17 00:00:00 2001 From: Niketan Pansare Date: Tue, 19 Mar 2019 13:39:56 -0700 Subject: [PATCH 1/3] [SYSTEMML-2523] Update SystemML to Support Spark 2.3.0 Spark 2.3 (released on February 28, 2018) has updated the Antlr version from 4.3 to 4.7, which throws a warning every time we invoke SystemML. --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ad74276f567..413c31514c6 100644 --- a/pom.xml +++ b/pom.xml @@ -64,10 +64,10 @@ 2.7.7 - 4.5.3 - 2.1.0 - 2.11.8 - 2.11 + 4.7 + 2.3.0 + 2.12.4 + 2.12 2.2.6 yyyy-MM-dd HH:mm:ss z false From 1dc898226e36a988057f8828defc25235b628a8b Mon Sep 17 00:00:00 2001 From: Niketan Pansare Date: Tue, 19 Mar 2019 16:09:22 -0700 Subject: [PATCH 2/3] Fixed compilation issues --- pom.xml | 4 ++-- .../sysml/runtime/controlprogram/paramserv/SparkPSWorker.java | 2 +- .../runtime/controlprogram/paramserv/rpc/PSRpcFactory.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 413c31514c6..d13978ed11b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,8 +66,8 @@ 2.7.7 4.7 2.3.0 - 2.12.4 - 2.12 + 2.11.8 + 2.11 2.2.6 yyyy-MM-dd HH:mm:ss z false diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/paramserv/SparkPSWorker.java b/src/main/java/org/apache/sysml/runtime/controlprogram/paramserv/SparkPSWorker.java index bc8fc9e4e6f..6626b3a057e 100644 --- a/src/main/java/org/apache/sysml/runtime/controlprogram/paramserv/SparkPSWorker.java +++ b/src/main/java/org/apache/sysml/runtime/controlprogram/paramserv/SparkPSWorker.java @@ -88,7 +88,7 @@ public void call(Tuple2> input) throws call(); // Launch the worker } - private void configureWorker(Tuple2> input) throws IOException { + private void configureWorker(Tuple2> input) throws IOException, InterruptedException { _workerID = input._1; // Initialize codegen class cache (before program parsing) diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/paramserv/rpc/PSRpcFactory.java b/src/main/java/org/apache/sysml/runtime/controlprogram/paramserv/rpc/PSRpcFactory.java index a7db756c97c..049b159ae65 100644 --- a/src/main/java/org/apache/sysml/runtime/controlprogram/paramserv/rpc/PSRpcFactory.java +++ b/src/main/java/org/apache/sysml/runtime/controlprogram/paramserv/rpc/PSRpcFactory.java @@ -50,7 +50,7 @@ public static TransportServer createServer(SparkConf conf, LocalParamServer ps, return context.createServer(host, 0, Collections.emptyList()); // bind rpc to an ephemeral port } - public static SparkPSProxy createSparkPSProxy(SparkConf conf, int port, LongAccumulator aRPC) throws IOException { + public static SparkPSProxy createSparkPSProxy(SparkConf conf, int port, LongAccumulator aRPC) throws IOException, InterruptedException { long rpcTimeout = conf.contains("spark.rpc.askTimeout") ? conf.getTimeAsMs("spark.rpc.askTimeout") : conf.getTimeAsMs("spark.network.timeout", "120s"); From d4d800e58d0f86ea48f9b25b4829a8873eb26bc1 Mon Sep 17 00:00:00 2001 From: Niketan Pansare Date: Wed, 20 Mar 2019 08:59:44 -0700 Subject: [PATCH 3/3] update the documentation --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 81177355dfb..e688264324e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -36,7 +36,7 @@ to find out how to help make SystemML even better! To download SystemML, visit the [downloads](http://systemml.apache.org/download) page. -This version of SystemML supports: Java 8+, Scala 2.11+, Python 2.7/3.5+, Hadoop 2.6+, and Spark 2.1+. +This version of SystemML supports: Java 8+, Scala 2.11+, Python 2.7/3.5+, Hadoop 2.6+, and Spark 2.3+. ## Running SystemML