You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemds.apache.org by mb...@apache.org on 2021/03/25 21:57:17 UTC

[systemds] branch master updated: [MINOR] Cleanup repo (warnings, compression config, native libs)

This is an automated email from the ASF dual-hosted git repository.

mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/master by this push:
     new 9c7a08d  [MINOR] Cleanup repo (warnings, compression config, native libs)
9c7a08d is described below

commit 9c7a08dfdbec8a400a378e539dccf295087f7896
Author: Matthias Boehm <mb...@gmail.com>
AuthorDate: Thu Mar 25 22:53:46 2021 +0100

    [MINOR] Cleanup repo (warnings, compression config, native libs)
---
 conf/SystemDS-config.xml.template                             |  2 +-
 src/main/java/org/apache/sysds/conf/DMLConfig.java            |  2 +-
 .../org/apache/sysds/runtime/matrix/data/LibMatrixNative.java | 11 +++++------
 .../runtime/transform/encode/ColumnEncoderDummycode.java      |  1 -
 .../functions/transform/TransformApplyEmptyRecodeMapTest.java |  1 -
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/conf/SystemDS-config.xml.template b/conf/SystemDS-config.xml.template
index 3f5c1db..b516161 100644
--- a/conf/SystemDS-config.xml.template
+++ b/conf/SystemDS-config.xml.template
@@ -37,7 +37,7 @@
     <sysds.cp.parallel.io>true</sysds.cp.parallel.io>
     
     <!-- enables compressed linear algebra, experimental feature -->
-    <sysds.compressed.linalg>auto</sysds.compressed.linalg>
+    <sysds.compressed.linalg>false</sysds.compressed.linalg>
     
     <!-- enables operator fusion via code generation, experimental feature -->
     <sysds.codegen.enabled>false</sysds.codegen.enabled>
diff --git a/src/main/java/org/apache/sysds/conf/DMLConfig.java b/src/main/java/org/apache/sysds/conf/DMLConfig.java
index 5f90fb4..bf1767b 100644
--- a/src/main/java/org/apache/sysds/conf/DMLConfig.java
+++ b/src/main/java/org/apache/sysds/conf/DMLConfig.java
@@ -132,7 +132,7 @@ public class DMLConfig
 		_defaultVals.put(COMPRESSED_COCODE,      "COST");
 		_defaultVals.put(COMPRESSED_TRANSPOSE,   "auto");
 		_defaultVals.put(CODEGEN,                "false" );
-		_defaultVals.put(CODEGEN_API,		     GeneratorAPI.JAVA.name() );
+		_defaultVals.put(CODEGEN_API,            GeneratorAPI.JAVA.name() );
 		_defaultVals.put(CODEGEN_COMPILER,       CompilerType.AUTO.name() );
 		_defaultVals.put(CODEGEN_OPTIMIZER,      PlanSelector.FUSE_COST_BASED_V2.name() );
 		_defaultVals.put(CODEGEN_PLANCACHE,      "true" );
diff --git a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixNative.java b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixNative.java
index f6f24c4..9a55111 100644
--- a/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixNative.java
+++ b/src/main/java/org/apache/sysds/runtime/matrix/data/LibMatrixNative.java
@@ -84,7 +84,7 @@ public class LibMatrixNative
 			&& m1.getDenseBlock().isContiguous() && m2.getDenseBlock().isContiguous() //contiguous but not allocated
 			&& 8L * ret.getLength() < Integer.MAX_VALUE;
 
-		if( NativeHelper.isNativeLibraryLoaded() &&  isValidForNative ) 
+		if( NativeHelper.isNativeLibraryLoaded() && isValidForNative ) 
 		{
 			ret.sparse = false;
 			ret.allocateDenseBlock();
@@ -116,12 +116,11 @@ public class LibMatrixNative
 			//else record failure and fallback to java
 			Statistics.incrementNativeFailuresCounter();
 			LOG.warn("matrixMult: Native mat mult failed. Falling back to java version ("
-				+ "loaded=" + NativeHelper.isNativeLibraryLoaded() 
-				+ ", sparse=" + (m1.isInSparseFormat() | m2.isInSparseFormat()) + ")");	
+				+ "loaded=" + NativeHelper.isNativeLibraryLoaded()
+				+ ", sparse=" + (m1.isInSparseFormat() | m2.isInSparseFormat()) + ")");
 		}
-
-		if(isValidForNative)
-			LOG.debug("Was valid for native MM but native lib was not loaded");
+		else if(isValidForNative)
+			LOG.warn("Was valid for native MM but native lib was not loaded");
 		
 		if (k == 1)
 			LibMatrixMult.matrixMult(m1, m2, ret, !examSparsity);
diff --git a/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderDummycode.java b/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderDummycode.java
index 83fdf18..5fc2883 100644
--- a/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderDummycode.java
+++ b/src/main/java/org/apache/sysds/runtime/transform/encode/ColumnEncoderDummycode.java
@@ -60,7 +60,6 @@ public class ColumnEncoderDummycode extends ColumnEncoder {
 	public MatrixBlock apply(MatrixBlock in, MatrixBlock out, int outputCol) {
 		// Out Matrix should already be correct size!
 		// append dummy coded or unchanged values to output
-		final int clen = in.getNumColumns();
 		for(int i = 0; i < in.getNumRows(); i++) {
 			// Using outputCol here as index since we have a MatrixBlock as input where dummycoding could have been
 			// applied in a previous encoder
diff --git a/src/test/java/org/apache/sysds/test/functions/transform/TransformApplyEmptyRecodeMapTest.java b/src/test/java/org/apache/sysds/test/functions/transform/TransformApplyEmptyRecodeMapTest.java
index e0029c6..a795a54 100644
--- a/src/test/java/org/apache/sysds/test/functions/transform/TransformApplyEmptyRecodeMapTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/transform/TransformApplyEmptyRecodeMapTest.java
@@ -26,7 +26,6 @@ import org.apache.sysds.common.Types.ValueType;
 import org.apache.sysds.runtime.DMLRuntimeException;
 import org.apache.sysds.runtime.matrix.data.FrameBlock;
 import org.apache.sysds.runtime.matrix.data.MatrixBlock;
-import org.apache.sysds.runtime.transform.encode.ColumnEncoder;
 import org.apache.sysds.runtime.transform.encode.EncoderFactory;
 import org.apache.sysds.runtime.util.DataConverter;
 import org.apache.sysds.test.AutomatedTestBase;