Fixes and updates

AlexDBlack · AlexDBlack · commit d28f9ed96d6a · 2019-12-16T11:16:19.000+11:00
Signed-off-by: AlexDBlack &lt;blacka101@gmail.com&gt;
diff --git a/android/DL4JImageRecognitionDemo/app/build.gradle b/android/DL4JImageRecognitionDemo/app/build.gradle
@@ -64,18 +64,18 @@ android {
         implementation 'com.android.support:appcompat-v7:27.1.0'
         implementation 'com.android.support:design:27.1.0'
 
-        implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
+        implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
             exclude group: 'org.bytedeco', module: 'opencv-platform'
             exclude group: 'org.bytedeco', module: 'leptonica-platform'
             exclude group: 'org.bytedeco', module: 'hdf5-platform'
             exclude group: 'org.nd4j', module: 'nd4j-base64'
         }
 
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6'
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm64"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86_64"
         implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
         implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
         implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"
diff --git a/android/DL4JIrisClassifierDemo/app/build.gradle b/android/DL4JIrisClassifierDemo/app/build.gradle
@@ -66,17 +66,17 @@ android {
         implementation 'com.android.support:design:27.1.0'
 
 
-        implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
+        implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
             exclude group: 'org.bytedeco', module: 'opencv-platform'
             exclude group: 'org.bytedeco', module: 'leptonica-platform'
             exclude group: 'org.bytedeco', module: 'hdf5-platform'
             exclude group: 'org.nd4j', module: 'nd4j-base64'
         }
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
-        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6'
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm64"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-x86_64"
         implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
         implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
         implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"
diff --git a/android/DL4JModelTester/app/build.gradle b/android/DL4JModelTester/app/build.gradle
@@ -62,16 +62,16 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.2.0-alpha05'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha05'
 
-    implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
+    implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta6') {
         exclude group: 'org.bytedeco', module: 'opencv-platform'
         exclude group: 'org.bytedeco', module: 'leptonica-platform'
         exclude group: 'org.bytedeco', module: 'hdf5-platform'
         exclude group: 'org.nd4j', module: 'nd4j-base64'
     }
 
-    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
-    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
-    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
+    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6'
+    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm"
+    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta6', classifier: "android-arm64"
     implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
     implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
     implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm64"
diff --git a/datavec-examples/pom.xml b/datavec-examples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.deeplearning4j</groupId>
         <artifactId>deeplearning4j-examples-parent</artifactId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
 
 
diff --git a/dl4j-cuda-specific-examples/pom.xml b/dl4j-cuda-specific-examples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.deeplearning4j</groupId>
         <artifactId>deeplearning4j-examples-parent</artifactId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
 
     <name>DeepLearning4j CUDA special examples</name>
