Skip to content

Commit b228c04

Browse files
AlexDBlackAlexDBlack
authored
Merge pull request #933 from eclipse/ab_snapshots
Update version to 1.0.0-beta6
2 parents f862e90 + 90e7532 commit b228c04

File tree

32 files changed

+99
-127
lines changed

32 files changed

+99
-127
lines changed

‎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-beta5') {
67+
implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
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-beta5'
75-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
76-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
77-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
78-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
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"
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-beta5') {
69+
implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
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-beta5'
76-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
77-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
78-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
79-
implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
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"
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-beta5') {
65+
implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
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-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"
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"
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: 7 additions & 41 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-beta5</version>
27+
<version>1.0.0-beta6</version>
2828
</parent>
2929

3030

@@ -58,47 +58,13 @@
5858
<artifactId>spark-core_${scala.binary.version}</artifactId>
5959
<version>${spark.version}</version>
6060
</dependency>
61-
</dependencies>
62-
63-
64-
65-
<dependencyManagement>
66-
<dependencies>
67-
<dependency>
68-
<!-- Force Jackson versions to match Spark. This usually only matters for Spark local, not Spark submit -->
69-
<groupId>com.fasterxml.jackson.core</groupId>
70-
<artifactId>jackson-core</artifactId>
71-
<version>${jackson.version}</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>com.fasterxml.jackson.core</groupId>
75-
<artifactId>jackson-databind</artifactId>
76-
<version>${jackson.version}</version>
77-
</dependency>
78-
<dependency>
79-
<groupId>com.fasterxml.jackson.core</groupId>
80-
<artifactId>jackson-annotations</artifactId>
81-
<version>${jackson.version}</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>com.fasterxml.jackson.module</groupId>
85-
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
86-
<version>${jackson.version}</version>
87-
</dependency>
88-
<dependency>
89-
<groupId>com.fasterxml.jackson.datatype</groupId>
90-
<artifactId>jackson-datatype-jdk8</artifactId>
91-
<version>${jackson.version}</version>
92-
</dependency>
93-
<dependency>
94-
<groupId>com.fasterxml.jackson.datatype</groupId>
95-
<artifactId>jackson-datatype-jsr310</artifactId>
96-
<version>${jackson.version}</version>
97-
</dependency>
98-
</dependencies>
99-
</dependencyManagement>
100-
10161

62+
<dependency>
63+
<groupId>io.netty</groupId>
64+
<artifactId>netty-all</artifactId>
65+
<version>4.1.22.Final</version>
66+
</dependency>
67+
</dependencies>
10268

10369
<build>
10470
<plugins>

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

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

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

3535
<repositories>
@@ -78,7 +78,7 @@
7878
</dependency>
7979
<dependency>
8080
<groupId>org.nd4j</groupId>
81-
<artifactId>nd4j-cuda-10.1</artifactId>
81+
<artifactId>nd4j-cuda-10.2-platform</artifactId>
8282
<version>${nd4j.version}</version>
8383
</dependency>
8484
</dependencies>
@@ -99,7 +99,7 @@
9999
</dependency>
100100
<dependency>
101101
<groupId>org.deeplearning4j</groupId>
102-
<artifactId>deeplearning4j-ui_${scala.binary.version}</artifactId>
102+
<artifactId>deeplearning4j-ui</artifactId>
103103

104104
<version>${dl4j.version}</version>
105105
</dependency>

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

‎dl4j-examples/pom.xml

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

3030
<name>DeepLearning4j Examples</name>
@@ -77,6 +77,11 @@
7777
<artifactId>nd4j-cuda-10.1-platform</artifactId>
7878
<version>${nd4j.version}</version>
7979
</dependency>
80+
<dependency>
81+
<groupId>org.nd4j</groupId>
82+
<artifactId>nd4j-cuda-10.2-platform</artifactId>
83+
<version>${nd4j.version}</version>
84+
</dependency>
8085
</dependencies>
8186
</dependencyManagement>
8287

