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

[v1.x] License updates per ASF feedback #20377

Merged
merged 5 commits into from
Jun 24, 2021
Merged

[v1.x] License updates per ASF feedback #20377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acec602
switch to DISCLAIMER (#20242)
szha May 4, 2021
7094edf
Don't distribute 3rdparty/googletest/ci in source archive.
Jun 23, 2021
8f09d68
Add reference in LICENSE to symlinks in include/mkldnn that point to …
Jun 23, 2021
02c40f7
Do not distribute docs/ subdir in source archive.
Jun 23, 2021
df4a0ab
Remove references to docs from LICENSE (since they are no longer dist…
Jun 23, 2021
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
10 changes: 10 additions & 0 deletions DISCLAIMER
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions LICENSE
View file
Open in desktop
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 @@ -344,8 +341,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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion rat-excludes
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docs folder also contains the install instructions (build_from_source page)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would think most users building from source are following instructions from a web site, not viewing them from the source tree (after all, they are in .md format and would require viewing through a formatter/browser.) Do you think it's a requirement to ship them out in the source archive though?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's a requirement, but it's not ideal as the website may change over time, while the archive remains fixed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, but the git version tag will always be there.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think at least a link to the install instructions is needed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you or have you heard anyone use the docs inside the release package?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@josephevans Can we only keep the install instructions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you mean the build instructions, they are in https://github.com/apache/incubator-mxnet/blob/v1.x/docs/static_site/src/pages/get_started/build_from_source.md - we could copy this file to the root source archive. Alternatively, we could create a README.txt file with a link to the instructions on the web-site (but the latest version would have to be published.)

2 changes: 1 addition & 1 deletion tools/staticbuild/build.sh
View file
Open in desktop
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