Repository: systemml Updated Branches: refs/heads/master c9739d788 -> 3c519e739
[SYSTEMML-445] Bugfix for compilation error on Mac OS and PowerPC arch. Closes #775. Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/3c519e73 Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/3c519e73 Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/3c519e73 Branch: refs/heads/master Commit: 3c519e73915d735b397b8afdb74c329d6363f18f Parents: c9739d7 Author: Niketan Pansare <[email protected]> Authored: Thu May 31 16:53:25 2018 -0700 Committer: Niketan Pansare <[email protected]> Committed: Thu May 31 16:54:30 2018 -0700 ---------------------------------------------------------------------- pom.xml | 83 ++++++++++++++------ src/assembly/extra/LICENSE | 32 ++++---- .../java/org/apache/sysml/conf/DMLConfig.java | 1 + 3 files changed, 77 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/3c519e73/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index abc61ac..8a25b9a 100644 --- a/pom.xml +++ b/pom.xml @@ -1266,174 +1266,211 @@ <artifactId>jcuda</artifactId> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> + <exclusions> + <exclusion> + <!-- always exclude recursive fetching of native libraries --> + <groupId>org.jcuda</groupId> + <artifactId>jcuda-natives</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcublas</artifactId> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> + <exclusions> + <exclusion> + <!-- always exclude recursive fetching of native libraries --> + <groupId>org.jcuda</groupId> + <artifactId>jcublas-natives</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusparse</artifactId> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> + <exclusions> + <exclusion> + <!-- always exclude recursive fetching of native libraries --> + <groupId>org.jcuda</groupId> + <artifactId>jcusparse-natives</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusolver</artifactId> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> + <exclusions> + <exclusion> + <!-- always exclude recursive fetching of native libraries --> + <groupId>org.jcuda</groupId> + <artifactId>jcusolver-natives</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcudnn</artifactId> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> + <exclusions> + <exclusion> + <!-- always exclude recursive fetching of native libraries --> + <groupId>org.jcuda</groupId> + <artifactId>jcudnn-natives</artifactId> + </exclusion> + </exclusions> </dependency> + <!-- for all platforms, to be included in the extra jar --> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcuda-natives</artifactId> - <classifier>${jcuda.os}-${jcuda.arch}</classifier> + <classifier>windows-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcublas-natives</artifactId> - <classifier>${jcuda.os}-${jcuda.arch}</classifier> + <classifier>windows-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusparse-natives</artifactId> - <classifier>${jcuda.os}-${jcuda.arch}</classifier> + <classifier>windows-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusolver-natives</artifactId> - <classifier>${jcuda.os}-${jcuda.arch}</classifier> + <classifier>windows-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcudnn-natives</artifactId> - <classifier>${jcuda.os}-${jcuda.arch}</classifier> + <classifier>windows-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> - <!-- for all platforms, to be included in the extra jar --> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcuda-natives</artifactId> - <classifier>windows-x86_64</classifier> + <classifier>linux-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcublas-natives</artifactId> - <classifier>windows-x86_64</classifier> + <classifier>linux-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusparse-natives</artifactId> - <classifier>windows-x86_64</classifier> + <classifier>linux-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusolver-natives</artifactId> - <classifier>windows-x86_64</classifier> + <classifier>linux-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcudnn-natives</artifactId> - <classifier>windows-x86_64</classifier> + <classifier>linux-x86_64</classifier> <version>${jcuda.version}</version> <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> - <classifier>linux-x86_64</classifier> + <classifier>linux-ppc_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcublas-natives</artifactId> - <classifier>linux-x86_64</classifier> + <classifier>linux-ppc_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusparse-natives</artifactId> - <classifier>linux-x86_64</classifier> + <classifier>linux-ppc_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusolver-natives</artifactId> - <classifier>linux-x86_64</classifier> + <classifier>linux-ppc_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcudnn-natives</artifactId> - <classifier>linux-x86_64</classifier> + <classifier>linux-ppc_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> - - <!-- Commented until the PowerPC jcuda libraries are deployed for 0.9.0 version + --> + + <!-- Commented until the MacOS jcuda libraries are deployed for 0.9.0 version <dependency> <groupId>org.jcuda</groupId> <artifactId>jcuda-natives</artifactId> - <classifier>linux-ppc_64</classifier> + <classifier>apple-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcublas-natives</artifactId> - <classifier>linux-ppc_64</classifier> + <classifier>apple-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusparse-natives</artifactId> - <classifier>linux-ppc_64</classifier> + <classifier>apple-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcusolver-natives</artifactId> - <classifier>linux-ppc_64</classifier> + <classifier>apple-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> <dependency> <groupId>org.jcuda</groupId> <artifactId>jcudnn-natives</artifactId> - <classifier>linux-ppc_64</classifier> + <classifier>apple-x86_64</classifier> <version>${jcuda.version}</version> <scope>${jcuda.scope}</scope> </dependency> http://git-wip-us.apache.org/repos/asf/systemml/blob/3c519e73/src/assembly/extra/LICENSE ---------------------------------------------------------------------- diff --git a/src/assembly/extra/LICENSE b/src/assembly/extra/LICENSE index e08b593..417236f 100644 --- a/src/assembly/extra/LICENSE +++ b/src/assembly/extra/LICENSE @@ -257,22 +257,22 @@ The following compile-scope dependencies come under the MIT License JCuda (jcuda.org) -org.jcuda:jcuda:0.8.0 -org.jcuda:jcublas:0.8.0 -org.jcuda:jcufft:0.8.0 -org.jcuda:jcusparse:0.8.0 -org.jcuda:jcusolver:0.8.0 -org.jcuda:jcurand:0.8.0 -org.jcuda:jnvgraph:0.8.0 -org.jcuda:jcudnn:0.8.0 -org.jcuda:jcuda-natives:0.8.0 -org.jcuda:jcublas-natives:0.8.0 -org.jcuda:jcufft-natives:0.8.0 -org.jcuda:jcusparse-natives:0.8.0 -org.jcuda:jcusolver-natives:0.8.0 -org.jcuda:jcurand-natives:0.8.0 -org.jcuda:jnvgraph-natives:0.8.0 -org.jcuda:jcudnn-natives:0.8.0 +org.jcuda:jcuda:0.9.0 +org.jcuda:jcublas:0.9.0 +org.jcuda:jcufft:0.9.0 +org.jcuda:jcusparse:0.9.0 +org.jcuda:jcusolver:0.9.0 +org.jcuda:jcurand:0.9.0 +org.jcuda:jnvgraph:0.9.0 +org.jcuda:jcudnn:0.9.0 +org.jcuda:jcuda-natives:0.9.0 +org.jcuda:jcublas-natives:0.9.0 +org.jcuda:jcufft-natives:0.9.0 +org.jcuda:jcusparse-natives:0.9.0 +org.jcuda:jcusolver-natives:0.9.0 +org.jcuda:jcurand-natives:0.9.0 +org.jcuda:jnvgraph-natives:0.9.0 +org.jcuda:jcudnn-natives:0.9.0 The MIT License (MIT) http://git-wip-us.apache.org/repos/asf/systemml/blob/3c519e73/src/main/java/org/apache/sysml/conf/DMLConfig.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/conf/DMLConfig.java b/src/main/java/org/apache/sysml/conf/DMLConfig.java index 7279c57..0a896a3 100644 --- a/src/main/java/org/apache/sysml/conf/DMLConfig.java +++ b/src/main/java/org/apache/sysml/conf/DMLConfig.java @@ -144,6 +144,7 @@ public class DMLConfig _defaultVals.put(SYNCHRONIZE_GPU, "true" ); _defaultVals.put(EAGER_CUDA_FREE, "false" ); _defaultVals.put(FLOATING_POINT_PRECISION, "double" ); + _defaultVals.put(PRINT_GPU_MEMORY_INFO, "false"); } public DMLConfig() {