@@ -104,7 +109,7 @@
104109
<!-- deeplearning4j-ui is used for visualization: see http://deeplearning4j.org/visualization -->
105110
<dependency>
106111
<groupId>org.deeplearning4j</groupId>
107-
<artifactId>deeplearning4j-ui_${scala.binary.version}</artifactId>
112+
<artifactId>deeplearning4j-ui</artifactId>
108113
<version>${dl4j.version}</version>
109114
</dependency>
110115

@@ -150,7 +155,7 @@
150155
</dependency>
151156
<dependency>
152157
<groupId>org.deeplearning4j</groupId>
153-
<artifactId>arbiter-ui_${scala.binary.version}</artifactId>
158+
<artifactId>arbiter-ui</artifactId>
154159
<version>${arbiter.version}</version>
155160
</dependency>
156161

‎dl4j-examples/src/main/java/org/deeplearning4j/examples/modelimport/tensorflow/LoadTensorFlowMNISTMLP.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void main(String[] args) throws Exception {
6464
Map<String, INDArray> inputsPredictions = readPlaceholdersAndPredictions();
6565

6666
//Load the graph into samediff
67-
SameDiff graph = TFGraphMapper.getInstance().importGraph(new File(FROZEN_MLP));
67+
SameDiff graph = TFGraphMapper.importGraph(new File(FROZEN_MLP));
6868
//libnd4j executor
6969
//running with input_a array expecting to get prediction_a
7070
graph.associateArrayWithVariable(inputsPredictions.get("input_a"), graph.variableMap().get("input"));
@@ -80,9 +80,8 @@ public static void main(String[] args) throws Exception {
8080
}
8181

8282
//Now to run with the samediff executor, with input_b array expecting to get prediction_b
83-
SameDiff graphSD = TFGraphMapper.getInstance().importGraph(new File(FROZEN_MLP)); //Reimport graph here, necessary for the 1.0 alpha release
84-
graphSD.associateArrayWithVariable(inputsPredictions.get("input_b"), graph.variableMap().get("input"));
85-
INDArray samediffPred = graphSD.execAndEndResult();
83+
SameDiff graphSD = TFGraphMapper.importGraph(new File(FROZEN_MLP)); //Reimport graph here, necessary for the 1.0 alpha release
84+
INDArray samediffPred = graphSD.output(inputsPredictions, "preduction_a").get("prediction_a");
8685
System.out.println("SameDiff exec prediction for input_b:\n" + samediffPred);
8786
if (samediffPred.equals(inputsPredictions.get("prediction_b"))) {
8887
//this is true and therefore predictions are equal

‎dl4j-examples_javafx/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<!-- Group-ID, artifact ID and version of the project. You can modify these as you want -->
2424
<groupId>org.deeplearning4j</groupId>
2525
<artifactId>deeplearning4j-examples</artifactId>
26-
<version>1.0.0-beta5</version>
26+
<version>1.0.0-beta6</version>
2727

2828
<!-- Properties Section. Change DL4J and ND4J versions here, if required -->
2929
<properties>
30-
<dl4j.version>1.0.0-beta5</dl4j.version>
31-
<nd4j.version>1.0.0-beta5</nd4j.version>
30+
<dl4j.version>1.0.0-beta6</dl4j.version>
31+
<nd4j.version>1.0.0-beta6</nd4j.version>
3232
<logback.version>1.2.3</logback.version>
3333
<java.version>1.8</java.version>
3434
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
@@ -75,7 +75,7 @@
7575

7676
<dependency>
7777
<groupId>org.deeplearning4j</groupId>
78-
<artifactId>deeplearning4j-ui_2.11</artifactId>
78+
<artifactId>deeplearning4j-ui</artifactId>
7979
<version>${dl4j.version}</version>
8080
</dependency>
8181

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

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

@@ -68,7 +68,7 @@
6868

6969
<dependency>
7070
<groupId>org.deeplearning4j</groupId>
71-
<artifactId>deeplearning4j-ui_${scala.binary.version}</artifactId>
71+
<artifactId>deeplearning4j-ui</artifactId>
7272
<version>${dl4j.version}</version>
7373
</dependency>
7474
</dependencies>

0 commit comments

Comments
 (0)