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

[v1.x] License updates #20709

Merged
merged 18 commits into from
Nov 2, 2021
Merged

[v1.x] License updates #20709

merged 18 commits into from
Nov 2, 2021

Conversation

josephevans
Copy link
Contributor

Description

This PR fixes license issues identified in #20616 and more:

  • Update Caffe license description in LICENSE to BSD-2 Clause with Caffe Copyright Notice and Disclaimer
  • Fix category for 3rdparty/mkldnn/src/common/primitive_hashing.hpp (is Apache licensed, not Boost 1.0)
  • Sort files in LICENSE in each section alphabetically
  • Remove duplicate entries in LICENSE
  • Update third-party software in mkldnn in LICENSE, per 3rdparty/mkldnn/THIRD-PARTY-PROGRAMS
  • Remove incorrectly-added ASF headers on MIT-licensed files
  • Add license text for each subcomponent that will be distributed in binary form to licenses/LICENSE.*.txt
    • This ensures we comply with licensing requirements for binary distributions

@josephevans
Remove Apache-2.0 license header from ONNX files that were originally…
94a8465 
… BSD 3-clause licensed and properly list then under BSD 3-clause section in LICENSE.
@josephevans
Remove 3rdparty/mkldnn/src/common/primitive_hashing.hpp from LICENSE …
5ecf833 
…under Boost License section, since it is clearly Apache 2.0 licensed.
@josephevans
Clarify Caffe license to BSD 2-clause with Caffe extensions.
bc53ad8
@josephevans
Clarify Caffe license to BSD 2-clause with Caffe extensions.
8c6bff0
@josephevans
Remove duplicate file, should only be in BSD 3-clause section.
2095450
@josephevans
Update LICENSE with latest from 3rdparty/mkldnn/THIRD-PARTY-PROGRAMS
75f7589
@josephevans
Sort files under MIT license. Remove references to generic licenses.
15f4929
@josephevans
Remove incorrectly added Apache header on MIT-licensed files.
3b1af2e
@josephevans
Sort lines in ASF-2.0 licensed list.
236a34c
@josephevans
Add license text in licenses/ to fulfill binary distribution requirem…
769dc65 
…ents.
@josephevans
Remove copyright by contributors line from ASF-licensed file.
bbb6308
@mxnet-bot
Copy link

Hey @josephevans , Thanks for submitting the PR
All tests are already queued to run once. If tests fail, you can trigger one or more tests again with the following commands:

  • To trigger all jobs: @mxnet-bot run ci [all]
  • To trigger specific jobs: @mxnet-bot run ci [job1, job2]

CI supported jobs: [unix-gpu, unix-cpu, centos-cpu, clang, sanity, website, windows-cpu, edge, miscellaneous, centos-gpu, windows-gpu]

Note:
Only following 3 categories can trigger CI :PR Author, MXNet Committer, Jenkins Admin.
All CI tests must pass before the PR can be merged.

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Oct 28, 2021
@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-work-in-progress PR is still work in progress labels Oct 28, 2021
@josephevans josephevans mentioned this pull request Oct 28, 2021
Closed
6 tasks
@mseth10 mseth10 added pr-awaiting-review PR is waiting for code review and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Oct 28, 2021
szha
szha reviewed Oct 28, 2021
View reviewed changes
LICENSE Outdated Show resolved Hide resolved
@szha
Copy link
Member

szha commented Oct 29, 2021

BTW I also thought that the new tool would detect multiple licenses and warn about them. Did it report the issue this time and we intentionally allowlisted it?

@josephevans
Copy link
Contributor Author

BTW I also thought that the new tool would detect multiple licenses and warn about them. Did it report the issue this time and we intentionally allowlisted it?

The tool does detect multiple licenses, but it doesn't raise an issue if the file is listed in LICENSE. In this case, layer_norm.cc is listed in LICENSE, so it passes the check. See https://github.com/apache/incubator-mxnet/blob/v1.x/tools/license_header.py#L197-L202.

@szha
Copy link
Member

szha commented Oct 29, 2021

Under no circumstances do we want multiple licenses regardless of where they are in LICENSE. Let's use it to detect whether there are other issues with dual license.

@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-awaiting-review PR is waiting for code review labels Nov 1, 2021
@mseth10 mseth10 added pr-work-in-progress PR is still work in progress and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Nov 1, 2021
@mseth10 mseth10 added pr-awaiting-testing PR is reviewed and waiting CI build and test and removed pr-work-in-progress PR is still work in progress labels Nov 1, 2021
@josephevans
Copy link
Contributor Author

