Repository: incubator-systemml Updated Branches: refs/heads/master ca4e2600e -> 100075046
[MINOR] Cleanups (missing imports, unnecessary tags, fix max blocks) Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/696d10b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/696d10b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/696d10b5 Branch: refs/heads/master Commit: 696d10b5ae05704918c4fca76ef6d3fb635ec228 Parents: ca4e260 Author: Matthias Boehm <[email protected]> Authored: Sun Feb 12 01:14:16 2017 +0100 Committer: Matthias Boehm <[email protected]> Committed: Sun Feb 12 01:14:16 2017 +0100 ---------------------------------------------------------------------- .../controlprogram/context/SparkExecutionContext.java | 2 +- .../sysml/runtime/instructions/spark/SPInstruction.java | 2 -- .../apache/sysml/runtime/matrix/data/LibMatrixCUDA.java | 11 ++--------- .../test/integration/functions/mlcontext/GNMFTest.java | 1 - 4 files changed, 3 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/696d10b5/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java index bbc9fb3..d1e521a 100644 --- a/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java +++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java @@ -1292,7 +1292,7 @@ public class SparkExecutionContext extends ExecutionContext // The most expensive operation here is rdd.toDebugString() which can be a major hit because // of unrolling lazy evaluation of Spark. Hence, it is guarded against it along with flag 'PRINT_EXPLAIN_WITH_LINEAGE' which is // enabled only through MLContext. This way, it doesnot affect our performance evaluation through non-MLContext path - @SuppressWarnings("deprecation") + @SuppressWarnings("unused") private void setLineageInfoForExplain(SPInstruction inst, JavaPairRDD<?, ?> out, JavaPairRDD<?, ?> in1, String in1Name, http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/696d10b5/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java index 5660cb3..8f866af 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java @@ -74,7 +74,6 @@ public abstract class SPInstruction extends Instruction return getOpcode(); } - @SuppressWarnings("deprecation") @Override public Instruction preprocessInstruction(ExecutionContext ec) throws DMLRuntimeException @@ -97,7 +96,6 @@ public abstract class SPInstruction extends Instruction public abstract void processInstruction(ExecutionContext ec) throws DMLRuntimeException; - @SuppressWarnings("deprecation") @Override public void postprocessInstruction(ExecutionContext ec) throws DMLRuntimeException http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/696d10b5/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCUDA.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCUDA.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCUDA.java index 9d3220b..c10d0bf 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCUDA.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCUDA.java @@ -84,8 +84,6 @@ import jcuda.jcudnn.cudnnTensorDescriptor; import jcuda.jcusparse.JCusparse; import jcuda.jcusparse.cusparseHandle; -import java.util.Vector; - //FIXME move could to respective instructions, this is not a block library public class LibMatrixCUDA { @@ -992,12 +990,6 @@ public class LibMatrixCUDA { //**************** UNARY AGGREGATE Functions ************************/ //********************************************************************/ - /** - * Direction of reduction for aggregate binary operations - */ - private enum ReductionDirection{ - ALL, ROW, COL, DIAG; - }; /** * Entry point to perform Unary aggregate operations on the GPU. @@ -1436,7 +1428,7 @@ public class LibMatrixCUDA { final int MAX_BLOCKS = getMaxBlocks(); final int WARP_SIZE = getWarpSize(); int threads = Math.min(cols, MAX_THREADS); - int blocks = cols/MAX_THREADS; + int blocks = Math.min(cols/MAX_THREADS, MAX_BLOCKS); if (cols % MAX_THREADS != 0) blocks++; int sharedMemSize = threads * Sizeof.DOUBLE; if (threads <= WARP_SIZE){ @@ -2232,6 +2224,7 @@ public class LibMatrixCUDA { * @param rlen row length * @param clen column length */ + @SuppressWarnings("unused") private static void debugPrintMatrix(Pointer in, int rlen, int clen){ double[] data = new double[rlen * clen]; cudaMemcpy(Pointer.to(data), in, rlen*clen*Sizeof.DOUBLE, cudaMemcpyDeviceToHost); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/696d10b5/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java index 99ab53b..a826443 100644 --- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java +++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java @@ -64,7 +64,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@SuppressWarnings("deprecation") @RunWith(value = Parameterized.class) public class GNMFTest extends AutomatedTestBase {
