Skip to content
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

Merged
merged 29 commits into from
Dec 5, 2018
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2cb8faf
updated to v1.5.0
srochel Nov 30, 2018
e4af8e7
Bumped minor version from 1.4.0 to 1.5.0 on master
srochel Nov 30, 2018
49bbcbc
added Anirudh as maintainer for R package
srochel Dec 2, 2018
42c6db0
Updated license file for clojure, onnx-tensorrt, gtest, R-package
srochel Dec 2, 2018
408a55d
Get the correct include path in pip package (#13452)
apeforest Nov 30, 2018
7b67d8f
Use ~/.ccache as default ccache directory so is not cache is not eras…
larroy Nov 30, 2018
f9e661e
Skip flaky test https://github.com/apache/incubator-mxnet/issues/1344…
ChaiBapchya Nov 30, 2018
b902878
Rewrite dataloader with process pool, improves responsiveness and rel…
zhreshold Nov 30, 2018
819a04a
Fix errors in docstrings for subgraph op; use code directive (#13463)
aaronmarkham Nov 30, 2018
ddf6980
[MXNET-1158] JVM Memory Management Documentation (#13105)
nswamy Nov 30, 2018
4d342ef
Update row_sparse tutorial (#13414)
eric-haibin-lin Nov 30, 2018
fb92a66
Add resiliency to onnx export code (#13426)
safrooze Nov 30, 2018
0bb26ac
[MXNET-1185] Support large array in several operators (part 1) (#13418)
apeforest Dec 1, 2018
aed3079
[MXNET-1210 ] Gluon Audio - Example (#13325)
gaurav-gireesh Dec 1, 2018
c9ddcb8
ONNX export: Instance normalization, Shape (#12920)
vandanavk Dec 1, 2018
9e74dfa
Clarify dependency on OpenCV in CNN Visualization tutorial. (#13495)
vishaalkapoor Dec 1, 2018
049107c
clarify ops faq regarding docs strings (#13492)
aaronmarkham Dec 1, 2018
80e2a1d
Add graph_compact operator. (#13436)
zheng-da Dec 1, 2018
1fd7558
Deprecate Jenkinsfile (#13474)
marcoabreu Dec 1, 2018
d8029c8
update github location for sampled_block.py (#13508)
srochel Dec 2, 2018
96f5beb
#13453 [Clojure] - Add Spec Validations to the Optimizer namespace (#…
hellonico Dec 2, 2018
09b6607
ONNX export: Logical operators (#12852)
vandanavk Dec 3, 2018
dd9d80c
Fix cmake options parsing in dev_menu (#13458)
larroy Dec 3, 2018
b901d52
Revert "Manually track num_max_thread (#12380)" (#13501)
anirudh2290 Dec 3, 2018
c44bc85
Feature/mkldnn static 2 (#13503)
azai91 Dec 3, 2018
41f3f98
fix toctree Sphinx errors (#13489)
aaronmarkham Dec 4, 2018
e533304
Disabled flaky test test_gluon_data.test_recordimage_dataset_with_dat…
jlcontreras Dec 4, 2018
7f3a591
[MXNET-1234] Fix shape inference problems in Activation backward (#13…
larroy Dec 4, 2018
a8e635d
Merge branch 'master' into master
srochel Dec 5, 2018
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
Prev Previous commit
Next Next commit
Updated license file for clojure, onnx-tensorrt, gtest, R-package
  • Loading branch information
srochel committed Dec 2, 2018
commit 42c6db0c933be4b1498d8c3e01bf24b5749d3921
94 changes: 88 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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, src/operator/contrib/ctc_include/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/nnvm - For details, see, 3rdparty/tvm/nnvm/LICENSE
11. 3rdparty/ps-lite - For details, see, 3rdparty/ps-lite/LICENSE
12. 3rdparty/mkldnn - For details, see, 3rdparty/mkldnn/LICENSE
13. googlemock scripts/generator - For details, see, 3rdparty/googletest/googlemock/scripts/generator/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


=======================================================================================
Expand All @@ -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, src/operator/contrib/ctc_include/contrib/moderngpu/LICENSE
For details, see, 3rdparty/ctc_include/contrib/moderngpu/LICENSE

/******************************************************************************
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -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.