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

Commit

Permalink
Bump version number (#14841)
Browse files Browse the repository at this point in the history
  • Loading branch information
junrushao authored and szha committed Apr 30, 2019
1 parent 69515c2 commit 1a71996
Show file tree
Hide file tree
Showing 56 changed files with 90 additions and 90 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.4.0
Version: 1.4.1
Date: 2017-06-27
Author: Tianqi Chen, Qiang Kou, Tong He
Maintainer: Qiang Kou <[email protected]>
Expand Down
16 changes: 8 additions & 8 deletions contrib/clojure-package/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ brew install opencv
- Create a new project with `lein new my-mxnet`
- Edit your `project.clj` and add one of the following entries to `:dependencies`, based on your system and the compute device you want to use:

- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu "1.4.0"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.4.0"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.4.0"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu "1.4.1"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.4.1"]`
- `[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.4.1"]`

After making this change and running `lein deps`, you should be able to run example code like this [NDArray Tutorial](https://github.com/apache/incubator-mxnet/blob/master/contrib/clojure-package/examples/tutorial/src/tutorial/ndarray.clj).

Expand All @@ -133,20 +133,20 @@ After making this change and running `lein deps`, you should be able to run exam
With this option, you will install a Git revision of the Clojure package source and a [Scala package jar from Maven](https://search.maven.org/search?q=g:org.apache.mxnet) with native dependencies baked in.

- Install additional dependencies as described in [the corresponding section for Option 1](#installing-additional-dependencies),
- Recursively clone the MXNet repository and checkout the desired revision. Here we assume the `1.4.0` tag and a clone into the `~/mxnet` directory:
- Recursively clone the MXNet repository and checkout the desired revision. Here we assume the `1.4.1` tag and a clone into the `~/mxnet` directory:

```bash
git clone --recursive https://github.com/apache/incubator-mxnet.git ~/mxnet
cd ~/mxnet
git tag --list # Find the tag that matches the Scala package version
git checkout tags/1.4.0 -b my_mxnet
git checkout tags/1.4.1 -b my_mxnet
git submodule update --init --recursive
cd contrib/clojure
```

- Edit `project.clj` to include the desired Scala jar from Maven:

[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-cpu "1.4.0”]
[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-cpu "1.4.1”]

- Run `lein test`. All the tests should run without error.
- At this point you can run `lein install` to build and install the Clojure jar locally.
Expand All @@ -164,7 +164,7 @@ The first step is to recursively clone the MXNet repository and checkout the des
```bash
git clone --recursive https://github.com/apache/incubator-mxnet.git ~/mxnet
cd ~/mxnet
git checkout tags/1.4.0 -b my_mxnet # this is optional
git checkout tags/1.4.1 -b my_mxnet # this is optional
git submodule update --init --recursive
```

Expand Down Expand Up @@ -193,7 +193,7 @@ The outcome of this step will be a shared library `lib/libmxnet.so` that is used

#### Building the Clojure jar

- Enter the `contrib/clojure` directory and edit the `project.clj` file. Add the Scala jar that was just created and installed, e.g., `[org.apache.mxnet/mxnet-full_2.11-osx-x86_64-cpu "1.4.0-SNAPSHOT"]`, to the `:dependencies`.
- Enter the `contrib/clojure` directory and edit the `project.clj` file. Add the Scala jar that was just created and installed, e.g., `[org.apache.mxnet/mxnet-full_2.11-osx-x86_64-cpu "1.4.1-SNAPSHOT"]`, to the `:dependencies`.
- Run `lein test`. All the tests should run without an error.
- Run `lein install` to build and install the Clojure jar locally.

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.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-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 @@ -19,6 +19,6 @@
:description "GAN MNIST with MXNet"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-SNAPSHOT"]
[nu.pattern/opencv "2.4.9-7"]]
: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.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-SNAPSHOT"]]
:pedantic? :skip
:main imclassification.train-mnist)
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.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-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.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-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 @@ -19,7 +19,7 @@
:description "Neural Style Transfer with MXNet"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-SNAPSHOT"]
[net.mikera/imagez "0.12.0"]
[thinktopic/think.image "0.4.16"]]
:main neural-style.core)
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
:description "Example of using pre-trained models with MXNet"
:plugins [[lein-cljfmt "0.5.7"]]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.0-SNAPSHOT"]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-SNAPSHOT"]
[net.mikera/imagez "0.12.0"]
[thinktopic/think.image "0.4.16"]]
: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.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-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.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-SNAPSHOT"]]
:main rnn.train-char-rnn)
6 changes: 3 additions & 3 deletions contrib/clojure-package/examples/tutorial/project.clj
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"]
;; Uncomment the one appropriate for your machine & configuration:
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu "1.4.0"]
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.4.0"]
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.4.0"]])
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-cpu "1.4.1"]
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.4.1"]
#_[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.4.1"]])
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.4.0-SNAPSHOT"]]
[org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-SNAPSHOT"]]
:main visualization.core)
4 changes: 2 additions & 2 deletions 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.4.0-SNAPSHOT"
(defproject org.apache.mxnet.contrib.clojure/clojure-mxnet "1.4.1-SNAPSHOT"
:description "Clojure package for MXNet"
:url "https://github.com/apache/incubator-mxnet"
:license {:name "Apache License"
Expand All @@ -29,7 +29,7 @@
;[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-gpu "1.2.1"]

;;; CI
[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-cpu "1.4.0-SNAPSHOT"]
[org.apache.mxnet/mxnet-full_2.11-linux-x86_64-cpu "1.4.1-SNAPSHOT"]

[org.clojure/tools.logging "0.4.0"]
[org.apache.logging.log4j/log4j-core "2.8.1"]
Expand Down
4 changes: 2 additions & 2 deletions docs/tutorials/scala/mxnet_scala_on_intellij.md
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,14 @@ If you chose to "Build from Source" when following the [install instructions](ht
<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.4.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-1.4.1-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.4.0-SNAPSHOT.jar</systemPath>
<systemPath>/PathToMXNetSource/incubator-mxnet/scala-package/assembly/osx-x86_64-cpu/target/mxnet-full_${scala.version}-osx-x86_64-cpu-1.4.1-SNAPSHOT.jar</systemPath>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion include/mxnet/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
/*! \brief minor version */
#define MXNET_MINOR 4
/*! \brief patch version */
#define MXNET_PATCH 0
#define MXNET_PATCH 1
/*! \brief mxnet version */
#define MXNET_VERSION (MXNET_MAJOR*10000 + MXNET_MINOR*100 + MXNET_PATCH)
/*! \brief helper for making version number */
Expand Down
2 changes: 1 addition & 1 deletion python/mxnet/libinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@ def find_include_path():


# current version
__version__ = "1.4.0"
__version__ = "1.4.1"
8 changes: 4 additions & 4 deletions scala-package/assembly/linux-x86_64-cpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -34,18 +34,18 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-linux-x86_64-cpu</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<type>so</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
8 changes: 4 additions & 4 deletions scala-package/assembly/linux-x86_64-gpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -34,18 +34,18 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-linux-x86_64-gpu</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<type>so</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
8 changes: 4 additions & 4 deletions scala-package/assembly/osx-x86_64-cpu/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-full-parent_2.11</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -34,18 +34,18 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>libmxnet-scala-osx-x86_64-cpu</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<type>jnilib</type>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion scala-package/assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion scala-package/assembly/src/javadoc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
</binaries>
</moduleSet>
</moduleSets>
</assembly>
</assembly>
2 changes: 1 addition & 1 deletion scala-package/assembly/src/source.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@
</sources>
</moduleSet>
</moduleSets>
</assembly>
</assembly>
6 changes: 3 additions & 3 deletions scala-package/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -116,13 +116,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-init_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-macros_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions scala-package/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-parent_2.11</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -165,13 +165,13 @@
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-core_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.mxnet</groupId>
<artifactId>mxnet-infer_${scala.binary.version}</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion scala-package/examples/scripts/run_train_mnist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ java -XX:+PrintGC -Dmxnet.traceLeakedObjects=false -cp $CLASS_PATH \
--network mlp \
--num-layers 50 \
--num-epochs 10000000 \
--batch-size 1024
--batch-size 1024
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ Probability : 0.30337515 Class : n02123159 tiger cat
Predict with NDArray
Probability : 0.30337515 Class : n02123159 tiger cat
```
the outputs come from the the input image, with top1 predictions picked.
the outputs come from the the input image, with top1 predictions picked.
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ I used the SLIM version, you can try with the full version to see if the accurac
https://s3.us-east-2.amazonaws.com/mxnet-scala/scala-example-ci/CNN/GoogleNews-vectors-negative300-SLIM.bin
```
### Train the model
Please configure the [args](https://github.com/apache/incubator-mxnet/blob/scala-package/examples/src/main/scala/org/apache/mxnet/examples/cnntextclassification/CNNTextClassification.scala#L299-L312) required for the model here and then run it.
Please configure the [args](https://github.com/apache/incubator-mxnet/blob/scala-package/examples/src/main/scala/org/apache/mxnet/examples/cnntextclassification/CNNTextClassification.scala#L299-L312) required for the model here and then run it.
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ Then you need to define the arguments that you would like to pass in the model:
--data-path <location of your downloaded file>
```

you can find more in [here](https://github.com/apache/incubator-mxnet/blob/scala-package/examples/src/main/scala/org/apache/mxnet/examples/customop/ExampleCustomOp.scala#L218-L221)
you can find more in [here](https://github.com/apache/incubator-mxnet/blob/scala-package/examples/src/main/scala/org/apache/mxnet/examples/customop/ExampleCustomOp.scala#L218-L221)
Loading

0 comments on commit 1a71996

Please sign in to comment.