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

Commit

Permalink
[v1.9.x] Backport - License updates per ASF feedback (#20377) (#20386)
Browse files Browse the repository at this point in the history
* [v1.x] License updates per ASF feedback (#20377)

* switch to DISCLAIMER (#20242)

Signed-off-by: Sheng Zha <zhasheng@amazon.com>

* Don't distribute 3rdparty/googletest/ci in source archive.

* Add reference in LICENSE to symlinks in include/mkldnn that point to 3rdparty/mkldnn.

* Do not distribute docs/ subdir in source archive.

* Remove references to docs from LICENSE (since they are no longer distributed in source archive,) and remove SIL open font license and reference in LICENSE.

Co-authored-by: Sheng Zha <szha@users.noreply.github.com>
Co-authored-by: Joe Evans <joeev@amazon.com>

* Merge in Zhaoqi's ONNX license changes.

Co-authored-by: Sheng Zha <szha@users.noreply.github.com>
Co-authored-by: Joe Evans <joeev@amazon.com>
  • Loading branch information
3 people committed Jun 29, 2021
1 parent 3807cb5 commit d0c2a94
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 137 deletions.
10 changes: 10 additions & 0 deletions DISCLAIMER
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Apache MXNet is an effort undergoing incubation at
The Apache Software Foundation (ASF), sponsored by the name of Apache Incubator PMC.

Incubation is required of all newly accepted projects until a further review
indicates that the infrastructure, communications, and decision making process
have stabilized in a manner consistent with other successful ASF projects.

While incubation status is not necessarily a reflection of the completeness
or stability of the code, it does indicate that the project has yet to be fully
endorsed by the ASF.
25 changes: 0 additions & 25 deletions DISCLAIMER-WIP

This file was deleted.

15 changes: 4 additions & 11 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,12 @@
3rdparty/tvm/3rdparty/dlpack
3rdparty/ps-lite
3rdparty/mkldnn
include/mkldnn (header symlinks to 3rdparty/mkldnn)
3rdparty/googletest/googlemock/scripts/generator
3rdparty/onnx-tensorrt/third_party/onnx/third_party/benchmark
3rdparty/mkldnn/tests/benchdnn (Copy of the License available at top of current file)
src/operator/special_functions-inl.h Cephes Library Functions (Copy of the License available at top of current file)
3rdparty/mkldnn/doc/assets/mathjax (Copy of the License available at top of current file)
docs/python_docs/themes/mx-theme/mxtheme/static/material-design-icons-3.0.1 (Copy of the License available at top of current file)
docs/python_docs/themes/mx-theme/mxtheme/static/font/Roboto (Copy of the License available at top of current file)
3rdparty/tvm/3rdparty/bfloat16/bfloat16.cc (Copy of the License available at top of current file)

=======================================================================================
Expand All @@ -244,8 +243,6 @@
3rdparty/tvm/3rdparty/cma
3rdparty/onnx-tensorrt
3rdparty/onnx-tensorrt/third_party/onnx
docs/static_site/src/assets/js/clipboard.js
docs/python_docs/themes/mx-theme
3rdparty/intgemm
3rdparty/tvm/3rdparty/compiler-rt/builtin_fp16.h
src/operator/nn/layer_norm.cc
Expand Down Expand Up @@ -310,8 +307,9 @@
Apache-2.0 license + 3-clause BSD license
=======================================================================================

python/mxnet/contrib/onnx/mx2onnx/_op_translations.py
python/mxnet/contrib/onnx/mx2onnx/export_onnx.py
python/mxnet/onnx/mx2onnx/_export_onnx.py
python/mxnet/onnx/mx2onnx/_op_translations/_op_translations_opset12.py
python/mxnet/onnx/mx2onnx/_op_translations/_op_translations_opset13.py

=======================================================================================
Apache-2.0 license + MIT License
Expand Down Expand Up @@ -344,8 +342,3 @@

3rdparty/tvm/3rdparty/rang

=======================================================================================
SIL Open Font License (OFL)
=======================================================================================

docs/python_docs/themes/mx-theme/mxtheme/static/webfonts/ (Copy of the License available at licenses/OFL1_1)
2 changes: 1 addition & 1 deletion ci/docker/runtime_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ gather_licenses() {
cp tools/dependencies/LICENSE.binary.dependencies licenses/
cp NOTICE licenses/
cp LICENSE licenses/
cp DISCLAIMER-WIP licenses/
cp DISCLAIMER licenses/
}

build_ubuntu_cpu_release() {
Expand Down
97 changes: 0 additions & 97 deletions licenses/OFL1_1

This file was deleted.

2 changes: 1 addition & 1 deletion rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ R-package/*

# Specific files
# Files that don't support comment
DISCLAIMER-WIP
DISCLAIMER
MANIFEST
Changes
.codecov.yml
Expand Down
2 changes: 1 addition & 1 deletion tools/pip/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

include README
include LICENSE
include DISCLAIMER-WIP
include DISCLAIMER
include NOTICE
include mxnet/COMMIT_HASH
recursive-include mxnet/tools *
Expand Down
2 changes: 2 additions & 0 deletions tools/source-exclude-artifacts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@

R-package
3rdparty/mkldnn/doc
3rdparty/googletest/ci
docs
2 changes: 1 addition & 1 deletion tools/staticbuild/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ mkdir -p licenses
cp tools/dependencies/LICENSE.binary.dependencies licenses/
cp NOTICE licenses/
cp LICENSE licenses/
cp DISCLAIMER-WIP licenses/
cp DISCLAIMER licenses/


# Build mxnet
Expand Down

0 comments on commit d0c2a94

Please sign in to comment.