1.0.0-beta7 (staging repo)

Signed-off-by: Alex Black <blacka101@gmail.com>
deeplearning4j · May 12, 2020 · 1dee77c · 1dee77c
1 parent 35c0765
commit 1dee77c
Show file tree

Hide file tree

Showing 21 changed files with 76 additions and 83 deletions.
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-beta6') {
+        implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta7') {
             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-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.nd4j', name: 'nd4j-native', version: '1.0.0-beta7'
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm64"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-x86"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', 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-beta6') {
+        implementation (group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta7') {
             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-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.nd4j', name: 'nd4j-native', version: '1.0.0-beta7'
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm64"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-x86"
+        implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', 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-beta6') {
+    implementation(group: 'org.deeplearning4j', name: 'deeplearning4j-core', version: '1.0.0-beta7') {
         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-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-beta7'
+    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', classifier: "android-arm"
+    implementation group: 'org.nd4j', name: 'nd4j-native', version: '1.0.0-beta7', 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-beta6</version>
+        <version>1.0.0-beta7</version>
     </parent>
 
 

diff --git a/dl4j-cuda-specific-examples/pom.xml b/dl4j-cuda-specific-examples/pom.xml
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.deeplearning4j</groupId>
         <artifactId>deeplearning4j-examples-parent</artifactId>
-        <version>1.0.0-beta6</version>
+        <version>1.0.0-beta7</version>
     </parent>
 
     <name>DeepLearning4j CUDA special examples</name>
     <properties>
-      <nd4j.backend>nd4j-cuda-10.2</nd4j.backend>
+      <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend>
     </properties>
 
     <repositories>
@@ -58,22 +58,17 @@
         <dependencies>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-9.2</artifactId>
+                <artifactId>nd4j-cuda-10.0-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.0</artifactId>
+                <artifactId>nd4j-cuda-10.1-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.1</artifactId>
-                <version>${nd4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.2</artifactId>
+                <artifactId>nd4j-cuda-10.2-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
       </dependencies>

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-beta6"
+        dl4j_version = "1.0.0-beta7"
         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-beta6</version>
+        <version>1.0.0-beta7</version>
     </parent>
 
     <name>DeepLearning4j Examples</name>
@@ -54,27 +54,22 @@
         <dependencies>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-native</artifactId>
+                <artifactId>nd4j-native-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-9.2</artifactId>
+                <artifactId>nd4j-cuda-10.0-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.0</artifactId>
+                <artifactId>nd4j-cuda-10.1-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.1</artifactId>
-                <version>${nd4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.2</artifactId>
+                <artifactId>nd4j-cuda-10.2-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
         </dependencies>

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-beta6</version>
+    <version>1.0.0-beta7</version>
 
     <!-- Properties Section. Change DL4J and ND4J versions here, if required -->
     <properties>
-        <dl4j.version>1.0.0-beta6</dl4j.version>
-        <nd4j.version>1.0.0-beta6</nd4j.version>
+        <dl4j.version>1.0.0-beta7</dl4j.version>
+        <nd4j.version>1.0.0-beta7</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>
@@ -49,12 +49,12 @@
         -->
         <dependency>
             <groupId>org.nd4j</groupId>
-            <artifactId>nd4j-native</artifactId>
+            <artifactId>nd4j-native-platform</artifactId>
             <version>${nd4j.version}</version>
         </dependency>
 
         <!-- CUDA: to use GPU for training (CUDA) instead of CPU, uncomment this, and remove nd4j-native-platform -->
-        <!-- Requires CUDA to be installed to use. Change the version (9.2, 10.0, 10.1) to change the CUDA version -->
+        <!-- Requires CUDA to be installed to use. Change the version (10.0, 10.1, 10.2) to change the CUDA version -->
         <!--
         <dependency>
             <groupId>org.nd4j</groupId>

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-beta6</version>
+        <version>1.0.0-beta7</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-beta6</version>
+        <version>1.0.0-beta7</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-beta6-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta7-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-beta6-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta7-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-beta6-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-beta7-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-beta6</version>
+        <version>1.0.0-beta7</version>
     </parent>
 
     <artifactId>dl4j-spark-examples</artifactId>

diff --git a/lstm-hdfs/pom.xml b/lstm-hdfs/pom.xml
@@ -21,15 +21,15 @@
     <parent>
         <groupId>org.deeplearning4j</groupId>
         <artifactId>deeplearning4j-examples-parent</artifactId>
-        <version>1.0.0-beta6</version>
+        <version>1.0.0-beta7</version>
     </parent>
     <groupId>org.deeplearning4j.examples</groupId>
     <artifactId>lstm-hdfs</artifactId>
     <name>lstm-hdfs</name>
     <url>http://maven.apache.org</url>
 
     <properties>
-        <dl4j.version>1.0.0-beta6</dl4j.version>
+        <dl4j.version>1.0.0-beta7</dl4j.version>
     </properties>
 
     <build>
@@ -77,7 +77,7 @@
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-native</artifactId>
+                <artifactId>nd4j-native-platform</artifactId>
                 <version>${nd4j.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -88,7 +88,7 @@
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-9.2</artifactId>
+                <artifactId>nd4j-cuda-10.2</artifactId>
                 <version>${nd4j.version}</version>
                 <scope>test</scope>
             </dependency>

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-beta6</version>
+        <version>1.0.0-beta7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -62,7 +62,7 @@
         <!--
         <dependency>
             <groupId>org.nd4j</groupId>
-            <artifactId>nd4j-cuda-9.2-platform</artifactId>
+            <artifactId>nd4j-cuda-10.2-platform</artifactId>
             <version>${nd4j.version}</version>
         </dependency>
         -->

diff --git a/pom.xml b/pom.xml
@@ -19,26 +19,34 @@
 
     <groupId>org.deeplearning4j</groupId>
     <artifactId>deeplearning4j-examples-parent</artifactId>
-    <version>1.0.0-beta6</version>
+    <version>1.0.0-beta7</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-1113/</url>
+        </repository>
+    </repositories>
+
     <name>DeepLearning4j Examples Parent</name>
     <description>Examples of training different data sets</description>
     <properties>
-        <!-- Change the nd4j.backend property to nd4j-cuda-9.2-platform,nd4j-cuda-10.0-platform or nd4j-cuda-10.1-platform to use CUDA GPUs -->
-        <nd4j.backend>nd4j-native</nd4j.backend>
-<!--        <nd4j.backend>nd4j-cuda-10.2</nd4j.backend>-->
+        <!-- Change the nd4j.backend property to nd4j-cuda-10.0-platform, nd4j-cuda-10.1-platform or nd4j-cuda-10.2-platform to use CUDA GPUs -->
+        <nd4j.backend>nd4j-native-platform</nd4j.backend>
+<!--        <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend>-->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <shadedClassifier>bin</shadedClassifier>
 
 
         <java.version>1.8</java.version>
-        <nd4j.version>1.0.0-SNAPSHOT</nd4j.version>
-        <dl4j.version>1.0.0-SNAPSHOT</dl4j.version>
-        <datavec.version>1.0.0-SNAPSHOT</datavec.version>
-        <arbiter.version>1.0.0-SNAPSHOT</arbiter.version>
-        <rl4j.version>1.0.0-SNAPSHOT</rl4j.version>
+        <nd4j.version>1.0.0-beta7</nd4j.version>
+        <dl4j.version>1.0.0-beta7</dl4j.version>
+        <datavec.version>1.0.0-beta7</datavec.version>
+        <arbiter.version>1.0.0-beta7</arbiter.version>
+        <rl4j.version>1.0.0-beta7</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-beta6</version>
+        <version>1.0.0-beta7</version>
     </parent>
 
     <name>Reinforcement Learning4j Examples</name>
@@ -59,27 +59,22 @@
         <dependencies>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-native</artifactId>
+                <artifactId>nd4j-native-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-9.2</artifactId>
+                <artifactId>nd4j-cuda-10.0-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.0</artifactId>
+                <artifactId>nd4j-cuda-10.1-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.1</artifactId>
-                <version>${nd4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nd4j</groupId>
-                <artifactId>nd4j-cuda-10.2</artifactId>
+                <artifactId>nd4j-cuda-10.2-platform</artifactId>
                 <version>${nd4j.version}</version>
             </dependency>
         </dependencies>