Repository: systemml Updated Branches: refs/heads/master a62b65c8f -> 72fd8fda3
[SYSTEMML-445] Upgraded CUDA and CuDNN version Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/72fd8fda Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/72fd8fda Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/72fd8fda Branch: refs/heads/master Commit: 72fd8fda39062c9059e60d054f263ea1d92bf517 Parents: a62b65c Author: Niketan Pansare <npan...@us.ibm.com> Authored: Wed May 30 14:47:36 2018 -0700 Committer: Niketan Pansare <npan...@us.ibm.com> Committed: Wed May 30 14:47:36 2018 -0700 ---------------------------------------------------------------------- pom.xml | 4 +++- .../runtime/matrix/data/LibMatrixCuDNNConvolutionAlgorithm.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/72fd8fda/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 57754af..abc61ac 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss z</maven.build.timestamp.format> <enableGPU>false</enableGPU> <jcuda.scope>provided</jcuda.scope> - <jcuda.version>0.8.0</jcuda.version> + <jcuda.version>0.9.0d</jcuda.version> <!-- OS-specific JVM arguments for running integration tests --> <integrationTestExtraJVMArgs /> </properties> @@ -1401,6 +1401,7 @@ <scope>${jcuda.scope}</scope> </dependency> + <!-- Commented until the PowerPC jcuda libraries are deployed for 0.9.0 version <dependency> <groupId>org.jcuda</groupId> <artifactId>jcuda-natives</artifactId> @@ -1436,6 +1437,7 @@ <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> + --> <dependency> <groupId>org.apache.spark</groupId> http://git-wip-us.apache.org/repos/asf/systemml/blob/72fd8fda/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCuDNNConvolutionAlgorithm.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCuDNNConvolutionAlgorithm.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCuDNNConvolutionAlgorithm.java index 574e332..a50dbc3 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCuDNNConvolutionAlgorithm.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixCuDNNConvolutionAlgorithm.java @@ -273,7 +273,7 @@ public class LibMatrixCuDNNConvolutionAlgorithm implements java.lang.AutoCloseab private static cudnnConvolutionDescriptor allocateConvolutionDescriptor(int padding [], int strides []) { cudnnConvolutionDescriptor convDesc = new cudnnConvolutionDescriptor(); cudnnCreateConvolutionDescriptor(convDesc); - cudnnSetConvolution2dDescriptor(convDesc, padding[0], padding[1], strides[0], strides[1], 1, 1, CUDNN_CROSS_CORRELATION); + cudnnSetConvolution2dDescriptor(convDesc, padding[0], padding[1], strides[0], strides[1], 1, 1, CUDNN_CROSS_CORRELATION, LibMatrixCUDA.CUDNN_DATA_TYPE); return convDesc; } }
