Repository: incubator-systemml Updated Branches: refs/heads/master 1c4e9de4e -> 3fc2bce2e
[HOTFIX] Fixes for RAT checks which fail as a result of SYSTEMML-1038 Closes #323. Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/3fc2bce2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/3fc2bce2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/3fc2bce2 Branch: refs/heads/master Commit: 3fc2bce2ed612bdcbbf7e2a81c09ad13fc3dc9e7 Parents: 1c4e9de Author: Nakul Jindal <[email protected]> Authored: Tue Dec 20 17:23:29 2016 -0800 Committer: Deron Eriksson <[email protected]> Committed: Tue Dec 20 17:23:29 2016 -0800 ---------------------------------------------------------------------- pom.xml | 2 ++ .../context/AggregateUnaryGPUInstruction.java | 19 +++++++++++++++++++ .../gpu/context/ExecutionConfig.java | 6 +++--- .../sysml/runtime/matrix/data/LibMatrixCUDA.java | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/3fc2bce2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 209a4bb..586efe3 100644 --- a/pom.xml +++ b/pom.xml @@ -681,6 +681,8 @@ <exclude>src/main/java/*.tokens</exclude> <!-- Generated python files --> <exclude>src/main/python/systemml.egg-info/**</exclude> + <!-- Compiled ptx file from nvcc --> + <exclude>src/main/cpp/kernels/SystemML.ptx</exclude> <!-- Test Validation files --> <exclude>src/test/scripts/functions/external/kMeans/kMeansWrapperOutput</exclude> <exclude>src/test/scripts/functions/external/kMeans2/kMeansWrapperOutput1</exclude> http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/3fc2bce2/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/AggregateUnaryGPUInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/AggregateUnaryGPUInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/AggregateUnaryGPUInstruction.java index 04221f6..c506b64 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/AggregateUnaryGPUInstruction.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/AggregateUnaryGPUInstruction.java @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.sysml.runtime.instructions.gpu.context; import org.apache.sysml.runtime.DMLRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/3fc2bce2/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/ExecutionConfig.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/ExecutionConfig.java b/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/ExecutionConfig.java index ae41bc3..ce5c5ff 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/ExecutionConfig.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/gpu/context/ExecutionConfig.java @@ -47,9 +47,9 @@ public class ExecutionConfig { /** * Convenience constructor for setting the number of blocks, number of threads and the * shared memory size - * @param gridDimX - * @param blockDimX - * @param sharedMemBytes + * @param gridDimX Number of blocks (for CUDA Kernel) + * @param blockDimX Number of threads per block (for CUDA Kernel) + * @param sharedMemBytes Amount of Shared memory (for CUDA Kernel) */ public ExecutionConfig(int gridDimX, int blockDimX, int sharedMemBytes) { this.gridDimX = gridDimX; http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/3fc2bce2/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 c0e6d4f..5426a30 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 @@ -915,7 +915,7 @@ public class LibMatrixCUDA { * @param in1 input matrix * @param output output matrix/scalar name * @param op Instance of {@link AggregateUnaryOperator} which encapsulates the direction of reduction/aggregation and the reduction operation. - * @throws DMLRuntimeException + * @throws DMLRuntimeException if {@link DMLRuntimeException} occurs */ public static void unaryAggregate(ExecutionContext ec, MatrixObject in1, String output, AggregateUnaryOperator op) throws DMLRuntimeException {
