Skip to content

Commit f9a89d5

Browse files
treotreo
authored
Merge pull request #983 from eclipse/ab_beta7
Update Examples to Beta7
2 parents a4594ba + c7149ca commit f9a89d5

File tree

77 files changed

+182
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+182
-287
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Repository of Deeplearning4J neural net examples:
2424
- Convolutional Neural Nets
2525
- Recurrent Neural Nets
2626
- TSNE
27-
- Word2Vec & GloVe
27+
- Word2Vec
2828
- Anomaly Detection
2929
- User interface examples.
3030

‎android/DL4JImageRecognitionDemo/app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@ android {
6464
implementation 'com.android.support:appcompat-v7:27.1.0'
6565
implementation 'com.android.support:design:27.1.0'
6666

67-
implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
67+
implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta7') {
6868
exclude group: 'org.bytedeco', module: 'opencv-platform'
6969
exclude group: 'org.bytedeco', module: 'leptonica-platform'
7070
exclude group: 'org.bytedeco', module: 'hdf5-platform'
7171
exclude group: 'org.nd4j', module: 'nd4j-base64'
7272
}
7373

74-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6'
75-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm"
76-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm64"
77-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86"
78-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86_64"
74+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7'
75+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm"
76+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm64"
77+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-x86"
78+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-x86_64"
7979
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
8080
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
8181
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"

‎android/DL4JIrisClassifierDemo/app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,17 @@ android {
6666
implementation 'com.android.support:design:27.1.0'
6767

6868

69-
implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
69+
implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta7') {
7070
exclude group: 'org.bytedeco', module: 'opencv-platform'
7171
exclude group: 'org.bytedeco', module: 'leptonica-platform'
7272
exclude group: 'org.bytedeco', module: 'hdf5-platform'
7373
exclude group: 'org.nd4j', module: 'nd4j-base64'
7474
}
75-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6'
76-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm"
77-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm64"
78-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86"
79-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86_64"
75+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7'
76+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm"
77+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm64"
78+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-x86"
79+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-x86_64"
8080
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
8181
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
8282
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"

‎android/DL4JModelTester/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@ dependencies {
6262
androidTestImplementation 'androidx.test:runner:1.2.0-alpha05'
6363
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha05'
6464

65-
implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
65+
implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta7') {
6666
exclude group: 'org.bytedeco', module: 'opencv-platform'
6767
exclude group: 'org.bytedeco', module: 'leptonica-platform'
6868
exclude group: 'org.bytedeco', module: 'hdf5-platform'
6969
exclude group: 'org.nd4j', module: 'nd4j-base64'
7070
}
7171

72-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6'
73-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm"
74-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm64"
72+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7'
73+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm"
74+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm64"
7575
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
7676
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
7777
implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"

‎android/DL4JModelTester/app/src/main/java/org/deeplearning4java/activity/BaseActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.nd4j.linalg.api.ndarray.INDArray;
3838
import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization;
3939
import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
40-
import org.nd4j.linalg.primitives.Pair;
40+
import org.nd4j.common.primitives.Pair;
4141

4242
import java.io.IOException;
4343
import java.util.Arrays;

‎android/DL4JModelTester/app/src/main/java/org/deeplearning4java/model/Dl4jModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.nd4j.linalg.api.ndarray.INDArray;
4141
import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization;
4242
import org.nd4j.linalg.dataset.api.preprocessor.ImagePreProcessingScaler;
43-
import org.nd4j.linalg.primitives.Pair;
43+
import org.nd4j.common.primitives.Pair;
4444
import org.opencv.core.Mat;
4545

4646
import java.io.ByteArrayInputStream;

‎datavec-examples/pom.xml‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,18 @@
2424
<parent>
2525
<groupId>org.deeplearning4j</groupId>
2626
<artifactId>deeplearning4j-examples-parent</artifactId>
27-
<version>1.0.0-beta6</version>
27+
<version>1.0.0-beta7</version>
2828
</parent>
2929

3030

3131

3232
<dependencies>
33+
<dependency>
34+
<groupId>io.netty</groupId>
35+
<artifactId>netty-all</artifactId>
36+
<version>4.1.42.Final</version>
37+
</dependency>
38+
3339
<dependency>
3440
<groupId>org.datavec</groupId>
3541
<artifactId>datavec-api</artifactId>
@@ -46,6 +52,16 @@
4652
<groupId>org.datavec</groupId>
4753
<artifactId>datavec-local</artifactId>
4854
<version>${datavec.version}</version>
55+
<exclusions>
56+
<exclusion>
57+
<groupId>io.netty</groupId>
58+
<artifactId>netty-buffer</artifactId>
59+
</exclusion>
60+
<exclusion>
61+
<groupId>io.netty</groupId>
62+
<artifactId>netty-common</artifactId>
63+
</exclusion>
64+
</exclusions>
4965
</dependency>
5066
<dependency>
5167
<groupId>org.deeplearning4j.examples</groupId>
@@ -57,12 +73,12 @@
5773
<groupId>org.apache.spark</groupId>
5874
<artifactId>spark-core_${scala.binary.version}</artifactId>
5975
<version>${spark.version}</version>
60-
</dependency>
61-
62-
<dependency>
63-
<groupId>io.netty</groupId>
64-
<artifactId>netty-all</artifactId>
65-
<version>4.1.42.Final</version>
76+
<exclusions>
77+
<exclusion>
78+
<groupId>io.netty</groupId>
79+
<artifactId>netty</artifactId>
80+
</exclusion>
81+
</exclusions>
6682
</dependency>
6783
</dependencies>
6884

‎dl4j-cuda-specific-examples/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.deeplearning4j</groupId>
2626
<artifactId>deeplearning4j-examples-parent</artifactId>
27-
<version>1.0.0-beta6</version>
27+
<version>1.0.0-beta7</version>
2828
</parent>
2929

3030
<name>DeepLearning4j CUDA special examples</name>
@@ -56,11 +56,6 @@
5656

5757
<dependencyManagement>
5858
<dependencies>
59-
<dependency>
60-
<groupId>org.nd4j</groupId>
61-
<artifactId>nd4j-cuda-9.2-platform</artifactId>
62-
<version>${nd4j.version}</version>
63-
</dependency>
6459
<dependency>
6560
<groupId>org.nd4j</groupId>
6661
<artifactId>nd4j-cuda-10.0-platform</artifactId>

‎dl4j-cuda-specific-examples/src/main/java/org/deeplearning4j/examples/multigpu/vgg16/dataHelpers/FlowerDataSetIterator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator;
2727
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
2828
import org.nd4j.linalg.dataset.api.preprocessor.VGG16ImagePreProcessor;
29-
import org.nd4j.util.ArchiveUtils;
29+
import org.nd4j.common.util.ArchiveUtils;
3030
import org.slf4j.Logger;
3131

3232
import java.io.File;

‎dl4j-examples/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mainClassName = 'org.deeplearning4j.examples.feedforward.mnist.MLPMnistSingleLay
2626

2727
buildscript {
2828
ext {
29-
dl4j_version = "1.0.0-beta6"
29+
dl4j_version = "1.0.0-beta7"
3030
kotlin_version = "1.3.30"
3131
}
3232
repositories {

0 commit comments

Comments
 (0)