Staging repo + beta5

AlexDBlack · AlexDBlack · commit 691e83180910 · 2019-09-10T12:35:46.000+10: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'
 
-        compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta4') {
+        compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
             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'
         }
 
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4'
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm"
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm64"
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-x86"
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-x86_64"
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
         compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
         compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
         compile 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'
 
 
-        compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta4') {
+        compile (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
             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'
         }
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4'
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm"
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm64"
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-x86"
-        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-x86_64"
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5'
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm"
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-arm64"
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86"
+        compile group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta5', classifier: "android-x86_64"
         compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5'
         compile group: 'org.bytedeco', name: 'openblas', version: '0.3.5-1.5', classifier: "android-arm"
         compile 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-beta4') {
+    implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta5') {
         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-beta4'
-    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm"
-    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta4', classifier: "android-arm64"
+    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.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-beta4</version>
+        <version>1.0.0-beta5</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-beta4</version>
+        <version>1.0.0-beta5</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-beta4"
+        dl4j_version = "1.0.0-beta5"
         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-beta4</version>
+        <version>1.0.0-beta5</version>
     </parent>
 
     <name>DeepLearning4j Examples</name>
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-beta4</version>
+        <version>1.0.0-beta5</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-beta4</version>
+        <version>1.0.0-beta5</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-beta4-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta5-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-beta4-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta5-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-beta4-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta5-bin.jar
 
 #Memory
 OFFHEAP_MEM_JAVACPP=20G         # Maximum amount of off-heap memory
diff --git a/dl4j-spark-examples/dl4j-spark/src/main/java/org/deeplearning4j/patent/readme.md b/dl4j-spark-examples/dl4j-spark/src/main/java/org/deeplearning4j/patent/readme.md
@@ -57,7 +57,7 @@ with access to spark-submit.
 #After cloning this repo
 cd dl4j-examples/dl4j-spark-examples/dl4j-spark
 mvn package -DskipTests
-#Or, if required: mvn clean package -Dspark.version=2.1.0 -Ddl4j.spark.version=1.0.0-beta4_spark_2 -Ddatavec.spark.version=1.0.0-beta4_spark_2
+#Or, if required: mvn clean package -Dspark.version=2.4.3 -Ddl4j.spark.version=1.0.0-beta5 -Ddatavec.spark.version=1.0.0-beta5
 ```
 
 ### Stage 2: Run Data Download and Preprocessing
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-beta4</version>
+        <version>1.0.0-beta5</version>
     </parent>
 
     <artifactId>dl4j-spark-examples</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-beta4</version>
+        <version>1.0.0-beta5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/nd4j-examples/src/main/java/org/nd4j/samediff/readme.md b/nd4j-examples/src/main/java/org/nd4j/samediff/readme.md
@@ -4,9 +4,6 @@ SameDiff is an automatic differentiation library built on top of ND4J.
 It can be considered comparable to TensorFlow or PyTorch, in that users can define a set of tensor operations
 (a graph of operations, defining the "forward pass") and SameDiff will automatically differentiate the graph.
 
-Note that as of 1.0.0-beta4, SameDiff has a limitation that will be fixed in the next few releases:
-Many operations in SameDiff are limited to CPU-only exeuction. GPU (CUDA) execution will be added in the future
-
 Note also that a number of Deeplearning4j examples demonstrate how to use SameDiff to create DL4J layers and
 vertices as part of a Deeplearning4j MultiLayerNetwork or ComputationGraph.
 These examples can be found under [samediff](../../../../../../../dl4j-examples/src/main/java/org/deeplearning4j/examples/samediff)
diff --git a/pom.xml b/pom.xml
@@ -19,10 +19,18 @@
 
     <groupId>org.deeplearning4j</groupId>
     <artifactId>deeplearning4j-examples-parent</artifactId>
-    <version>1.0.0-beta4</version>
+    <version>1.0.0-beta5</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
+    <repositories>
+        <repository>
+            <id>sonatype-nexus-staging</id>
+            <name>Sonatype Nexus Staging</name>
+            <url>https://oss.sonatype.org/content/repositories/orgdeeplearning4j-1099/</url>
+        </repository>
+    </repositories>
+
     <name>DeepLearning4j Examples Parent</name>
     <description>Examples of training different data sets</description>
     <properties>
@@ -34,15 +42,11 @@
 
 
         <java.version>1.8</java.version>
-        <nd4j.version>1.0.0-beta4</nd4j.version>
-        <dl4j.version>1.0.0-beta4</dl4j.version>
-        <datavec.version>1.0.0-beta4</datavec.version>
-        <arbiter.version>1.0.0-beta4</arbiter.version>
-        <rl4j.version>1.0.0-beta4</rl4j.version>
-
-        <!-- For Spark examples: change the _1 to _2 to switch between Spark 1 and Spark 2 -->
-        <dl4j.spark.version>1.0.0-beta4_spark_2</dl4j.spark.version>
-        <datavec.spark.version>1.0.0-beta4_spark_2</datavec.spark.version>
+        <nd4j.version>1.0.0-beta5</nd4j.version>
+        <dl4j.version>1.0.0-beta5</dl4j.version>
+        <datavec.version>1.0.0-beta5</datavec.version>
+        <arbiter.version>1.0.0-beta5</arbiter.version>
+        <rl4j.version>1.0.0-beta5</rl4j.version>
 
         <!-- Scala binary version: DL4J's Spark and UI functionality are released with both Scala 2.10 and 2.11 support -->
         <scala.binary.version>2.11</scala.binary.version>
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-beta4</version>
+        <version>1.0.0-beta5</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-beta4</version>
+        <version>1.0.0-beta5</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,7 +23,7 @@
     <!-- 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-beta4</version>
+    <version>1.0.0-beta5</version>
 
     <!-- Properties Section. Change DL4J and ND4J versions here, if required -->
     <properties>
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-beta4</version>
+        <version>1.0.0-beta5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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-beta4"`
	`29`	`+ dl4j_version = "1.0.0-beta5"`
`30`	`30`	`kotlin_version = "1.3.30"`
`31`	`31`	`}`
`32`	`32`	`repositories {`