Update version

agibsonccc · agibsonccc · commit 1d415a6dfde6 · 2021-07-27T21:35:45.000+09:00
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@
 The **Eclipse Deeplearning4J** (DL4J) ecosystem is a set of projects intended to support all the needs of a JVM based deep learning application. This means starting with the raw data, loading and preprocessing it from wherever and whatever format it is in to building and tuning a wide variety of simple and complex deep learning networks.
 
 The DL4J stack comprises of:
-- **DL4J**: High level API to build MultiLayerNetworks and ComputationGraphs with a variety of layers, including custom ones. Supports importing Keras models from h5, including tf.keras models (as of 1.0.0-M1) and also supports distributed training on Apache Spark
+- **DL4J**: High level API to build MultiLayerNetworks and ComputationGraphs with a variety of layers, including custom ones. Supports importing Keras models from h5, including tf.keras models (as of 1.0.0-M1.1) and also supports distributed training on Apache Spark
 - **ND4J**: General purpose linear algebra library with over 500 mathematical, linear algebra and deep learning operations. ND4J is based on the highly-optimized C++ codebase LibND4J that provides CPU (AVX2/512) and GPU (CUDA) support and acceleration by libraries such as OpenBLAS, OneDNN (MKL-DNN), cuDNN, cuBLAS, etc
 - **SameDiff** : Part of the ND4J library, SameDiff is our automatic differentiation / deep learning framework. SameDiff uses a graph-based (define then run) approach, similar to TensorFlow graph mode. Eager graph (TensorFlow 2.x eager/PyTorch) graph execution is planned. SameDiff supports importing TensorFlow frozen model format .pb (protobuf) models. Import for ONNX, TensorFlow SavedModel and Keras models are planned. Deeplearning4j also has full SameDiff support for easily writing custom layers and loss functions.
 - **DataVec**: ETL for machine learning data in a wide variety of formats and files (HDFS, Spark, Images, Video, Audio, CSV, Excel etc)
