This is an automated email from the ASF dual-hosted git repository.
zhasheng pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.x by this push:
new 91d595a bump up 1.x branch to 1.7.0 (#17741)
91d595a is described below
commit 91d595a4bc5188e284904a6f4f6bea5e65d491a0
Author: Sheng Zha <[email protected]>
AuthorDate: Mon Mar 2 21:22:46 2020 -0800
bump up 1.x branch to 1.7.0 (#17741)
* bump up 1.x branch to 1.7.0
* bump version for clojure
---
R-package/DESCRIPTION | 2 +-
contrib/clojure-package/examples/bert/project.clj | 2 +-
contrib/clojure-package/examples/captcha/project.clj | 2 +-
.../examples/cnn-text-classification/project.clj | 2 +-
contrib/clojure-package/examples/gan/project.clj | 4 ++--
contrib/clojure-package/examples/imclassification/project.clj | 2 +-
.../clojure-package/examples/infer/imageclassifier/project.clj | 2 +-
.../clojure-package/examples/infer/objectdetector/project.clj | 2 +-
contrib/clojure-package/examples/infer/predictor/project.clj | 2 +-
contrib/clojure-package/examples/module/project.clj | 2 +-
contrib/clojure-package/examples/multi-label/project.clj | 2 +-
contrib/clojure-package/examples/neural-style/project.clj | 4 ++--
.../clojure-package/examples/pre-trained-models/project.clj | 2 +-
contrib/clojure-package/examples/profiler/project.clj | 2 +-
contrib/clojure-package/examples/rnn/project.clj | 2 +-
contrib/clojure-package/examples/tutorial/project.clj | 2 +-
contrib/clojure-package/examples/visualization/project.clj | 2 +-
contrib/clojure-package/project.clj | 2 +-
include/mxnet/base.h | 2 +-
julia/NEWS.md | 3 +++
python/mxnet/libinfo.py | 2 +-
scala-package/README.md | 10 +++++-----
scala-package/mxnet-demo/java-demo/README.md | 4 ++--
scala-package/mxnet-demo/java-demo/pom.xml | 6 +++---
scala-package/mxnet-demo/scala-demo/pom.xml | 2 +-
snapcraft.yaml | 2 +-
26 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION
index 06a9bb0..7dadb48 100644
--- a/R-package/DESCRIPTION
+++ b/R-package/DESCRIPTION
@@ -1,7 +1,7 @@
Package: mxnet
Type: Package
Title: MXNet: A Flexible and Efficient Machine Learning Library for
Heterogeneous Distributed Systems
-Version: 1.6.0
+Version: 1.7.0
Date: 2017-06-27
Author: Tianqi Chen, Qiang Kou, Tong He, Anirudh Acharya
<https://github.com/anirudhacharya>
Maintainer: Qiang Kou <[email protected]>
diff --git a/contrib/clojure-package/examples/bert/project.clj
b/contrib/clojure-package/examples/bert/project.clj
index 44ae4d5..3339f02 100644
--- a/contrib/clojure-package/examples/bert/project.clj
+++ b/contrib/clojure-package/examples/bert/project.clj
@@ -23,7 +23,7 @@
;;; so if you run into trouble please delete the `lein-juptyter`
plugin
[lein-jupyter "0.1.16" :exclusions [org.clojure/tools.nrepl
org.clojure/clojure org.codehaus.plexus/plexus-utils org.clojure/tools.reader]]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]
[cheshire "5.8.1"]
[clojure-csv/clojure-csv "2.0.1"]]
:pedantic? :skip
diff --git a/contrib/clojure-package/examples/captcha/project.clj
b/contrib/clojure-package/examples/captcha/project.clj
index 795f3fe..c0e00f1 100644
--- a/contrib/clojure-package/examples/captcha/project.clj
+++ b/contrib/clojure-package/examples/captcha/project.clj
@@ -19,7 +19,7 @@
:description "Captcha recognition via multi-label classification"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:main ^:skip-aot captcha.train-ocr
:profiles {:train {:main captcha.train-ocr}
:infer {:main captcha.infer-ocr}
diff --git
a/contrib/clojure-package/examples/cnn-text-classification/project.clj
b/contrib/clojure-package/examples/cnn-text-classification/project.clj
index 1b8859f..0eb3126 100644
--- a/contrib/clojure-package/examples/cnn-text-classification/project.clj
+++ b/contrib/clojure-package/examples/cnn-text-classification/project.clj
@@ -19,6 +19,6 @@
:description "CNN text classification with MXNet"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:pedantic? :skip
:main cnn-text-classification.classifier)
diff --git a/contrib/clojure-package/examples/gan/project.clj
b/contrib/clojure-package/examples/gan/project.clj
index 4048b0c..8911502 100644
--- a/contrib/clojure-package/examples/gan/project.clj
+++ b/contrib/clojure-package/examples/gan/project.clj
@@ -20,7 +20,7 @@
:plugins [[lein-cljfmt "0.5.7"]]
:repositories [["vendredi" {:url
"https://repository.hellonico.info/repository/hellonico/"}]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]
[origami "4.0.0-3"]
]
- :main gan.gan-mnist)
\ No newline at end of file
+ :main gan.gan-mnist)
diff --git a/contrib/clojure-package/examples/imclassification/project.clj
b/contrib/clojure-package/examples/imclassification/project.clj
index 702a33d..439d14c 100644
--- a/contrib/clojure-package/examples/imclassification/project.clj
+++ b/contrib/clojure-package/examples/imclassification/project.clj
@@ -19,6 +19,6 @@
:description "Clojure examples for image classification"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:pedantic? :skip
:main imclassification.train-mnist)
diff --git a/contrib/clojure-package/examples/infer/imageclassifier/project.clj
b/contrib/clojure-package/examples/infer/imageclassifier/project.clj
index dcca598..76cfb10 100644
--- a/contrib/clojure-package/examples/infer/imageclassifier/project.clj
+++ b/contrib/clojure-package/examples/infer/imageclassifier/project.clj
@@ -20,6 +20,6 @@
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.clojure/tools.cli "0.4.1"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:main ^:skip-aot infer.imageclassifier-example
:profiles {:uberjar {:aot :all}})
diff --git a/contrib/clojure-package/examples/infer/objectdetector/project.clj
b/contrib/clojure-package/examples/infer/objectdetector/project.clj
index 1d29be2..73f749a 100644
--- a/contrib/clojure-package/examples/infer/objectdetector/project.clj
+++ b/contrib/clojure-package/examples/infer/objectdetector/project.clj
@@ -22,6 +22,6 @@
:aliases {"run-detector" ["run" "--" "-m"
"models/resnet50_ssd/resnet50_ssd_model" "-i" "images/dog.jpg" "-d" "images/"]}
:dependencies [[org.clojure/clojure "1.9.0"]
[org.clojure/tools.cli "0.4.1"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:main ^:skip-aot infer.objectdetector-example
:profiles {:uberjar {:aot :all}})
diff --git a/contrib/clojure-package/examples/infer/predictor/project.clj
b/contrib/clojure-package/examples/infer/predictor/project.clj
index 936d917..4bbc9bf 100644
--- a/contrib/clojure-package/examples/infer/predictor/project.clj
+++ b/contrib/clojure-package/examples/infer/predictor/project.clj
@@ -20,6 +20,6 @@
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.clojure/tools.cli "0.4.1"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:main ^:skip-aot infer.predictor-example
:profiles {:uberjar {:aot :all}})
diff --git a/contrib/clojure-package/examples/module/project.clj
b/contrib/clojure-package/examples/module/project.clj
index 83519e8..42e6ab0 100644
--- a/contrib/clojure-package/examples/module/project.clj
+++ b/contrib/clojure-package/examples/module/project.clj
@@ -19,7 +19,7 @@
:description "Clojure examples for module"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:pedantic? :skip
:main mnist-mlp)
diff --git a/contrib/clojure-package/examples/multi-label/project.clj
b/contrib/clojure-package/examples/multi-label/project.clj
index d9ec86e..197fc3c 100644
--- a/contrib/clojure-package/examples/multi-label/project.clj
+++ b/contrib/clojure-package/examples/multi-label/project.clj
@@ -19,5 +19,5 @@
:description "Example of multi-label classification"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:main multi-label.core)
diff --git a/contrib/clojure-package/examples/neural-style/project.clj
b/contrib/clojure-package/examples/neural-style/project.clj
index 32a640b..9861216 100644
--- a/contrib/clojure-package/examples/neural-style/project.clj
+++ b/contrib/clojure-package/examples/neural-style/project.clj
@@ -20,6 +20,6 @@
:plugins [[lein-cljfmt "0.5.7"]]
:repositories [["vendredi" {:url
"https://repository.hellonico.info/repository/hellonico/"}]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]
[origami "4.0.0-3"]]
- :main neural-style.core)
\ No newline at end of file
+ :main neural-style.core)
diff --git a/contrib/clojure-package/examples/pre-trained-models/project.clj
b/contrib/clojure-package/examples/pre-trained-models/project.clj
index 07e0f77..e04093e 100644
--- a/contrib/clojure-package/examples/pre-trained-models/project.clj
+++ b/contrib/clojure-package/examples/pre-trained-models/project.clj
@@ -21,6 +21,6 @@
:repositories [["vendredi" {:url
"https://repository.hellonico.info/repository/hellonico/"}]]
:aliases {"predict-image" ["run" "-m" "pre-trained-models.predict-image" ]}
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]
[origami "4.0.0-3"]]
:main pre-trained-models.fine-tune)
diff --git a/contrib/clojure-package/examples/profiler/project.clj
b/contrib/clojure-package/examples/profiler/project.clj
index b5c737b..fd8b63e 100644
--- a/contrib/clojure-package/examples/profiler/project.clj
+++ b/contrib/clojure-package/examples/profiler/project.clj
@@ -18,5 +18,5 @@
(defproject profiler "0.1.0-SNAPSHOT"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:main profiler.core)
diff --git a/contrib/clojure-package/examples/rnn/project.clj
b/contrib/clojure-package/examples/rnn/project.clj
index ffbae5d..fe1d2f2 100644
--- a/contrib/clojure-package/examples/rnn/project.clj
+++ b/contrib/clojure-package/examples/rnn/project.clj
@@ -19,5 +19,5 @@
:description "RNN example"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:main rnn.train-char-rnn)
diff --git a/contrib/clojure-package/examples/tutorial/project.clj
b/contrib/clojure-package/examples/tutorial/project.clj
index 6bb77bd..a48a91e 100644
--- a/contrib/clojure-package/examples/tutorial/project.clj
+++ b/contrib/clojure-package/examples/tutorial/project.clj
@@ -19,7 +19,7 @@
:description "MXNET tutorials"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
-
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.6.0-SNAPSHOT"]
+
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]
;; Uncomment the one appropriate for your machine &
configuration:
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu
"1.4.0"]
diff --git a/contrib/clojure-package/examples/visualization/project.clj
b/contrib/clojure-package/examples/visualization/project.clj
index dae6191..1492b41 100644
--- a/contrib/clojure-package/examples/visualization/project.clj
+++ b/contrib/clojure-package/examples/visualization/project.clj
@@ -19,5 +19,5 @@
:description "Visualization example"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
- [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.6.0-SNAPSHOT"]]
+ [org.apache.mxnet.contrib.clojure/clojure-mxnet
"1.7.0-SNAPSHOT"]]
:main visualization.core)
diff --git a/contrib/clojure-package/project.clj
b/contrib/clojure-package/project.clj
index 718fbf6..8595a4b 100644
--- a/contrib/clojure-package/project.clj
+++ b/contrib/clojure-package/project.clj
@@ -15,7 +15,7 @@
;; limitations under the License.
;;
-(defproject org.apache.mxnet.contrib.clojure/clojure-mxnet "1.6.0-SNAPSHOT"
+(defproject org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"
:description "Clojure package for MXNet"
:url "https://github.com/apache/incubator-mxnet";
:license {:name "Apache License"
diff --git a/include/mxnet/base.h b/include/mxnet/base.h
index 4e47e03..4785295 100644
--- a/include/mxnet/base.h
+++ b/include/mxnet/base.h
@@ -73,7 +73,7 @@
/*! \brief major version */
#define MXNET_MAJOR 1
/*! \brief minor version */
-#define MXNET_MINOR 6
+#define MXNET_MINOR 7
/*! \brief patch version */
#define MXNET_PATCH 0
/*! \brief mxnet version */
diff --git a/julia/NEWS.md b/julia/NEWS.md
index 8f5efbb..9b2fe82 100644
--- a/julia/NEWS.md
+++ b/julia/NEWS.md
@@ -15,6 +15,9 @@
<!--- specific language governing permissions and limitations -->
<!--- under the License. -->
+# v1.7.0
+
+
# v1.6.0
* Add an abstract type `AbstractMXError` as the parent type for all
MXNet-related
diff --git a/python/mxnet/libinfo.py b/python/mxnet/libinfo.py
index 4ee86c3..30b0d82 100644
--- a/python/mxnet/libinfo.py
+++ b/python/mxnet/libinfo.py
@@ -141,4 +141,4 @@ def find_conf_path(prefix='tvmop'):
# current version
-__version__ = "1.6.0"
+__version__ = "1.7.0"
diff --git a/scala-package/README.md b/scala-package/README.md
index b1a5aa4..9d05724 100644
--- a/scala-package/README.md
+++ b/scala-package/README.md
@@ -101,7 +101,7 @@ Also, add the dependency which corresponds to your platform
to the ```dependenci
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full_2.11-linux-x86_64-gpu</artifactId>
- <version>[1.6.0-SNAPSHOT,)</version>
+ <version>[1.7.0-SNAPSHOT,)</version>
</dependency>
```
@@ -113,7 +113,7 @@ Also, add the dependency which corresponds to your platform
to the ```dependenci
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full_2.11-linux-x86_64-cpu</artifactId>
- <version>[1.6.0-SNAPSHOT,)</version>
+ <version>[1.7.0-SNAPSHOT,)</version>
</dependency>
```
@@ -124,11 +124,11 @@ Also, add the dependency which corresponds to your
platform to the ```dependenci
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full_2.11-osx-x86_64-cpu</artifactId>
- <version>[1.6.0-SNAPSHOT,)</version>
+ <version>[1.7.0-SNAPSHOT,)</version>
</dependency>
```
-**Note:** ```<version>[1.6.0-SNAPSHOT,)</version>``` indicates that we will
fetch packages with version 1.6.0 or higher. This will always ensure that the
pom.xml is able to fetch the latest and greatest jar files from Maven Snapshot
repository.
+**Note:** ```<version>[1.7.0-SNAPSHOT,)</version>``` indicates that we will
fetch packages with version 1.7.0 or higher. This will always ensure that the
pom.xml is able to fetch the latest and greatest jar files from Maven Snapshot
repository.
Build From Source
-----------------
@@ -186,7 +186,7 @@ Adding the following configuration in `pom.xml`
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full_2.11-INTERNAL</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0</version>
<scope>system</scope>
<systemPath>path_to_jar/mxnet-full_2.11-INTERNAL.jar</systemPath>
</dependency>
diff --git a/scala-package/mxnet-demo/java-demo/README.md
b/scala-package/mxnet-demo/java-demo/README.md
index 40a9a4e..2f58499 100644
--- a/scala-package/mxnet-demo/java-demo/README.md
+++ b/scala-package/mxnet-demo/java-demo/README.md
@@ -120,5 +120,5 @@ sudo apt install libopencv-imgcodecs3.4
Is there any other version available?
-You can find nightly release version from
[here](https://repository.apache.org/#nexus-search;gav~org.apache.mxnet~~1.6.0-SNAPSHOT~~).
-Please keep the same version in the pom file or [other versions in
here](https://repository.apache.org/#nexus-search;gav~org.apache.mxnet~~~~) to
run this demo.
\ No newline at end of file
+You can find nightly release version from
[here](https://repository.apache.org/#nexus-search;gav~org.apache.mxnet~~1.7.0-SNAPSHOT~~).
+Please keep the same version in the pom file or [other versions in
here](https://repository.apache.org/#nexus-search;gav~org.apache.mxnet~~~~) to
run this demo.
diff --git a/scala-package/mxnet-demo/java-demo/pom.xml
b/scala-package/mxnet-demo/java-demo/pom.xml
index a8337b1..f6936b6 100644
--- a/scala-package/mxnet-demo/java-demo/pom.xml
+++ b/scala-package/mxnet-demo/java-demo/pom.xml
@@ -27,7 +27,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <mxnet.version>[1.6.0-SNAPSHOT, )</mxnet.version>
+ <mxnet.version>[1.7.0-SNAPSHOT, )</mxnet.version>
<mxnet.scalaprofile>2.11</mxnet.scalaprofile>
</properties>
@@ -41,7 +41,7 @@
</repository>
</repositories>
<properties>
- <mxnet.version>[1.6.0-SNAPSHOT, )</mxnet.version>
+ <mxnet.version>[1.7.0-SNAPSHOT, )</mxnet.version>
</properties>
</profile>
<profile>
@@ -114,4 +114,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/scala-package/mxnet-demo/scala-demo/pom.xml
b/scala-package/mxnet-demo/scala-demo/pom.xml
index 8fab50e..72dbc1b 100644
--- a/scala-package/mxnet-demo/scala-demo/pom.xml
+++ b/scala-package/mxnet-demo/scala-demo/pom.xml
@@ -35,7 +35,7 @@
</repository>
</repositories>
<properties>
- <mxnet.version>[1.6.0-SNAPSHOT, )</mxnet.version>
+ <mxnet.version>[1.7.0-SNAPSHOT, )</mxnet.version>
</properties>
</profile>
<profile>
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 5e03a09..6a60486 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -16,7 +16,7 @@
# under the License.
name: mxnet
-version: '1.6.0'
+version: '1.7.0'
summary: MXNet is a deep learning framework designed for efficiency and
flexibility.
description: |
MXNet is a deep learning framework designed for both efficiency and
