Skip to content

Commit

Permalink
[v1.x] License updates (apache#20709)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
josephevans committed Nov 2, 2021
1 parent 5cd2d4d commit 07e1c75
Show file tree
Hide file tree
Showing 49 changed files with 3,585 additions and 264 deletions.
23 changes: 14 additions & 9 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,30 @@ header:
- 'cmake/Modules/FindJeMalloc.cmake'
# files licensed under bsd 2-clause
- 'example/ssd/dataset/pycocotools/coco.py'
# files licensed under bsd 2-clause + caffe
- 'src/operator/nn/pool.cuh'
- 'src/operator/nn/pool.h'
- 'src/operator/nn/im2col.cuh'
- 'src/operator/nn/im2col.h'
- 'src/operator/contrib/nn/deformable_im2col.cuh'
- 'src/operator/contrib/nn/deformable_im2col.h'
- 'src/operator/contrib/nn/modulated_deformable_im2col.cuh'
- 'src/operator/contrib/nn/modulated_deformable_im2col.h'
# files licensed under bsd 3-clause
- 'cmake/upstream/FindCUDAToolkit.cmake'
- 'cmake/upstream/select_compute_arch.cmake'
- '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'
- 'src/operator/contrib/erfinv-inl.h'
- 'src/operator/numpy/np_einsum_op-inl.h'
- 'src/operator/numpy/np_einsum_op.cc'
- 'src/operator/numpy/np_einsum_path_op-inl.h'
# files licensed under caffe/mit license
# files licensed under mit license
- 'src/operator/contrib/modulated_deformable_convolution-inl.h'
- 'src/operator/contrib/modulated_deformable_convolution.cc'
- 'src/operator/contrib/modulated_deformable_convolution.cu'
- 'src/operator/contrib/nn/deformable_im2col.cuh'
- 'src/operator/contrib/nn/deformable_im2col.h'
- 'src/operator/contrib/nn/modulated_deformable_im2col.cuh'
- 'src/operator/contrib/nn/modulated_deformable_im2col.h'
- 'src/operator/nn/im2col.cuh'
- 'src/operator/nn/im2col.h'
- 'src/operator/nn/pool.cuh'
- 'src/operator/nn/pool.h'
- 'src/operator/nn/layer_norm_cpu.h'
# symlinks
- 'include/dlpack' # symlink to 3rdparty/dlpack/include/dlpack
- 'include/dmlc' # symlink to 3rdparty/dmlc-core/include/dmlc
Expand Down
75 changes: 32 additions & 43 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@
The Apache MXNET (incubating) project contains subcomponents with separate
copyright notices and license terms. Your use of the source code for the
these subcomponents is subject to the terms and conditions of the following
licenses. If not stated otherwise, their copyright notices and license terms
are available at the path of the subcomponent.
licenses. See licenses/ for text of these licenses.

If a folder hierarchy is listed as subcomponent, separate listings of
further subcomponents (files or folder hierarchies) part of the hierarchy
Expand All @@ -220,25 +219,24 @@

3rdparty/ctc_include
3rdparty/dlpack
include/dlpack (header symlinks to 3rdparty/dlpack/include/dlpack)
3rdparty/dmlc-core
include/dmlc (header symlinks to 3rdparty/dmlc-core/include/dmlc)
3rdparty/googletest/googlemock/scripts/generator
3rdparty/mshadow
include/mshadow (header symlinks to 3rdparty/mshadow/mshadow)
3rdparty/tvm
3rdparty/tvm/3rdparty/dmlc-core
3rdparty/tvm/3rdparty/dlpack
include/nnvm (header symlinks to 3rdparty/tvm/nnvm/include/nnvm)
3rdparty/ps-lite
3rdparty/mkldnn
include/mkldnn (header symlinks to 3rdparty/mkldnn)
3rdparty/googletest/googlemock/scripts/generator
3rdparty/mkldnn/doc/assets/mathjax
3rdparty/mkldnn/tests/benchdnn
3rdparty/onnx-tensorrt/third_party/onnx/third_party/benchmark
3rdparty/onnx-tensorrt/third_party/onnx/tools/protoc-gen-mypy.py
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)
3rdparty/tvm/3rdparty/bfloat16/bfloat16.cc (Copy of the License available at top of current file)
3rdparty/ps-lite
3rdparty/tvm
3rdparty/tvm/3rdparty/dlpack
3rdparty/tvm/3rdparty/dmlc-core
3rdparty/tvm/3rdparty/bfloat16/bfloat16.cc
include/dlpack (header symlinks to 3rdparty/dlpack/include/dlpack)
include/dmlc (header symlinks to 3rdparty/dmlc-core/include/dmlc)
include/mkldnn (header symlinks to 3rdparty/mkldnn)
include/mshadow (header symlinks to 3rdparty/mshadow/mshadow)
include/nnvm (header symlinks to 3rdparty/tvm/nnvm/include/nnvm)
src/operator/contrib/deformable_convolution-inl.h
src/operator/contrib/deformable_convolution.cc
src/operator/contrib/deformable_convolution.cu
Expand All @@ -251,29 +249,33 @@
src/operator/contrib/psroi_pooling.cc
src/operator/contrib/psroi_pooling.cu
src/operator/nn/mkldnn/mkldnn_base-inl.h
src/operator/special_functions-inl.h

