Skip to content

Commit 2eaee88

Browse files
AlexDBlackAlexDBlack
authored
Merge pull request #895 from eclipse/ab_beta5
Update versions to 1.0.0-beta5
2 parents 7b57aa8 + 8999767 commit 2eaee88

File tree

71 files changed

+152
-196
lines changed

Some content is hidden

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

71 files changed

+152
-196
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
1. Check for open issues, or open a new issue to start a discussion around a
44
new example or a bug.
55
2. If you feel uncomfortable or uncertain about an issue or your changes, feel free to contact us on Gitter using the link above.
6-
3. Fork [the repository](https://github.com/deeplearning4j/dl4j-examples.git) on GitHub to start making your changes to the **master** branch (or branch off of it).
6+
3. Fork [the repository](https://github.com/eclipse/deeplearning4j-examples.git) on GitHub to start making your changes to the **master** branch (or branch off of it).
77
4. If you're providing a new example, please help reference it by adding notes
88
of relevant publications to the code comments, including links if
99
available. If you fix an existing example, write a test, which shows that the bug was fixed or that the feature works as expected.

‎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-
compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta4') {
67+
compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
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-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4'
75-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm"
76-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm64"
77-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-x86"
78-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-x86_64"
74+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
75+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
76+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
77+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
78+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
7979
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
8080
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
8181
compile 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-
compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta4') {
69+
compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
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-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4'
76-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm"
77-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm64"
78-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-x86"
79-
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-x86_64"
75+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
76+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
77+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
78+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
79+
compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
8080
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
8181
compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
8282
compile 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-beta4') {
65+
implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
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-beta4'
73-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm"
74-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm64"
72+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
73+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
74+
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', 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"

‎datavec-examples/pom.xml

Lines changed: 8 additions & 2 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-beta4</version>
27+
<version>1.0.0-beta5</version>
2828
</parent>
2929

3030

@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.datavec</groupId>
4141
<artifactId>datavec-spark_${scala.binary.version}</artifactId>
42-
<version>${datavec.spark.version}</version>
42+
<version>${datavec.version}</version>
4343
</dependency>
4444

4545
<dependency>
@@ -52,6 +52,12 @@
5252
<artifactId>shared-utilities</artifactId>
5353
<version>${project.version}</version>
5454
</dependency>
55+
56+
<dependency>
57+
<groupId>org.apache.spark</groupId>
58+
<artifactId>spark-core_${scala.binary.version}</artifactId>
59+
<version>${spark.version}</version>
60+
</dependency>
5561
</dependencies>
5662

5763

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

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

3030
<name>DeepLearning4j CUDA special examples</name>
3131
<properties>
32-
<nd4j.backend>nd4j-cuda-10.1-platform</nd4j.backend>
32+
<nd4j.backend>nd4j-cuda-10.1</nd4j.backend>
3333
</properties>
3434

3535
<repositories>
@@ -76,6 +76,11 @@
7676
<artifactId>nd4j-cuda-10.1-platform</artifactId>
7777
<version>${nd4j.version}</version>
7878
</dependency>
79+
<dependency>
80+
<groupId>org.nd4j</groupId>
81+
<artifactId>nd4j-cuda-10.1</artifactId>
82+
<version>${nd4j.version}</version>
83+
</dependency>
7984
</dependencies>
8085
</dependencyManagement>
8186

‎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-beta4"
29+
dl4j_version = "1.0.0-beta5"
3030
kotlin_version = "1.3.30"
3131
}
3232
repositories {

‎dl4j-examples/pom.xml

Lines changed: 1 addition & 1 deletion
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-beta4</version>
27+
<version>1.0.0-beta5</version>
2828
</parent>
2929

3030
<name>DeepLearning4j Examples</name>

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/convolution/objectdetection/HouseNumberDetection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public static void main(String[] args) throws java.lang.Exception {
169169
"leaky_re_lu_8")
170170
.addLayer("outputs",
171171
new Yolo2OutputLayer.Builder()
172-
.lambbaNoObj(lambdaNoObj)
172+
.lambdaNoObj(lambdaNoObj)
173173
.lambdaCoord(lambdaCoord)
174174
.boundingBoxPriors(priors)
175175
.build(),

‎dl4j-spark-examples/dl4j-spark-cluster/pom.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,12 @@
2121
<parent>
2222
<artifactId>dl4j-spark-examples</artifactId>
2323
<groupId>org.deeplearning4j</groupId>
24-
<version>1.0.0-beta4</version>
24+
<version>1.0.0-beta5</version>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
2727

2828
<artifactId>dl4j-spark-cluster</artifactId>
2929
<properties>
30-
<!-- For Spark examples: change the _1 to _2 to switch between Spark 1 and Spark 2 -->
31-
<dl4j.spark.version>1.0.0-beta4_spark_2</dl4j.spark.version>
32-
<datavec.spark.version>1.0.0-beta4_spark_2</datavec.spark.version>
33-
3430
<!-- Scala binary version: DL4J's Spark and UI functionality are released with both Scala 2.10 and 2.11 support -->
3531
<scala.binary.version>2.11</scala.binary.version>
3632
</properties>
@@ -46,13 +42,13 @@
4642
<dependency>
4743
<groupId>org.deeplearning4j</groupId>
4844
<artifactId>dl4j-spark_${scala.binary.version}</artifactId>
49-
<version>${dl4j.spark.version}</version>
45+
<version>${dl4j.version}</version>
5046
</dependency>
5147

5248
<dependency>
5349
<groupId>org.deeplearning4j</groupId>
5450
<artifactId>dl4j-spark-parameterserver_${scala.binary.version}</artifactId>
55-
<version>${dl4j.spark.version}</version>
51+
<version>${dl4j.version}</version>
5652
</dependency>
5753

5854
<dependency>

0 commit comments

Comments
 (0)