diff --git a/android-examples/app/build.gradle b/android-examples/app/build.gradle
@@ -27,7 +27,7 @@ android {
 }
 
 dependencies {
-    def dl4jVersion = '1.0.0-M1'
+    def dl4jVersion = '1.0.0-M1.1'
     def openblasVersion = '0.3.10-1.5.5'
     def opencvVersion = '4.5.1-1.5.5'
     def leptonicaVersion = '1.80.0-1.5.5'
diff --git a/data-pipeline-examples/pom.xml b/data-pipeline-examples/pom.xml
@@ -23,12 +23,12 @@
 
     <groupId>org.deeplearning4j</groupId>
     <artifactId>data-pipeline-examples</artifactId>
-    <version>1.0.0-M1</version>
+    <version>1.0.0-M1.1</version>
     <name>Building a data pipeline prior to modeling</name>
     <description>Loading raw data and processing it before training</description>
 
     <properties>
-        <dl4j-master.version>1.0.0-M1</dl4j-master.version>
+        <dl4j-master.version>1.0.0-M1.1</dl4j-master.version>
         <!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
 		<!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
         <nd4j.backend>nd4j-native</nd4j.backend>
diff --git a/dl4j-distributed-training-examples/pom.xml b/dl4j-distributed-training-examples/pom.xml
@@ -23,12 +23,12 @@
 
     <groupId>org.deeplearning4j</groupId>
     <artifactId>dl4j-distributed-training-examples</artifactId>
-    <version>1.0.0-M1</version>
+    <version>1.0.0-M1.1</version>
     <name>Introduction to Distributed Training with DL4J</name>
     <description>A set of examples introducing distributed training with the DL4J framework</description>
 
     <properties>
-        <dl4j-master.version>1.0.0-M1</dl4j-master.version>
+        <dl4j-master.version>1.0.0-M1.1</dl4j-master.version>
         <!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
         <!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
         <nd4j.backend>nd4j-native</nd4j.backend>
diff --git a/dl4j-distributed-training-examples/scripts/patentExamplePreproc.sh b/dl4j-distributed-training-examples/scripts/patentExamplePreproc.sh
@@ -32,7 +32,7 @@ MINIBATCH=32                                    #Minibatch size for preprocessed
 
 #Other variables. Don't modify these
 SCRIPTDIR=$(dirname "$0")
-JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-M1-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-M1.1-bin.jar
 AZURE_ACCT=fs.azure.account.key.${AZURE_STORAGE_ACCT}.blob.core.windows.net
 
 
diff --git a/dl4j-distributed-training-examples/scripts/patentExampleTrain.sh b/dl4j-distributed-training-examples/scripts/patentExampleTrain.sh
@@ -40,7 +40,7 @@ AERON_BUFFER=33554432
 
 #Other variables. Don't modify these
 SCRIPTDIR=$(dirname "$0")
-JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-M1-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-M1.1-bin.jar
 AZURE_ACCT=fs.azure.account.key.${AZURE_STORAGE_ACCT}.blob.core.windows.net
 
 
diff --git a/dl4j-distributed-training-examples/scripts/tinyImagenetTrain.sh b/dl4j-distributed-training-examples/scripts/tinyImagenetTrain.sh
@@ -32,7 +32,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-M1-bin.jar
+JARFILE=${SCRIPTDIR}/../target/dl4j-spark-1.0.0-M1.1-bin.jar
 
 #Memory
 OFFHEAP_MEM_JAVACPP=20G         # Maximum amount of off-heap memory
diff --git a/dl4j-examples/pom.xml b/dl4j-examples/pom.xml
@@ -28,7 +28,7 @@
     <description>A set of examples introducing the DL4J framework</description>
 
     <properties>
-        <dl4j-master.version>1.0.0-M1</dl4j-master.version>
+        <dl4j-master.version>1.0.0-M1.1</dl4j-master.version>
         <!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
         <!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
         <nd4j.backend>nd4j-cuda-11.2</nd4j.backend>
diff --git a/mvn-project-template/pom.xml b/mvn-project-template/pom.xml
@@ -24,11 +24,11 @@
     <!-- Group-ID, artifact ID and version of the project. You can modify these as you want -->
     <groupId>org.deeplearning4j</groupId>
     <artifactId>deeplearning4j-example-sample</artifactId>
-    <version>1.0.0-M1</version>
+    <version>1.0.0-M1.1</version>
 
     <!-- Properties Section. Change ND4J versions here, if required -->
     <properties>
-        <dl4j-master.version>1.0.0-M1</dl4j-master.version>
+        <dl4j-master.version>1.0.0-M1.1</dl4j-master.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/nd4j-ndarray-examples/pom.xml b/nd4j-ndarray-examples/pom.xml
@@ -28,6 +28,10 @@
     <description>Working with NDArrays</description>
 
     <repositories>
+        <repository>
+            <id>orgdeeplearning4j-1177</id>
+            <url>https://oss.sonatype.org/content/repositories/orgdeeplearning4j-1177</url>
+        </repository>
         <repository>
             <id>sonatype-nexus-snapshots</id>
             <name>Sonatype Nexus Snapshots</name>
@@ -44,7 +48,7 @@
 
 
     <properties>
-        <dl4j-master.version>1.0.0-M1</dl4j-master.version>
+        <dl4j-master.version>1.0.0-M1.1.1</dl4j-master.version>
         <!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
         <!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
         <nd4j.backend>nd4j-native</nd4j.backend>
diff --git a/rl4j-examples/pom.xml b/rl4j-examples/pom.xml
@@ -6,10 +6,10 @@
 
     <groupId>org.deeplearning4j</groupId>
     <artifactId>rl4j-examples</artifactId>
-    <version>1.0.0-M1</version>
+    <version>1.0.0-M1.1</version>
     <properties>
-        <nd4j.version>1.0.0-M1</nd4j.version>
-        <rl4j.version>1.0.0-M1</rl4j.version>
+        <nd4j.version>1.0.0-M1.1.1</nd4j.version>
+        <rl4j.version>1.0.0-M1.1.1</rl4j.version>
         <logback.version>1.1.7</logback.version>
         <java.version>1.8</java.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -20,6 +20,10 @@
 
 
     <repositories>
+        <repository>
+            <id>orgdeeplearning4j-1177</id>
+            <url>https://oss.sonatype.org/content/repositories/orgdeeplearning4j-1177</url>
+        </repository>
         <repository>
             <id>sonatype-nexus-snapshots</id>
             <name>Sonatype Nexus Snapshots</name>
diff --git a/samediff-examples/pom.xml b/samediff-examples/pom.xml
@@ -23,12 +23,12 @@
 
     <groupId>org.deeplearning4j</groupId>
     <artifactId>samediff-examples</artifactId>
-    <version>1.0.0-M1</version>
+    <version>1.0.0-M1.1</version>
     <name>Quickstart to SameDiff</name>
     <description>A set of beginner examples introducing the SameDiff framework</description>
 
     <properties>
-        <dl4j-master.version>1.0.0-M1</dl4j-master.version>
+        <dl4j-master.version>1.0.0-M1.1.1</dl4j-master.version>
         <!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
         <!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
         <nd4j.backend>nd4j-native</nd4j.backend>
@@ -46,6 +46,11 @@
     </properties>
 
     <repositories>
+        <repository>
+            <id>orgdeeplearning4j-1177</id>
+            <url>https://oss.sonatype.org/content/repositories/orgdeeplearning4j-1177</url>
+        </repository>
+
         <repository>
             <id>sonatype-nexus-snapshots</id>
             <name>Sonatype Nexus Snapshots</name>
diff --git a/tensorflow-keras-import-examples/README.md b/tensorflow-keras-import-examples/README.md
@@ -1,6 +1,6 @@
 ##  Eclipse Deeplearning4j: Model Import
 
-The DL4J supports models created in the popular Python Tensorflow and Keras frameworks. As of 1.0.0-M1, Keras models (including tf.keras) can be imported into Deeplearning. TensorFlow frozen format models can be imported into SameDiff.
+The DL4J supports models created in the popular Python Tensorflow and Keras frameworks. As of 1.0.0-M1.1, Keras models (including tf.keras) can be imported into Deeplearning. TensorFlow frozen format models can be imported into SameDiff.
 
 Models in Tensorflow have to be converted to "frozen" pbs (protobuf). More information on freezing Tensorflow models can be found [here](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/python/tools/freeze_graph.py#L15) for Tensorflow 1.X and [here](https://leimao.github.io/blog/Save-Load-Inference-From-TF2-Frozen-Graph/) for Tensorflow 2.X. Keras models have to be saved in h5 format. More information can be found [here](https://keras.io/getting-started/faq/#how-can-i-save-a-keras-model). Importing both Keras 1 and Keras 2 models are supported. Of note - importing models saved with tf.keras is also supported. Currently general TensorFlow operations within Keras models (i.e., those not part of the tf.keras API) are currently importable but support inference only. Full training is supported for anything that is part of the Keras API.
 
diff --git a/tensorflow-keras-import-examples/ops-added-old.txt b/tensorflow-keras-import-examples/ops-added-old.txt
@@ -0,0 +1,20 @@
+Placeholder,input
+Const,Variable
+Const,Variable_1
+Const,Variable_2
+Const,Variable_3
+Const,Variable_4
+Const,Variable_5
+Identity,Variable/read
+Identity,Variable_1/read
+Identity,Variable_2/read
+Identity,Variable_3/read
+Identity,Variable_4/read
+Identity,Variable_5/read
+MatMul,MatMul
+Add,Add
+MatMul,MatMul_1
+Add,Add_1
+MatMul,MatMul_2
+Add,add
+Softmax,output
diff --git a/tensorflow-keras-import-examples/ops-imported-old.txt b/tensorflow-keras-import-examples/ops-imported-old.txt
@@ -0,0 +1,13 @@
+Identity,Variable/read
+Identity,Variable_1/read
+Identity,Variable_2/read
+Identity,Variable_3/read
+Identity,Variable_4/read
+Identity,Variable_5/read
+MatMul,MatMul
+Add,Add
+MatMul,MatMul_1
+Add,Add_1
+MatMul,MatMul_2
+Add,add
+Softmax,output
diff --git a/tensorflow-keras-import-examples/ops-removed-old.txt b/tensorflow-keras-import-examples/ops-removed-old.txt
@@ -0,0 +1,20 @@
+input
+Variable
+Variable_1
+Variable_2
+Variable_3
+Variable_4
+Variable_5
+Variable/read
+Variable_1/read
+Variable_2/read
+Variable_3/read
+Variable_4/read
+Variable_5/read
+MatMul
+Add
+MatMul_1
+Add_1
+MatMul_2
+add
+output
diff --git a/tensorflow-keras-import-examples/pom.xml b/tensorflow-keras-import-examples/pom.xml
@@ -28,7 +28,7 @@
     <description>Loading models trained in keras or tensorflow</description>
 
     <properties>
-        <dl4j-master.version>1.0.0-M1</dl4j-master.version>
+        <dl4j-master.version>1.0.0-M1.1</dl4j-master.version>
         <!-- Change the nd4j.backend property to nd4j-cuda-X-platform to use CUDA GPUs -->
         <nd4j.backend>nd4j-native</nd4j.backend>
         <!-- <nd4j.backend>nd4j-cuda-10.2-platform</nd4j.backend> -->
diff --git a/tensorflow-keras-import-examples/variables-added-old.txt b/tensorflow-keras-import-examples/variables-added-old.txt
@@ -0,0 +1,13 @@
+Variable/read,Variable/read
+Variable_1/read,Variable_1/read
+Variable_2/read,Variable_2/read
+Variable_3/read,Variable_3/read
+Variable_4/read,Variable_4/read
+Variable_5/read,Variable_5/read
+MatMul,MatMul
+Add,Add
+MatMul_1,MatMul_1
+Add_1,Add_1
+MatMul_2,MatMul_2
+add,add
+output,output

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ android {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`dependencies {`
`30`		`- def dl4jVersion = '1.0.0-M1'`
	`30`	`+ def dl4jVersion = '1.0.0-M1.1'`
`31`	`31`	`def openblasVersion = '0.3.10-1.5.5'`
`32`	`32`	`def opencvVersion = '4.5.1-1.5.5'`
`33`	`33`	`def leptonicaVersion = '1.80.0-1.5.5'`