Skip to content

Commit

Permalink
bump up master branch to 2.0 (apache#17739)
Browse files Browse the repository at this point in the history
* bump up master branch to 2.0

* Add additional update for Scala (apache#22)
  • Loading branch information
szha authored and anirudh2290 committed May 29, 2020
1 parent 3dd6745 commit 0325d94
Show file tree
Hide file tree
Showing 28 changed files with 35 additions and 34 deletions.
2 changes: 1 addition & 1 deletion R-package/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 <https://github.com/anirudhacharya>
Maintainer: Qiang Kou <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/bert/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/captcha/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/gan/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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}})
Original file line number Diff line number Diff line change
Expand Up @@ -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}})
Original file line number Diff line number Diff line change
Expand Up @@ -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}})
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/module/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/multi-label/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/neural-style/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/profiler/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/rnn/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/tutorial/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/visualization/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion contrib/clojure-package/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -410,14 +410,14 @@ If you chose to "Build from Source" when following the [install instructions]({{
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.version}-${platform}-sources</artifactId>
<scope>system</scope>
<systemPath>/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</systemPath>
<systemPath>/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</systemPath>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full_${scala.version}-${platform}</artifactId>
<scope>system</scope>
<systemPath>/PathToMXNetSource/incubator-mxnet/scala-package/assembly/osx-x86_64-cpu/target/mxnet-full_${scala.version}-osx-x86_64-cpu-1.6.0-SNAPSHOT.jar</systemPath>
<systemPath>/PathToMXNetSource/incubator-mxnet/scala-package/assembly/osx-x86_64-cpu/target/mxnet-full_${scala.version}-osx-x86_64-cpu-2.0.0-SNAPSHOT.jar</systemPath>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions include/mxnet/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
1 change: 1 addition & 0 deletions julia/NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<!--- under the License. -->

# v1.7.0
# v2.0.0


# v1.6.0
Expand Down
2 changes: 1 addition & 1 deletion python/mxnet/libinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,4 @@ def find_conf_path(prefix='tvmop'):


# current version
__version__ = "1.7.0"
__version__ = "2.0.0"
10 changes: 5 additions & 5 deletions scala-package/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.0-SNAPSHOT,)</version>
<version>[2.0.0-SNAPSHOT,)</version>
</dependency>
```

Expand All @@ -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.7.0-SNAPSHOT,)</version>
<version>[2.0.0-SNAPSHOT,)</version>
</dependency>
```

Expand All @@ -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.7.0-SNAPSHOT,)</version>
<version>[2.0.0-SNAPSHOT,)</version>
</dependency>
```

**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.
**Note:** ```<version>[2.0.0-SNAPSHOT,)</version>``` 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
-----------------
Expand Down Expand Up @@ -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.7.0</version>
<version>2.0.0</version>
<scope>system</scope>
<systemPath>path_to_jar/mxnet-full_2.11-INTERNAL.jar</systemPath>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion scala-package/mxnet-demo/java-demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions scala-package/mxnet-demo/java-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<mxnet.version>[1.7.0-SNAPSHOT, )</mxnet.version>
<mxnet.version>[2.0.0-SNAPSHOT, )</mxnet.version>
<mxnet.scalaprofile>2.11</mxnet.scalaprofile>
</properties>

Expand All @@ -41,7 +41,7 @@
</repository>
</repositories>
<properties>
<mxnet.version>[1.7.0-SNAPSHOT, )</mxnet.version>
<mxnet.version>[2.0.0-SNAPSHOT, )</mxnet.version>
</properties>
</profile>
<profile>
Expand Down
2 changes: 1 addition & 1 deletion scala-package/mxnet-demo/scala-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</repository>
</repositories>
<properties>
<mxnet.version>[1.7.0-SNAPSHOT, )</mxnet.version>
<mxnet.version>[2.0.0-SNAPSHOT, )</mxnet.version>
</properties>
</profile>
<profile>
Expand Down
2 changes: 1 addition & 1 deletion scala-package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<scala.version>2.11.8</scala.version>
<build.platform/>
<scala.binary.version>2.11</scala.binary.version>
<base.revision>1.6.0</base.revision>
<base.revision>2.0.0</base.revision>
<build.platform />
<cxx>g++</cxx>
<dollar>$</dollar>
Expand Down
2 changes: 1 addition & 1 deletion snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0325d94

Please sign in to comment.