This repository has been archived by the owner on Nov 17, 2023. It is now read-only.
Bumped minor version from 1.4.0 to 1.5.0 on master, updated License file #13478
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -218,16 +218,20 @@ | |
| 1. MXNet Cpp-package - For details, /cpp-package/LICENSE | ||
| 2. MXNet rcnn - For details, see, example/rcnn/LICENSE | ||
| 3. scala-package - For details, see, scala-package/LICENSE | ||
| 4. Warp-CTC - For details, see, 3rdparty/ctc_include/LICENSE | ||
| 5. 3rdparty/dlpack - For details, see, 3rdparty/dlpack/LICENSE | ||
| 6. 3rdparty/dmlc-core - For details, see, 3rdparty/dmlc-core/LICENSE | ||
| 7. 3rdparty/mshadow - For details, see, 3rdparty/mshadow/LICENSE | ||
| 8. 3rdparty/tvm - For details, see, 3rdparty/tvm/LICENSE | ||
| 9. 3rdparty/tvm/dmlc-core - For details, see, 3rdparty/tvm/dmlc-core/LICENSE | ||
| 10. 3rdparty/tvm/dlpack - For details, see, 3rdparty/tvm/3rdparty/dlpack/LICENSE | ||
| 11. 3rdparty/tvm/nnvm - For details, see, 3rdparty/tvm/nnvm/LICENSE | ||
| 12. 3rdparty/ps-lite - For details, see, 3rdparty/ps-lite/LICENSE | ||
| 13. 3rdparty/mkldnn - For details, see, 3rdparty/mkldnn/LICENSE | ||
| 14. googlemock scripts/generator - For details, see, 3rdparty/googletest/googlemock/scripts/generator/LICENSE | ||
| 15. clojure-package - For details, see, contrib/clojure-package/LICENSE | ||
| 16. R-package - For details, see, R-package/LICENSE | ||
| 17. ONNX-TensorRT benchmark package - For details, see, 3rdparty/onnx-tensorrt/third_party/onnx/third_party/benchmark/LICENSE | ||
|
|
||
|
|
||
| ======================================================================================= | ||
|
|
@@ -239,14 +243,17 @@ | |
| 3. tree_lstm - For details, see example/gluon/tree_lstm/LICENSE | ||
| 4. OpenMP - For details, see 3rdparty/openmp/LICENSE.txt | ||
| 5. HalideIR - For details, see nnvm/tvm/HalideIR/LICENSE | ||
| 6. HalideIR - For details, see 3rdparty/tvm/3rdparty/HalideIR/LICENSE | ||
| 7. ONNX-TensorRT - For details, see 3rdparty/onnx-tensorrt/LICENSE | ||
| 8. ONNX-TensorRT - For details, see 3rdparty/onnx-tensorrt/third_party/onnx/LICENSE | ||
|
|
||
|
|
||
| ======================================================================================= | ||
| NVIDIA Licenses | ||
| ======================================================================================= | ||
|
|
||
| 1. Moderngpu | ||
| For details, see, 3rdparty/ctc_include/contrib/moderngpu/LICENSE | ||
|
|
||
| /****************************************************************************** | ||
| * Redistribution and use in source and binary forms, with or without | ||
|
|
@@ -559,4 +566,79 @@ | |
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| ======================================================================================= | ||
|
|
||
| 12. Google tests | ||
| For details, ses, 3rdparty/mkldnn/tests/gtests/gtest/LICENSE | ||
|
|
||
| Copyright 2008, Google Inc. | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are | ||
| met: | ||
|
|
||
| * Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| * Redistributions in binary form must reproduce the above | ||
| copyright notice, this list of conditions and the following disclaimer | ||
| in the documentation and/or other materials provided with the | ||
| distribution. | ||
| * Neither the name of Google Inc. nor the names of its | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| ======================================================================================= | ||
|
|
||
| 13. ONNX python bindings | ||
| For details, see, 3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/LICENSE | ||
|
|
||
| Copyright (c) 2016 Wenzel Jakob <[email protected]>, All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
|
|
||
| 1. Redistributions of source code must retain the above copyright notice, this | ||
| list of conditions and the following disclaimer. | ||
|
|
||
| 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| this list of conditions and the following disclaimer in the documentation | ||
| and/or other materials provided with the distribution. | ||
|
|
||
| 3. Neither the name of the copyright holder nor the names of its contributors | ||
| may be used to endorse or promote products derived from this software | ||
| without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| You are under no obligation whatsoever to provide any bug fixes, patches, or | ||
| upgrades to the features, functionality or performance of the source code | ||
| ("Enhancements") to anyone; however, if you choose to make your Enhancements | ||
| available either publicly, or directly to the author of this software, without | ||
| imposing a separate written license agreement for such Enhancements, then you | ||
| hereby grant the following license: a non-exclusive, royalty-free perpetual | ||
| license to install, use, modify, prepare derivative works, incorporate into | ||
| other computer software, distribute, and sublicense such enhancements or | ||
| derivative works thereof, in binary and source code form. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Package: mxnet | ||
| Type: Package | ||
| Title: MXNet: A Flexible and Efficient Machine Learning Library for Heterogeneous Distributed Systems | ||
| Version: 1.5.0 | ||
| Date: 2017-06-27 | ||
| Author: Tianqi Chen, Qiang Kou, Tong He | ||
| Maintainer: Qiang Kou <[email protected]>, anirudhacharya <https://github.com/anirudhacharya> | ||
| Repository: Apache | ||
| Description: MXNet is a deep learning framework designed for both efficiency | ||
| and flexibility. It allows you to mix the flavours of deep learning programs | ||
| together to maximize the efficiency and your productivity. | ||
| License: Apache License (== 2.0) | ||
| URL: https://github.com/apache/incubator-mxnet/tree/master/R-package | ||
| BugReports: https://github.com/apache/incubator-mxnet/issues | ||
| Imports: | ||
| methods, | ||
| Rcpp (>= 0.12.1), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -629,9 +629,6 @@ build_ubuntu_gpu_cmake_mkldnn() { | |
| /work/mxnet | ||
|
|
||
| ninja -v | ||
| } | ||
|
|
||
| build_ubuntu_gpu_cmake() { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -105,9 +105,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.5.0"]` | ||
| - `[org.apache.mxnet.contrib.clojure/clojure-mxnet-linux-gpu "1.5.0"]` | ||
| - `[org.apache.mxnet.contrib.clojure/clojure-mxnet-osx-cpu "1.5.0"]` | ||
|
|
||
| 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). | ||
|
|
||
|
|
@@ -116,20 +116,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.5.0` 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.5.0 -b my_mxnet | ||
|
There was a problem hiding this comment. Neither 1.4.0 nor 1.5.0 tag exists. Why would you want to check out a different version? |
||
| 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.5.0”] | ||
|
There was a problem hiding this comment. should this point to the latest released version, i.e. 1.3.0 today and 1.3.1 after the patch is released? Or should it point to nightly build? There was a problem hiding this comment. It should point to the latest release on maven for the clojure jars. It would be great for the users if we can reliable tell that at the time of the merge, but if this process gets to be too confusing we can always reword it to stay explicitly that it should be the latest release https://search.maven.org/search?q=clojure%20mxnet - Let me know your thoughts. |
||
|
|
||
| - 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. | ||
|
|
@@ -147,7 +147,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.5.0 -b my_mxnet # this is optional | ||
|
There was a problem hiding this comment. Neither 1.4.0 nor 1.5.0 tag exists. 1.4.0 tag will point to a release in v1.4.x branch. Which should be the correct tag? Should it point to a release tag? There was a problem hiding this comment. It should point to the tag that corresponds to the jar on maven and the jars on maven are only for the last release. I'm assuming that it will be the 1.4.0 tag when this branch is merged (at least that's what I've been doing). For reference when I do I'm not exactly sure of the timing of when this PR is merged though .. is that a correct assumption? |
||
| git submodule update --init --recursive | ||
| ``` | ||
|
|
||
|
|
@@ -176,7 +176,7 @@ The outcome of this step will be a shared library `lib/libmxnet.so` that is used | |
|
|
||
| #### Building the Clojure jar | ||
|
|
||
|
There was a problem hiding this comment. This one is ok as we are building it There was a problem hiding this comment. Is this a build from v1.4.x or master branch? There was a problem hiding this comment. This one is from master (building from scratch) |
||
| - 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.5.0-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. | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should actually be the version deployed on maven which will always be a release behind. Sorry for not catching it earlier - see #13507 for details.
In this case it should be 1.4.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
only the CPU version or cpu, gpu and macos version need to be 1.4.0?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all the versions osx cpu, linux cpu, and linux gpu need to be the latest version out on maven https://search.maven.org/search?q=clojure%20mxnet at the time this PR gets merged. That timing is the thing I don't well understand. I am making an assumption at the time of the merge there will be a 1.4.0 release done and the jars will be out there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR is increasing the version on master to differentiate between v1.4.x branch. I would like to merge the PR asap, so we don't have same version on master and v1.4.x branch. v1.4.0 will become the first release on v1.4.x branch. If everything goes to plan, the release should be done before Xmas. The latest tag is now 1.3.1. Should all references point to this tag?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes - thanks for the clarification :)