Under no circumstances do we want multiple licenses regardless of where they are in LICENSE. Let's use it to detect whether there are other issues with dual license.

Got it. I updated the tool to error out when it finds a file with multiple licenses.

@mseth10 mseth10 added pr-awaiting-review PR is waiting for code review and removed pr-awaiting-testing PR is reviewed and waiting CI build and test labels Nov 2, 2021
szha
szha approved these changes Nov 2, 2021
View reviewed changes
Copy link
Member

@szha szha left a comment

Choose a reason for hiding this comment

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

@josephevans thanks for addressing the issues!

mseth10
mseth10 approved these changes Nov 2, 2021
View reviewed changes
Copy link
Contributor

@mseth10 mseth10 left a comment

Choose a reason for hiding this comment

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

LGTM

@mseth10 mseth10 merged commit bde1625 into apache:v1.x Nov 2, 2021
josephevans added a commit to josephevans/mxnet that referenced this pull request Nov 2, 2021
@josephevans
[v1.x] License updates (apache#20709)
07e1c75 
* Remove Apache-2.0 license header from ONNX files that were originally BSD 3-clause licensed and properly list then under BSD 3-clause section in LICENSE.

* Remove 3rdparty/mkldnn/src/common/primitive_hashing.hpp from LICENSE under Boost License section, since it is clearly Apache 2.0 licensed.

* Clarify Caffe license to BSD 2-clause with Caffe extensions.

* Clarify Caffe license to BSD 2-clause with Caffe extensions.

* Remove duplicate file, should only be in BSD 3-clause section.

* Update LICENSE with latest from 3rdparty/mkldnn/THIRD-PARTY-PROGRAMS

* Sort files under MIT license. Remove references to generic licenses.

* Remove incorrectly added Apache header on MIT-licensed files.

* Sort lines in ASF-2.0 licensed list.

* Add license text in licenses/ to fulfill binary distribution requirements.

* Remove copyright by contributors line from ASF-licensed file.

* Fix rat-excludes and licensecheck exclude list.

* Error out and fail if license_header.py tool detects multiple licenses in a file.

* Move LayerNormCPUKernel function to own file, since it is licensed under MIT. Update LICENSE to reflect this.

* Remove LayerNormCPUKernel from layer_norm.cc, it is now in layer_norm_cpu.h.

* Add header guard, fix first line to pass lint.

* Update skywalking-eyes config based on current LICENSE, add layer_norm_cpu.h to whitelist.

* Rename license file for layer_norm_cpu.h
@josephevans josephevans mentioned this pull request Nov 2, 2021
Merged
josephevans added a commit that referenced this pull request Nov 3, 2021
@josephevans @barry-jin @yajiedesign
[v1.9.x] Port #20709 to v1.9.x branch (#20722)
200b284 
* [v1.x] License updates  (#20709)

* Remove Apache-2.0 license header from ONNX files that were originally BSD 3-clause licensed and properly list then under BSD 3-clause section in LICENSE.

* Remove 3rdparty/mkldnn/src/common/primitive_hashing.hpp from LICENSE under Boost License section, since it is clearly Apache 2.0 licensed.

* Clarify Caffe license to BSD 2-clause with Caffe extensions.

* Clarify Caffe license to BSD 2-clause with Caffe extensions.

* Remove duplicate file, should only be in BSD 3-clause section.

* Update LICENSE with latest from 3rdparty/mkldnn/THIRD-PARTY-PROGRAMS

* Sort files under MIT license. Remove references to generic licenses.

* Remove incorrectly added Apache header on MIT-licensed files.

* Sort lines in ASF-2.0 licensed list.

* Add license text in licenses/ to fulfill binary distribution requirements.

* Remove copyright by contributors line from ASF-licensed file.

* Fix rat-excludes and licensecheck exclude list.

* Error out and fail if license_header.py tool detects multiple licenses in a file.

* Move LayerNormCPUKernel function to own file, since it is licensed under MIT. Update LICENSE to reflect this.

* Remove LayerNormCPUKernel from layer_norm.cc, it is now in layer_norm_cpu.h.

* Add header guard, fix first line to pass lint.

* Update skywalking-eyes config based on current LICENSE, add layer_norm_cpu.h to whitelist.

* Rename license file for layer_norm_cpu.h

* Update mkldnn license text and LICENSE.

* [v1.x] Port #20648, #20676, #19236 to v1.x (#20677)

* [v1.9.x] CI fixes (#20648)

* Update openssl package in ubuntu_core.sh (used in ubuntu 16.04 images) to avoid bug triggered by let's encrypt expired ca cert.

* Reduce number of parallel docker builds we run at once to 2, since there are multiple jobs (on different branches) running at the same time.

* Use different mirror to download binutils to avoid expired let's encrypt CA cert.

* [CI] UPgrade windows CI

* fix python 3.8 ctypes dll load with windows (#19236)

Co-authored-by: barry-jin <[email protected]>
Co-authored-by: Hu Shiwen <[email protected]>

* Remove general license text files, as this is included in individual license files in licenses/*. Update license for code contributed/derived from https://github.com/msracver/Deformable-ConvNets which is now MIT licensed and update LICENSE to reflect this. Add references for original code with github revision to MIT-licensed files.

* Fix rat-excludes.

* Update skywalking-eyes config.

Co-authored-by: barry-jin <[email protected]>
Co-authored-by: Hu Shiwen <[email protected]>
barry-jin pushed a commit to barry-jin/incubator-mxnet that referenced this pull request Nov 11, 2021
@josephevans @barry-jin
[v1.x] License updates (apache#20709)
5fda38a 
* Remove Apache-2.0 license header from ONNX files that were originally BSD 3-clause licensed and properly list then under BSD 3-clause section in LICENSE.

* Remove 3rdparty/mkldnn/src/common/primitive_hashing.hpp from LICENSE under Boost License section, since it is clearly Apache 2.0 licensed.

* Clarify Caffe license to BSD 2-clause with Caffe extensions.

* Clarify Caffe license to BSD 2-clause with Caffe extensions.

* Remove duplicate file, should only be in BSD 3-clause section.

* Update LICENSE with latest from 3rdparty/mkldnn/THIRD-PARTY-PROGRAMS

* Sort files under MIT license. Remove references to generic licenses.

* Remove incorrectly added Apache header on MIT-licensed files.

* Sort lines in ASF-2.0 licensed list.

* Add license text in licenses/ to fulfill binary distribution requirements.

* Remove copyright by contributors line from ASF-licensed file.

* Fix rat-excludes and licensecheck exclude list.

* Error out and fail if license_header.py tool detects multiple licenses in a file.

* Move LayerNormCPUKernel function to own file, since it is licensed under MIT. Update LICENSE to reflect this.

* Remove LayerNormCPUKernel from layer_norm.cc, it is now in layer_norm_cpu.h.

* Add header guard, fix first line to pass lint.

* Update skywalking-eyes config based on current LICENSE, add layer_norm_cpu.h to whitelist.

* Rename license file for layer_norm_cpu.h
@barry-jin barry-jin mentioned this pull request Nov 11, 2021
Merged
6 tasks
szha pushed a commit that referenced this pull request Nov 18, 2021
@barry-jin @josephevans
[LICENSE] Port #20709 (#20736)
ebf3054 
* [v1.x] License updates  (#20709)

* Remove Apache-2.0 license header from ONNX files that were originally BSD 3-clause licensed and properly list then under BSD 3-clause section in LICENSE.

* Remove 3rdparty/mkldnn/src/common/primitive_hashing.hpp from LICENSE under Boost License section, since it is clearly Apache 2.0 licensed.

* Clarify Caffe license to BSD 2-clause with Caffe extensions.

* Clarify Caffe license to BSD 2-clause with Caffe extensions.

* Remove duplicate file, should only be in BSD 3-clause section.

* Update LICENSE with latest from 3rdparty/mkldnn/THIRD-PARTY-PROGRAMS

* Sort files under MIT license. Remove references to generic licenses.

* Remove incorrectly added Apache header on MIT-licensed files.

* Sort lines in ASF-2.0 licensed list.

* Add license text in licenses/ to fulfill binary distribution requirements.

* Remove copyright by contributors line from ASF-licensed file.

* Fix rat-excludes and licensecheck exclude list.

* Error out and fail if license_header.py tool detects multiple licenses in a file.

* Move LayerNormCPUKernel function to own file, since it is licensed under MIT. Update LICENSE to reflect this.

* Remove LayerNormCPUKernel from layer_norm.cc, it is now in layer_norm_cpu.h.

* Add header guard, fix first line to pass lint.

* Update skywalking-eyes config based on current LICENSE, add layer_norm_cpu.h to whitelist.

* Rename license file for layer_norm_cpu.h

* fix build

* fix license header

* add pool.cuh into rat-excludes

Co-authored-by: Joe Evans <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mseth10 mseth10 mseth10 approved these changes

@szha szha szha approved these changes

Assignees
No one assigned
Labels
pr-awaiting-review PR is waiting for code review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@josephevans @mxnet-bot @szha @mseth10