diff --git a/R-package/DESCRIPTION b/R-package/DESCRIPTION index 7dadb484650b..ab2a0b5cbd2c 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.7.0 +Version: 2.0.0 Date: 2017-06-27 Author: Tianqi Chen, Qiang Kou, Tong He, Anirudh Acharya Maintainer: Qiang Kou diff --git a/contrib/clojure-package/examples/bert/project.clj b/contrib/clojure-package/examples/bert/project.clj index 3339f02ec325..b53e0875951f 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.7.0-SNAPSHOT"] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 c0e00f1b70f4..7bc862c29e3d 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 0eb31263c5d7..5235027a71fb 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 8911502331f9..7ec497787680 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.7.0-SNAPSHOT"] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.0-SNAPSHOT"] [origami "4.0.0-3"] ] :main gan.gan-mnist) diff --git a/contrib/clojure-package/examples/imclassification/project.clj b/contrib/clojure-package/examples/imclassification/project.clj index 439d14c344ef..471c7f760de2 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 76cfb10d59c5..f04d76274fa1 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 73f749a6a7b3..6b24a4b4f9b1 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 4bbc9bfa57eb..bd05805aa6d4 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 42e6ab084066..04e7fa140a06 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 197fc3c22f38..c8573bfc2e94 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 986121605275..ff8784263207 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.7.0-SNAPSHOT"] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.0-SNAPSHOT"] [origami "4.0.0-3"]] :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 e04093ec9567..6eb387db6862 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.7.0-SNAPSHOT"] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 fd8b63e059d9..8428c5f200fd 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.0-SNAPSHOT"]] :main profiler.core) diff --git a/contrib/clojure-package/examples/rnn/project.clj b/contrib/clojure-package/examples/rnn/project.clj index fe1d2f2e7c7b..40c61eeedede 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 a48a91e17dba..743df5e62e7b 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.7.0-SNAPSHOT"] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.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 1492b4138ca0..c19e19d6fd02 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.7.0-SNAPSHOT"]] + [org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.0-SNAPSHOT"]] :main visualization.core) diff --git a/contrib/clojure-package/project.clj b/contrib/clojure-package/project.clj index 8595a4b2fe9e..0b0cf0b5a91d 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.7.0-SNAPSHOT" +(defproject org.apache.mxnet.contrib.clojure/clojure-mxnet "2.0.0-SNAPSHOT" :description "Clojure package for MXNet" :url "https://github.com/apache/incubator-mxnet" :license {:name "Apache License" diff --git a/docs/static_site/src/pages/api/scala/docs/tutorials/mxnet_scala_on_intellij.md b/docs/static_site/src/pages/api/scala/docs/tutorials/mxnet_scala_on_intellij.md index b71b457b1f10..79ae4d0cde4f 100644 --- a/docs/static_site/src/pages/api/scala/docs/tutorials/mxnet_scala_on_intellij.md +++ b/docs/static_site/src/pages/api/scala/docs/tutorials/mxnet_scala_on_intellij.md @@ -410,14 +410,14 @@ If you chose to "Build from Source" when following the [install instructions]({{ org.apache.mxnet mxnet-core_${scala.version}-${platform}-sources system - /PathToMXNetSource/incubator-mxnet/scala-package/assembly/osx-x86_64-cpu/target/mxnet-full_${scala.version}-osx-x86_64-cpu-1.6.0-SNAPSHOT-sources.jar + /PathToMXNetSource/incubator-mxnet/scala-package/assembly/osx-x86_64-cpu/target/mxnet-full_${scala.version}-osx-x86_64-cpu-2.0.0-SNAPSHOT-sources.jar org.apache.mxnet mxnet-full_${scala.version}-${platform} system - /PathToMXNetSource/incubator-mxnet/scala-package/assembly/osx-x86_64-cpu/target/mxnet-full_${scala.version}-osx-x86_64-cpu-1.6.0-SNAPSHOT.jar + /PathToMXNetSource/incubator-mxnet/scala-package/assembly/osx-x86_64-cpu/target/mxnet-full_${scala.version}-osx-x86_64-cpu-2.0.0-SNAPSHOT.jar ``` diff --git a/include/mxnet/base.h b/include/mxnet/base.h index 47852953655a..860028393e49 100644 --- a/include/mxnet/base.h +++ b/include/mxnet/base.h @@ -71,9 +71,9 @@ #endif /*! \brief major version */ -#define MXNET_MAJOR 1 +#define MXNET_MAJOR 2 /*! \brief minor version */ -#define MXNET_MINOR 7 +#define MXNET_MINOR 0 /*! \brief patch version */ #define MXNET_PATCH 0 /*! \brief mxnet version */ diff --git a/julia/NEWS.md b/julia/NEWS.md index 9b2fe8210b18..8f00b599f551 100644 --- a/julia/NEWS.md +++ b/julia/NEWS.md @@ -16,6 +16,7 @@ # v1.7.0 +# v2.0.0 # v1.6.0 diff --git a/python/mxnet/libinfo.py b/python/mxnet/libinfo.py index 30b0d82e810d..73338229c63c 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.7.0" +__version__ = "2.0.0" diff --git a/scala-package/README.md b/scala-package/README.md index 9d0572448cb9..2af27dfb8b0c 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 org.apache.mxnet mxnet-full_2.11-linux-x86_64-gpu - [1.7.0-SNAPSHOT,) + [2.0.0-SNAPSHOT,) ``` @@ -113,7 +113,7 @@ Also, add the dependency which corresponds to your platform to the ```dependenci org.apache.mxnet mxnet-full_2.11-linux-x86_64-cpu - [1.7.0-SNAPSHOT,) + [2.0.0-SNAPSHOT,) ``` @@ -124,11 +124,11 @@ Also, add the dependency which corresponds to your platform to the ```dependenci org.apache.mxnet mxnet-full_2.11-osx-x86_64-cpu - [1.7.0-SNAPSHOT,) + [2.0.0-SNAPSHOT,) ``` -**Note:** ```[1.7.0-SNAPSHOT,)``` 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. +**Note:** ```[2.0.0-SNAPSHOT,)``` indicates that we will fetch packages with version 2.0.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` org.apache.mxnet mxnet-full_2.11-INTERNAL - 1.7.0 + 2.0.0 system path_to_jar/mxnet-full_2.11-INTERNAL.jar diff --git a/scala-package/mxnet-demo/java-demo/README.md b/scala-package/mxnet-demo/java-demo/README.md index 2f5849982b0f..d265dde4f218 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.7.0-SNAPSHOT~~). +You can find nightly release version from [here](https://repository.apache.org/#nexus-search;gav~org.apache.mxnet~~2.0.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 f6936b64bdbe..d9d60a50055f 100644 --- a/scala-package/mxnet-demo/java-demo/pom.xml +++ b/scala-package/mxnet-demo/java-demo/pom.xml @@ -27,7 +27,7 @@ 1.8 1.8 - [1.7.0-SNAPSHOT, ) + [2.0.0-SNAPSHOT, ) 2.11 @@ -41,7 +41,7 @@ - [1.7.0-SNAPSHOT, ) + [2.0.0-SNAPSHOT, ) diff --git a/scala-package/mxnet-demo/scala-demo/pom.xml b/scala-package/mxnet-demo/scala-demo/pom.xml index 72dbc1b8d8e6..98653ec95370 100644 --- a/scala-package/mxnet-demo/scala-demo/pom.xml +++ b/scala-package/mxnet-demo/scala-demo/pom.xml @@ -35,7 +35,7 @@ - [1.7.0-SNAPSHOT, ) + [2.0.0-SNAPSHOT, ) diff --git a/scala-package/pom.xml b/scala-package/pom.xml index e1887d7c343b..9fdbd60306b1 100644 --- a/scala-package/pom.xml +++ b/scala-package/pom.xml @@ -57,7 +57,7 @@ 2.11.8 2.11 - 1.6.0 + 2.0.0 g++ $ diff --git a/snapcraft.yaml b/snapcraft.yaml index 6a6048642a29..896db372110d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -16,7 +16,7 @@ # under the License. name: mxnet -version: '1.7.0' +version: '2.0.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