You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by na...@apache.org on 2017/09/07 21:43:30 UTC
systemml git commit: [SYSTEMML-1895] jcuda for windows & linux
(x86_64, ppc64le) are included in extra jar
Repository: systemml
Updated Branches:
refs/heads/master 137fbf18a -> c00029a7b
[SYSTEMML-1895] jcuda for windows & linux (x86_64, ppc64le) are included in extra jar
Closes #656
Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/c00029a7
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/c00029a7
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/c00029a7
Branch: refs/heads/master
Commit: c00029a7be735dcaba533c50ba69169b18ef1675
Parents: 137fbf1
Author: Nakul Jindal <na...@gmail.com>
Authored: Thu Sep 7 14:42:12 2017 -0700
Committer: Nakul Jindal <na...@gmail.com>
Committed: Thu Sep 7 14:42:12 2017 -0700
----------------------------------------------------------------------
pom.xml | 106 ++++++++++++++++++++++++++++++++++++--------
src/assembly/extra.xml | 29 +++++++++++-
2 files changed, 115 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/systemml/blob/c00029a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4bbe714..eb4337d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1220,94 +1220,164 @@
</dependency>
<dependency>
<groupId>org.jcuda</groupId>
- <artifactId>jcufft</artifactId>
+ <artifactId>jcusparse</artifactId>
<version>${jcuda.version}</version>
<scope>${jcuda.scope}</scope>
</dependency>
<dependency>
<groupId>org.jcuda</groupId>
- <artifactId>jcusparse</artifactId>
+ <artifactId>jcusolver</artifactId>
<version>${jcuda.version}</version>
<scope>${jcuda.scope}</scope>
</dependency>
<dependency>
<groupId>org.jcuda</groupId>
- <artifactId>jcusolver</artifactId>
+ <artifactId>jcudnn</artifactId>
<version>${jcuda.version}</version>
<scope>${jcuda.scope}</scope>
</dependency>
+
<dependency>
<groupId>org.jcuda</groupId>
- <artifactId>jcurand</artifactId>
+ <artifactId>jcuda-natives</artifactId>
+ <classifier>${jcuda.os}-${jcuda.arch}</classifier>
<version>${jcuda.version}</version>
<scope>${jcuda.scope}</scope>
</dependency>
<dependency>
<groupId>org.jcuda</groupId>
- <artifactId>jnvgraph</artifactId>
+ <artifactId>jcublas-natives</artifactId>
+ <classifier>${jcuda.os}-${jcuda.arch}</classifier>
<version>${jcuda.version}</version>
<scope>${jcuda.scope}</scope>
</dependency>
<dependency>
<groupId>org.jcuda</groupId>
- <artifactId>jcudnn</artifactId>
+ <artifactId>jcusparse-natives</artifactId>
+ <classifier>${jcuda.os}-${jcuda.arch}</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>
+ <version>${jcuda.version}</version>
+ <scope>${jcuda.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jcuda</groupId>
+ <artifactId>jcudnn-natives</artifactId>
+ <classifier>${jcuda.os}-${jcuda.arch}</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>${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>jcufft-natives</artifactId>
- <classifier>${jcuda.os}-${jcuda.arch}</classifier>
+ <artifactId>jcusparse-natives</artifactId>
+ <classifier>windows-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>
+ <version>${jcuda.version}</version>
+ <scope>${jcuda.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jcuda</groupId>
+ <artifactId>jcudnn-natives</artifactId>
+ <classifier>windows-x86_64</classifier>
+ <version>${jcuda.version}</version>
+ <scope>${jcuda.scope}</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jcuda</groupId>
+ <artifactId>jcuda-natives</artifactId>
+ <classifier>linux-x86_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>
<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>linux-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>linux-x86_64</classifier>
<version>${jcuda.version}</version>
<scope>${jcuda.scope}</scope>
</dependency>
<dependency>
<groupId>org.jcuda</groupId>
- <artifactId>jcurand-natives</artifactId>
- <classifier>${jcuda.os}-${jcuda.arch}</classifier>
- <version>${jcuda.version}</version>
+ <artifactId>jcudnn-natives</artifactId>
+ <classifier>linux-x86_64</classifier>
+ <version>${jcuda.version}</version>
<scope>${jcuda.scope}</scope>
</dependency>
+
<dependency>
<groupId>org.jcuda</groupId>
- <artifactId>jnvgraph-natives</artifactId>
- <classifier>${jcuda.os}-${jcuda.arch}</classifier>
+ <artifactId>jcuda-natives</artifactId>
+ <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-ppc_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>
+ <version>${jcuda.version}</version>
+ <scope>${jcuda.scope}</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jcuda</groupId>
+ <artifactId>jcusolver-natives</artifactId>
+ <classifier>linux-ppc_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>linux-ppc_64</classifier>
<version>${jcuda.version}</version>
<scope>${jcuda.scope}</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/systemml/blob/c00029a7/src/assembly/extra.xml
----------------------------------------------------------------------
diff --git a/src/assembly/extra.xml b/src/assembly/extra.xml
index 24c2d87..c781615 100644
--- a/src/assembly/extra.xml
+++ b/src/assembly/extra.xml
@@ -51,11 +51,36 @@
</fileSet>
</fileSets>
- <!-- Include platform specific JCuda Jars -->
+ <!-- Include JCuda Jars -->
<dependencySets>
<dependencySet>
<includes>
- <include>org.jcuda:*</include>
+ <include>org.jcuda:jcuda:jar:${jcuda.version}</include>
+ <include>org.jcuda:jcublas:jar:${jcuda.version}</include>
+ <include>org.jcuda:jcusparse:jar:${jcuda.version}</include>
+ <include>org.jcuda:jcusolver:jar:${jcuda.version}</include>
+ <include>org.jcuda:jcudnn:jar:${jcuda.version}</include>
+
+ <!-- windows specific jcuda jars -->
+ <include>org.jcuda:jcuda-natives:jar:windows-x86_64:${jcuda.version}</include>
+ <include>org.jcuda:jcublas-natives:jar:windows-x86_64:${jcuda.version}</include>
+ <include>org.jcuda:jcusparse-natives:jar:windows-x86_64:${jcuda.version}</include>
+ <include>org.jcuda:jcusolver-natives:jar:windows-x86_64:${jcuda.version}</include>
+ <include>org.jcuda:jcudnn-natives:jar:windows-x86_64:${jcuda.version}</include>
+
+ <!-- linux x86_64 specific jcuda jars -->
+ <include>org.jcuda:jcuda-natives:jar:linux-x86_64:${jcuda.version}</include>
+ <include>org.jcuda:jcublas-natives:jar:linux-x86_64:${jcuda.version}</include>
+ <include>org.jcuda:jcusparse-natives:jar:linux-x86_64:${jcuda.version}</include>
+ <include>org.jcuda:jcusolver-natives:jar:linux-x86_64:${jcuda.version}</include>
+ <include>org.jcuda:jcudnn-natives:jar:linux-x86_64:${jcuda.version}</include>
+
+ <!-- linux ppc_64le specific jcuda jars -->
+ <include>org.jcuda:jcuda-natives:jar:linux-ppc_64:${jcuda.version}</include>
+ <include>org.jcuda:jcublas-natives:jar:linux-ppc_64:${jcuda.version}</include>
+ <include>org.jcuda:jcusparse-natives:jar:linux-ppc_64:${jcuda.version}</include>
+ <include>org.jcuda:jcusolver-natives:jar:linux-ppc_64:${jcuda.version}</include>
+ <include>org.jcuda:jcudnn-natives:jar:linux-ppc_64:${jcuda.version}</include>
</includes>
<unpack>true</unpack>
<scope>compile</scope>