few more mkldnn dependencies removed

Signed-off-by: raver119 <raver119@gmail.com>
master
raver119 2019-09-12 04:55:59 +03:00
parent 98e2814879
commit 07901ceb69
3 changed files with 0 additions and 16 deletions

View File

@ -110,11 +110,6 @@
<artifactId>javacpp</artifactId> <artifactId>javacpp</artifactId>
<version>${javacpp.version}</version> <version>${javacpp.version}</version>
<dependencies> <dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>mkl-dnn-platform</artifactId>
<version>${mkl-dnn.javacpp.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.bytedeco</groupId> <groupId>org.bytedeco</groupId>
<artifactId>openblas-platform</artifactId> <artifactId>openblas-platform</artifactId>
@ -125,19 +120,15 @@
<properties>${libnd4j.platform}</properties> <properties>${libnd4j.platform}</properties>
<buildResources> <buildResources>
<buildResource>/${javacpp.platform.library.path}/</buildResource> <buildResource>/${javacpp.platform.library.path}/</buildResource>
<buildResource>/org/bytedeco/mkldnn/${libnd4j.platform}/</buildResource>
<buildResource>/org/bytedeco/openblas/${libnd4j.platform}/</buildResource> <buildResource>/org/bytedeco/openblas/${libnd4j.platform}/</buildResource>
</buildResources> </buildResources>
<includeResources> <includeResources>
<includeResource>/${javacpp.platform.library.path}/include/</includeResource> <includeResource>/${javacpp.platform.library.path}/include/</includeResource>
<includeResource>/org/bytedeco/mkldnn/${libnd4j.platform}/include/</includeResource>
<includeResource>/org/bytedeco/openblas/${libnd4j.platform}/include/</includeResource> <includeResource>/org/bytedeco/openblas/${libnd4j.platform}/include/</includeResource>
</includeResources> </includeResources>
<linkResources> <linkResources>
<linkResource>/${javacpp.platform.library.path}/</linkResource> <linkResource>/${javacpp.platform.library.path}/</linkResource>
<linkResource>/${javacpp.platform.library.path}/lib/</linkResource> <linkResource>/${javacpp.platform.library.path}/lib/</linkResource>
<linkResource>/org/bytedeco/mkldnn/${libnd4j.platform}/</linkResource>
<linkResource>/org/bytedeco/mkldnn/${libnd4j.platform}/</linkResource>
<linkResource>/org/bytedeco/openblas/${libnd4j.platform}/</linkResource> <linkResource>/org/bytedeco/openblas/${libnd4j.platform}/</linkResource>
<linkResource>/org/bytedeco/openblas/${libnd4j.platform}/lib/</linkResource> <linkResource>/org/bytedeco/openblas/${libnd4j.platform}/lib/</linkResource>
</linkResources> </linkResources>

View File

@ -40,11 +40,6 @@
<artifactId>mkl-platform</artifactId> <artifactId>mkl-platform</artifactId>
<version>${mkl.version}-${javacpp-presets.version}</version> <version>${mkl.version}-${javacpp-presets.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>mkl-dnn-platform</artifactId>
<version>${mkl-dnn.javacpp.version}</version>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>${nd4j.backend}</artifactId> <artifactId>${nd4j.backend}</artifactId>

View File

@ -297,8 +297,6 @@
<openblas.version>0.3.6</openblas.version> <openblas.version>0.3.6</openblas.version>
<mkl.version>2019.4</mkl.version> <mkl.version>2019.4</mkl.version>
<mkl-dnn.version>0.20</mkl-dnn.version>
<mkl-dnn.javacpp.version>${mkl-dnn.version}-${javacpp-presets.version}</mkl-dnn.javacpp.version>
<opencv.version>4.1.0</opencv.version> <opencv.version>4.1.0</opencv.version>
<ffmpeg.version>4.1.3</ffmpeg.version> <ffmpeg.version>4.1.3</ffmpeg.version>
<leptonica.version>1.78.0</leptonica.version> <leptonica.version>1.78.0</leptonica.version>