=======================================================================================
MIT license
=======================================================================================

example/gluon/tree_lstm
3rdparty/tvm/3rdparty/cma
3rdparty/intgemm
3rdparty/onnx-tensorrt
3rdparty/onnx-tensorrt/third_party/onnx
3rdparty/intgemm
3rdparty/tvm/3rdparty/cma
3rdparty/tvm/3rdparty/compiler-rt/builtin_fp16.h
example/gluon/tree_lstm
src/operator/contrib/modulated_deformable_convolution-inl.h
src/operator/contrib/modulated_deformable_convolution.cc
src/operator/contrib/modulated_deformable_convolution.cu
src/operator/nn/layer_norm_cpu.h

=======================================================================================
3-clause BSD license
=======================================================================================

3rdparty/mkldnn/src/cpu/x64/xbyak
3rdparty/mkldnn/tests/gtests/gtest
3rdparty/mkldnn/cmake/FindOpenCL.cmake (Copy of the License available at licenses/BSD3-cmake)
3rdparty/mkldnn/src/cpu/x64/jit_utils/jitprofiling/
3rdparty/mkldnn/cmake/FindACL.cmake (see licenses/LICENSE.mkldnn.txt)
3rdparty/mkldnn/cmake/FindBLAS.cmake (see licenses/LICENSE.mkldnn.txt)
3rdparty/mkldnn/cmake/FindOpenCL.cmake (see licenses/LICENSE.mkldnn.txt)
3rdparty/mkldnn/src/common/ittnotify (see licenses/LICENSE.mkldnn.txt)
3rdparty/mkldnn/src/cpu/x64/xbyak (see licenses/LICENSE.mkldnn.txt)
3rdparty/mkldnn/tests/gtests/gtest (see licenses/LICENSE.mkldnn.txt)
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindPythonLibsNew.cmake
3rdparty/ctc_include/contrib/moderngpu
3rdparty/nvidia_cub
Expand All @@ -282,6 +284,9 @@
3rdparty/googletest/googletest
cmake/upstream/FindCUDAToolkit.cmake
cmake/upstream/select_compute_arch.cmake
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
src/operator/contrib/erfinv-inl.h
src/operator/numpy/np_einsum_op-inl.h
src/operator/numpy/np_einsum_path_op-inl.h
Expand All @@ -292,11 +297,10 @@
=======================================================================================

3rdparty/dmlc-core/include/dmlc/concurrentqueue.h
include/dmlc/concurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/concurrentqueue.h)
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindEigen3.cmake (Copy of the License available at licenses/BSD2)
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindPythonLibsNew.cmake
3rdparty/onnx-tensorrt/third_party/onnx/third_party/pybind11/tools/FindEigen3.cmake
3rdparty/tvm/3rdparty/picojson/picojson.h
example/ssd/dataset/pycocotools/coco.py
include/dmlc/concurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/concurrentqueue.h)

=======================================================================================
Apache-2.0 license + LLVM Exceptions
Expand All @@ -305,7 +309,7 @@
3rdparty/openmp

=======================================================================================
Caffe Licensing Model
2-clause BSD license + Caffe Copyright Notice and Disclaimer
=======================================================================================

src/operator/nn/pool.h
Expand All @@ -324,26 +328,11 @@
3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h
include/dmlc/blockingconcurrentqueue.h (symlink to 3rdparty/dmlc-core/include/dmlc/blockingconcurrentqueue.h)

=======================================================================================
Apache-2.0 license + 3-clause BSD license
=======================================================================================

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
=======================================================================================

src/operator/nn/layer_norm.cc (function LayerNormCPUKernel is adapated from MIT-licensed code)

=======================================================================================
Boost Software License, Version 1.0
=======================================================================================

3rdparty/intgemm/test/3rd_party/catch.hpp (Copy of the License available at licenses/BOOST1_0)
3rdparty/mkldnn/src/common/primitive_hashing.hpp
3rdparty/intgemm/test/3rd_party/catch.hpp
cmake/Modules/FindJeMalloc.cmake

=======================================================================================
Expand Down
9 changes: 9 additions & 0 deletions licenses/LICENSE.bfloat16.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
26 changes: 26 additions & 0 deletions licenses/LICENSE.blockingconcurrentqueue.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
©2015-2016 Cameron Desrochers. Distributed under the terms of the simplified
BSD license, available at the top of concurrentqueue.h.

Uses Jeff Preshing's semaphore implementation (under the terms of its
separate zlib license, embedded below).


zlib license
------------
Copyright (c) 2015 Jeff Preshing

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgement in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Loading

0 comments on commit 07e1c75

Please sign in to comment.