diff --git a/dl4j-examples/build.gradle b/dl4j-examples/build.gradle
@@ -26,7 +26,7 @@ mainClassName = 'org.deeplearning4j.examples.feedforward.mnist.MLPMnistSingleLay
 
 buildscript {
     ext {
-        dl4j_version = "1.0.0-beta5"
+        dl4j_version = "1.0.0-beta6"
         kotlin_version = "1.3.30"
     }
     repositories {
diff --git a/dl4j-examples/pom.xml b/dl4j-examples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.deeplearning4j</groupId>
         <artifactId>deeplearning4j-examples-parent</artifactId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
 
     <name>DeepLearning4j Examples</name>
diff --git a/dl4j-examples_javafx/pom.xml b/dl4j-examples_javafx/pom.xml
@@ -23,12 +23,12 @@
     <!-- Group-ID, artifact ID and version of the project. You can modify these as you want -->
     <groupId>org.deeplearning4j</groupId>
     <artifactId>deeplearning4j-examples</artifactId>
-    <version>1.0.0-beta5</version>
+    <version>1.0.0-beta6</version>
 
     <!-- Properties Section. Change DL4J and ND4J versions here, if required -->
     <properties>
-        <dl4j.version>1.0.0-beta5</dl4j.version>
-        <nd4j.version>1.0.0-beta5</nd4j.version>
+        <dl4j.version>1.0.0-beta6</dl4j.version>
+        <nd4j.version>1.0.0-beta6</nd4j.version>
         <logback.version>1.2.3</logback.version>
         <java.version>1.8</java.version>
         <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
diff --git a/dl4j-spark-examples/dl4j-spark-cluster/pom.xml b/dl4j-spark-examples/dl4j-spark-cluster/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dl4j-spark-examples</artifactId>
         <groupId>org.deeplearning4j</groupId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dl4j-spark-examples/dl4j-spark/pom.xml b/dl4j-spark-examples/dl4j-spark/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dl4j-spark-examples</artifactId>
         <groupId>org.deeplearning4j</groupId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/dl4j-spark-examples/dl4j-spark/scripts/patentExamplePreproc.sh b/dl4j-spark-examples/dl4j-spark/scripts/patentExamplePreproc.sh
@@ -31,7 +31,7 @@ MINIBATCH=32                                    #Minibatch size for preprocessed
 
 #Other variables. Don't modify these
 SCRIPTDIR=$(dirname "$0")
-JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta5-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta6-bin.jar
 AZURE_ACCT=fs.azure.account.key.${AZURE_STORAGE_ACCT}.blob.core.windows.net
 
 
diff --git a/dl4j-spark-examples/dl4j-spark/scripts/patentExampleTrain.sh b/dl4j-spark-examples/dl4j-spark/scripts/patentExampleTrain.sh
@@ -39,7 +39,7 @@ AERON_BUFFER=33554432
 
 #Other variables. Don't modify these
 SCRIPTDIR=$(dirname "$0")
-JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta5-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta6-bin.jar
 AZURE_ACCT=fs.azure.account.key.${AZURE_STORAGE_ACCT}.blob.core.windows.net
 
 
diff --git a/dl4j-spark-examples/dl4j-spark/scripts/tinyImagenetTrain.sh b/dl4j-spark-examples/dl4j-spark/scripts/tinyImagenetTrain.sh
@@ -31,7 +31,7 @@ EXECUTOR_MEMORY=12G
 MASTER_PORT=7077                                # Port for the spark master. Default is 7077
 MINIBATCH=32                                    # Minibatch size for preprocessed datasets
 SCRIPTDIR=$(dirname "$0")
-JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta5-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta6-bin.jar
 
 #Memory
 OFFHEAP_MEM_JAVACPP=20G         # Maximum amount of off-heap memory
diff --git a/dl4j-spark-examples/pom.xml b/dl4j-spark-examples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.deeplearning4j</groupId>
         <artifactId>deeplearning4j-examples-parent</artifactId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
 
     <artifactId>dl4j-spark-examples</artifactId>
diff --git a/lstm-hdfs/pom.xml b/lstm-hdfs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.deeplearning4j</groupId>
         <artifactId>deeplearning4j-examples-parent</artifactId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
     <groupId>org.deeplearning4j.examples</groupId>
     <artifactId>lstm-hdfs</artifactId>
diff --git a/nd4j-examples/pom.xml b/nd4j-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>deeplearning4j-examples-parent</artifactId>
         <groupId>org.deeplearning4j</groupId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>org.deeplearning4j</groupId>
     <artifactId>deeplearning4j-examples-parent</artifactId>
-    <version>1.0.0-beta5</version>
+    <version>1.0.0-beta6</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
diff --git a/rl4j-examples/pom.xml b/rl4j-examples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.deeplearning4j</groupId>
         <artifactId>deeplearning4j-examples-parent</artifactId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
 
     <name>Reinforcement Learning4j Examples</name>
diff --git a/shared-utilities/pom.xml b/shared-utilities/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>deeplearning4j-examples-parent</artifactId>
         <groupId>org.deeplearning4j</groupId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
     <groupId>org.deeplearning4j.examples</groupId>
     <artifactId>shared-utilities</artifactId>
diff --git a/standalone-sample-project/pom.xml b/standalone-sample-project/pom.xml
@@ -23,12 +23,12 @@
     <!-- Group-ID, artifact ID and version of the project. You can modify these as you want -->
     <groupId>org.deeplearning4j</groupId>
     <artifactId>deeplearning4j-examples</artifactId>
-    <version>1.0.0-beta5</version>
+    <version>1.0.0-beta6</version>
 
     <!-- Properties Section. Change DL4J and ND4J versions here, if required -->
     <properties>
-        <dl4j.version>1.0.0-beta5</dl4j.version>
-        <nd4j.version>1.0.0-beta5</nd4j.version>
+        <dl4j.version>1.0.0-beta6</dl4j.version>
+        <nd4j.version>1.0.0-beta6</nd4j.version>
         <logback.version>1.2.3</logback.version>
         <java.version>1.8</java.version>
         <maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
diff --git a/tf-import-examples/pom.xml b/tf-import-examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>deeplearning4j-examples-parent</artifactId>
         <groupId>org.deeplearning4j</groupId>
-        <version>1.0.0-beta5</version>
+        <version>1.0.0-beta6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -41,8 +41,8 @@
     </build>
 
     <properties>
-        <javacpp.version>1.5</javacpp.version>
-        <tensorflow.version>1.13.1</tensorflow.version>
+        <javacpp.version>1.5.2</javacpp.version>
+        <tensorflow.version>1.15.0</tensorflow.version>
     </properties>
 
     <dependencies>
diff --git a/tf-import-examples/src/main/java/org/nd4j/examples/Boston.java b/tf-import-examples/src/main/java/org/nd4j/examples/Boston.java
@@ -51,7 +51,7 @@ public static void loadModel(String filepath) throws Exception{
     private static void loadStats() throws Exception {
         File file = new File(dataLocalPath,"Boston/stats.txt");
         String contents = FileUtils.readFileToString(file,defaultCharset());
-        String stats[] = contents.split(",");
+        String stats[] = contents.replaceAll("[\\[\\]]","").split("[, ]");
         mean = Double.parseDouble(stats[0]);
         std = Double.parseDouble(stats[1]);
     }
@@ -92,7 +92,8 @@ Nitric oxides concentration (parts per 10 million).
     public static double predict(INDArray arr){
         arr = Nd4j.expandDims(arr, 0);  // add batch dimension
         sd.associateArrayWithVariable(arr, sd.variables().get(0));
-        INDArray outArr = sd.outputSingle(null, "");
+//        System.out.println(sd.summary());
+        INDArray outArr = sd.outputSingle(null, "dense_2/BiasAdd");
         double pred = outArr.getDouble(0);
         return pred;
     }
@@ -103,6 +104,6 @@ public static void main(String[] args) throws Exception{
         loadStats();
         INDArray sampleData = getSampleData();
         double prediction = predict(sampleData); // in $1000
-        System.out.println(String.format("Predicted price = $%d",prediction * 1000));
+        System.out.println("Predicted price = $" + (prediction * 1000));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ mainClassName = 'org.deeplearning4j.examples.feedforward.mnist.MLPMnistSingleLay`
`26`	`26`
`27`	`27`	`buildscript {`
`28`	`28`	`ext {`
`29`		`- dl4j_version = "1.0.0-beta5"`
	`29`	`+ dl4j_version = "1.0.0-beta6"`
`30`	`30`	`kotlin_version = "1.3.30"`
`31`	`31`	`}`
`32`	`32`	`repositories {`