[MINOR] Cleanups of mlcontext testsuite and gpu javadoc warnings Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/feb1cb72 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/feb1cb72 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/feb1cb72
Branch: refs/heads/master Commit: feb1cb72dfc742ff7f181f1025d217d9efdf51b5 Parents: 442b9a5 Author: Matthias Boehm <[email protected]> Authored: Thu Mar 9 17:45:56 2017 -0800 Committer: Matthias Boehm <[email protected]> Committed: Thu Mar 9 17:45:56 2017 -0800 ---------------------------------------------------------------------- .../sysml/runtime/instructions/gpu/context/GPUObject.java | 4 ++-- .../runtime/instructions/gpu/context/JCudaObject.java | 10 +++++----- .../sysml/test/integration/mlcontext/ZPackageSuite.java | 9 +++++---- 3 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/feb1cb72/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/GPUObject.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/GPUObject.java b/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/GPUObject.java index de1459e..366713f 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/GPUObject.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/GPUObject.java @@ -58,7 +58,7 @@ public abstract class GPUObject /** * Signal intent that a matrix block will be read (as input) on the GPU * @return true if a host memory to device memory transfer happened - * @throws DMLRuntimeException + * @throws DMLRuntimeException ? */ public abstract boolean acquireDeviceRead() throws DMLRuntimeException; /** @@ -84,7 +84,7 @@ public abstract class GPUObject /** * Signal intent that a block needs to be read on the host * @return true if copied from device to host - * @throws CacheException + * @throws CacheException ? */ public abstract boolean acquireHostRead() throws CacheException; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/feb1cb72/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/JCudaObject.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/JCudaObject.java b/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/JCudaObject.java index 74b5050..c256be3 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/JCudaObject.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/JCudaObject.java @@ -242,7 +242,7 @@ public class JCudaObject extends GPUObject { * @param handle a valid {@link cusparseHandle} * @param C Output matrix * @param rowsC number of rows in C - * @throws DMLRuntimeException + * @throws DMLRuntimeException ? */ private static void step1AllocateRowPointers(cusparseHandle handle, CSRPointer C, int rowsC) throws DMLRuntimeException { cusparseSetPointerMode(handle, cusparsePointerMode.CUSPARSE_POINTER_MODE_HOST); @@ -261,7 +261,7 @@ public class JCudaObject extends GPUObject { * @param C Output Sparse Matrix C on GPU * @param m Rows in C * @param n Columns in C - * @throws DMLRuntimeException + * @throws DMLRuntimeException ? */ private static void step2GatherNNZGeam(cusparseHandle handle, CSRPointer A, CSRPointer B, CSRPointer C, int m, int n) throws DMLRuntimeException { int[] CnnzArray = { -1 }; @@ -293,7 +293,7 @@ public class JCudaObject extends GPUObject { * @param m Number of rows of sparse matrix op ( A ) and C * @param n Number of columns of sparse matrix op ( B ) and C * @param k Number of columns/rows of sparse matrix op ( A ) / op ( B ) - * @throws DMLRuntimeException + * @throws DMLRuntimeException ? */ private static void step2GatherNNZGemm(cusparseHandle handle, CSRPointer A, int transA, CSRPointer B, int transB, CSRPointer C, int m, int n, int k) throws DMLRuntimeException { int[] CnnzArray = { -1 }; @@ -321,7 +321,7 @@ public class JCudaObject extends GPUObject { * * @param handle a valid {@link cusparseHandle} * @param C Output sparse matrix on GPU - * @throws DMLRuntimeException + * @throws DMLRuntimeException ? */ private static void step3AllocateValNInd(cusparseHandle handle, CSRPointer C) throws DMLRuntimeException { // Increment cudaCount by one when all three arrays of CSR sparse array are allocated @@ -1074,7 +1074,7 @@ public class JCudaObject extends GPUObject { * Convert sparse to dense (Performs transpose, use sparseToColumnMajorDense if the kernel can deal with column major format) * Also records per instruction invokation of sparseToDense. * @param instructionName Name of the instruction for which statistics are recorded in {@link GPUStatistics} - * @throws DMLRuntimeException + * @throws DMLRuntimeException ? */ public void sparseToDense(String instructionName) throws DMLRuntimeException { long start = System.nanoTime(); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/feb1cb72/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java ---------------------------------------------------------------------- diff --git a/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java index 9bb1a55..44f3533 100644 --- a/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java +++ b/src/test_suites/java/org/apache/sysml/test/integration/mlcontext/ZPackageSuite.java @@ -27,10 +27,11 @@ import org.junit.runners.Suite; * they should not be run in parallel. */ @RunWith(Suite.class) @Suite.SuiteClasses({ - org.apache.sysml.test.integration.mlcontext.MLContextFrameTest.class, - org.apache.sysml.test.integration.mlcontext.MLContextMultipleScriptsTest.class, - org.apache.sysml.test.integration.mlcontext.MLContextScratchCleanupTest.class, - org.apache.sysml.test.integration.mlcontext.MLContextTest.class + MLContextFrameTest.class, + MLContextMultipleScriptsTest.class, + MLContextParforDatasetTest.class, + MLContextScratchCleanupTest.class, + MLContextTest.class })
