Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

bump up 1.x branch to 1.7.0 #17741

Merged
merged 2 commits into from
Mar 3, 2020
Merged

bump up 1.x branch to 1.7.0 #17741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f26d37
bump up 1.x branch to 1.7.0
szha Mar 2, 2020
6ea26a4
bump version for clojure
szha Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R-package/DESCRIPTION
View file
Open in desktop
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.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]>
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/bert/project.clj
View file
Open in desktop
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.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
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/captcha/project.clj
View file
Open in desktop
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.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}
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/cnn-text-classification/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:pedantic? :skip
:main cnn-text-classification.classifier)
4 changes: 2 additions & 2 deletions contrib/clojure-package/examples/gan/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]
[origami "4.0.0-3"]
]
:main gan.gan-mnist)
:main gan.gan-mnist)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/imclassification/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:pedantic? :skip
:main imclassification.train-mnist)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/infer/imageclassifier/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:main ^:skip-aot infer.imageclassifier-example
:profiles {:uberjar {:aot :all}})
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/infer/objectdetector/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:main ^:skip-aot infer.objectdetector-example
:profiles {:uberjar {:aot :all}})
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/infer/predictor/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.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
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:pedantic? :skip
:main mnist-mlp)

2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/multi-label/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:main multi-label.core)
4 changes: 2 additions & 2 deletions contrib/clojure-package/examples/neural-style/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]
[origami "4.0.0-3"]]
:main neural-style.core)
:main neural-style.core)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/pre-trained-models/project.clj
View file
Open in desktop
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.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)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/profiler/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:main profiler.core)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/rnn/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:main rnn.train-char-rnn)
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/tutorial/project.clj
View file
Open in desktop
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.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"]
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/examples/visualization/project.clj
View file
Open in desktop
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.6.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.7.0-SNAPSHOT"]]
:main visualization.core)
2 changes: 1 addition & 1 deletion contrib/clojure-package/project.clj
View file
Open in desktop
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.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"
Expand Down
2 changes: 1 addition & 1 deletion include/mxnet/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 3 additions & 0 deletions julia/NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/mxnet/libinfo.py
View file
Open in desktop
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.6.0"
__version__ = "1.7.0"
10 changes: 5 additions & 5 deletions scala-package/README.md
View file
Open in desktop
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.6.0-SNAPSHOT,)</version>
<version>[1.7.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.6.0-SNAPSHOT,)</version>
<version>[1.7.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.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
-----------------
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.6.0</version>
<version>1.7.0</version>
<scope>system</scope>
<systemPath>path_to_jar/mxnet-full_2.11-INTERNAL.jar</systemPath>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions scala-package/mxnet-demo/java-demo/README.md
View file
Open in desktop
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.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.
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.
6 changes: 3 additions & 3 deletions scala-package/mxnet-demo/java-demo/pom.xml
View file
Open in desktop
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.6.0-SNAPSHOT, )</mxnet.version>
<mxnet.version>[1.7.0-SNAPSHOT, )</mxnet.version>
<mxnet.scalaprofile>2.11</mxnet.scalaprofile>
</properties>

Expand All @@ -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>
Expand Down Expand Up @@ -114,4 +114,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion scala-package/mxnet-demo/scala-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down