You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemds.apache.org by ma...@apache.org on 2020/11/16 23:56:45 UTC
[systemds] branch master updated (b350c04 -> a82c21a)
This is an automated email from the ASF dual-hosted git repository.
markd pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git.
from b350c04 [SYSTEMDS-2725] NNZ counting for native blas
new 981b1e5 [MINOR] Fix R execution on Windows when using R version 4.0
new a82c21a [MINOR] Cuda code template classes package rename cpp->cuda
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/sysds/hops/codegen/cplan/CNode.java | 8 ++++----
.../sysds/hops/codegen/cplan/{cpp => cuda}/Binary.java | 2 +-
.../sysds/hops/codegen/cplan/{cpp => cuda}/CellWise.java | 2 +-
.../sysds/hops/codegen/cplan/{cpp => cuda}/Ternary.java | 2 +-
.../sysds/hops/codegen/cplan/{cpp => cuda}/Unary.java | 2 +-
.../java/org/apache/sysds/test/AutomatedTestBase.java | 16 +++++++++++-----
6 files changed, 19 insertions(+), 13 deletions(-)
rename src/main/java/org/apache/sysds/hops/codegen/cplan/{cpp => cuda}/Binary.java (99%)
rename src/main/java/org/apache/sysds/hops/codegen/cplan/{cpp => cuda}/CellWise.java (98%)
rename src/main/java/org/apache/sysds/hops/codegen/cplan/{cpp => cuda}/Ternary.java (98%)
rename src/main/java/org/apache/sysds/hops/codegen/cplan/{cpp => cuda}/Unary.java (99%)
[systemds] 01/02: [MINOR] Fix R execution on Windows when using R
version 4.0
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
commit 981b1e5b6832a9680effb88900550025f2221acf
Author: Mark Dokter <ma...@dokter.cc>
AuthorDate: Tue Nov 17 00:41:38 2020 +0100
[MINOR] Fix R execution on Windows when using R version 4.0
---
.../java/org/apache/sysds/test/AutomatedTestBase.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
index 1e62975..3ae6eea 100644
--- a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
@@ -1040,11 +1040,7 @@ public abstract class AutomatedTestBase {
"Rscript --default-packages=methods,datasets,graphics,grDevices,stats,utils");
// *** END HACK ***
}
-
- if(System.getProperty("os.name").contains("Windows")) {
- cmd = cmd.replace('/', '\\');
- executionFile = executionFile.replace('/', '\\');
- }
+
if(DEBUG) {
if(!newWay) { // not sure why have this condition
TestUtils.printRScript(executionFile);
@@ -1075,6 +1071,16 @@ public abstract class AutomatedTestBase {
String outputR;
String errorString;
try {
+ // if R < 4.0 on Windows is used, the file separator needs to be Windows style
+ if(System.getProperty("os.name").contains("Windows")) {
+ Process r_ver_cmd = Runtime.getRuntime().exec("RScript --version");
+ String r_ver = IOUtils.toString(r_ver_cmd.getErrorStream());
+ if(!r_ver.contains("4.0")) {
+ cmd = cmd.replace('/', '\\');
+ executionFile = executionFile.replace('/', '\\');
+ }
+ }
+
long t0 = System.nanoTime();
if(LOG.isInfoEnabled()) {
LOG.info("starting R script");
[systemds] 02/02: [MINOR] Cuda code template classes package rename
cpp->cuda
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
commit a82c21a25ff8c746b73af1a90b696cadd67d0aed
Author: Mark Dokter <ma...@dokter.cc>
AuthorDate: Tue Nov 17 00:53:41 2020 +0100
[MINOR] Cuda code template classes package rename cpp->cuda
---
src/main/java/org/apache/sysds/hops/codegen/cplan/CNode.java | 8 ++++----
.../org/apache/sysds/hops/codegen/cplan/{cpp => cuda}/Binary.java | 2 +-
.../apache/sysds/hops/codegen/cplan/{cpp => cuda}/CellWise.java | 2 +-
.../apache/sysds/hops/codegen/cplan/{cpp => cuda}/Ternary.java | 2 +-
.../org/apache/sysds/hops/codegen/cplan/{cpp => cuda}/Unary.java | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNode.java b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNode.java
index 07abcce..6cdd225 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/CNode.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/CNode.java
@@ -237,13 +237,13 @@ public abstract class CNode
switch (api) {
case CUDA:
if(caller instanceof CNodeCell)
- return new org.apache.sysds.hops.codegen.cplan.cpp.CellWise();
+ return new org.apache.sysds.hops.codegen.cplan.cuda.CellWise();
else if (caller instanceof CNodeUnary)
- return new org.apache.sysds.hops.codegen.cplan.cpp.Unary();
+ return new org.apache.sysds.hops.codegen.cplan.cuda.Unary();
else if (caller instanceof CNodeBinary)
- return new org.apache.sysds.hops.codegen.cplan.cpp.Binary();
+ return new org.apache.sysds.hops.codegen.cplan.cuda.Binary();
else if (caller instanceof CNodeTernary)
- return new org.apache.sysds.hops.codegen.cplan.cpp.Ternary();
+ return new org.apache.sysds.hops.codegen.cplan.cuda.Ternary();
else
return null;
case JAVA:
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Binary.java b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Binary.java
similarity index 99%
rename from src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Binary.java
rename to src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Binary.java
index 287a884..0365afd 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Binary.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Binary.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.hops.codegen.cplan.cpp;
+package org.apache.sysds.hops.codegen.cplan.cuda;
import org.apache.sysds.hops.codegen.cplan.CNodeBinary;
import org.apache.sysds.hops.codegen.cplan.CNodeTernary;
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/CellWise.java b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/CellWise.java
similarity index 98%
rename from src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/CellWise.java
rename to src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/CellWise.java
index 7c14a40..beb2398 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/CellWise.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/CellWise.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.hops.codegen.cplan.cpp;
+package org.apache.sysds.hops.codegen.cplan.cuda;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Ternary.java b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Ternary.java
similarity index 98%
rename from src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Ternary.java
rename to src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Ternary.java
index ccce19b..355e579 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Ternary.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Ternary.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.hops.codegen.cplan.cpp;
+package org.apache.sysds.hops.codegen.cplan.cuda;
import org.apache.sysds.hops.codegen.cplan.CNodeBinary;
import org.apache.sysds.hops.codegen.cplan.CNodeTernary;
diff --git a/src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Unary.java b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Unary.java
similarity index 99%
rename from src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Unary.java
rename to src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Unary.java
index d50e4b0..0b5852d 100644
--- a/src/main/java/org/apache/sysds/hops/codegen/cplan/cpp/Unary.java
+++ b/src/main/java/org/apache/sysds/hops/codegen/cplan/cuda/Unary.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.hops.codegen.cplan.cpp;
+package org.apache.sysds.hops.codegen.cplan.cuda;
import org.apache.commons.lang.StringUtils;
import org.apache.sysds.hops.codegen.cplan.CNodeBinary;