Skip to content

Commit

Permalink
License fixed with copyrights on 1.4.x release branch (apache#13856)
Browse files Browse the repository at this point in the history
* Update LICENSE File with subcomponents (apache#13808)

* Update LICENSE File with subcomponents

* Fix JavaScript licenses

* Add copyrights for third party licenses to license file (apache#13851)

* Remove R-package from LICENSE

* Update googletest due to licensing
  • Loading branch information
zachgk authored and lanking520 committed Feb 18, 2019
1 parent 116f7b9 commit 56bf0bd
Show file tree
Hide file tree
Showing 14 changed files with 470 additions and 267 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/googletest
Submodule googletest updated 355 files
552 changes: 309 additions & 243 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion R-package/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}
Copyright (c) 2015 by Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion contrib/clojure-package/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}
Copyright 2018 by Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
21 changes: 20 additions & 1 deletion docs/_static/selectlang.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*/

function changeLanguage(langSelect, langSelectLabel, rootpath){
langSelect.change(function() {
var lang = langSelect.val();
Expand All @@ -22,4 +41,4 @@ $(document).ready(function () {
langSelectLabel.text($("option:selected").text());

changeLanguage(langSelect, langSelectLabel, getRootPath());
})
})
17 changes: 17 additions & 0 deletions perl-package/AI-MXNet-Gluon-Contrib/META.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

---
abstract: 'Perl interface to MXNet Gluon Contrib'
author:
Expand Down
17 changes: 17 additions & 0 deletions perl-package/AI-MXNet-Gluon-ModelZoo/META.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

---
abstract: 'Perl interface to MXNet Gluon ModelZoo'
author:
Expand Down
17 changes: 17 additions & 0 deletions perl-package/AI-MXNet/META.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

---
abstract: 'Perl interface to MXNet machine learning library'
author:
Expand Down
17 changes: 17 additions & 0 deletions perl-package/AI-MXNetCAPI/META.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

---
abstract: 'Swig interface to mxnet c api'
author:
Expand Down
17 changes: 17 additions & 0 deletions perl-package/AI-NNVMCAPI/META.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

---
abstract: 'Swig interface to nnvm c api'
author:
Expand Down
17 changes: 17 additions & 0 deletions readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

formats:
- none
requirements_file: docs/requirements.txt
17 changes: 17 additions & 0 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.

name: mxnet
version: '1.4.0'
summary: MXNet is a deep learning framework designed for efficiency and flexibility.
Expand Down
14 changes: 3 additions & 11 deletions tests/nightly/apache_rat_license_check/rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,15 @@
.*ipynb
.*html
.*json
.*js
.*txt
.*md
3rdparty/*
R-package/*
src/operator/mkl/*
trunk/*
docker/*
docker_multiarch/*
.*\\.m
.*\\.mk
.*\\.R
Dockerfile*
.*svg
.*cfg
.*config
Expand All @@ -27,21 +23,15 @@ build/*
.*\\.t
MANIFEST
Changes
META.yml
.*csv
.*names
CODEOWNERS
prepare_mkl.sh
readthedocs.yml
snap.python
snapcraft.yaml
image-classification-predict.cc
bbox.pyx
cpu_nms.pyx
gpu_nms.pyx
nms_kernel.cu
_mask.pyx
unicodemap_en_baidu.csv
coco.py
base.pyi
special_functions-inl.h
Expand All @@ -50,11 +40,13 @@ im2col.h
pool.h
README.rst
dataset.cPickle
rcnn/*
image-classification/*
rat-excludes
apache-rat-tasks/*
moderngpu/*
deformable_im2col.cuh
deformable_im2col.h
REQUIRE
include/*
.*.iml
.*.json.ref
25 changes: 16 additions & 9 deletions tools/license_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,32 +60,39 @@
_LICENSE_PATTERNS = ['Licensed to the Apache Software Foundation']

# the folders or files that will be ignored
_WHITE_LIST = ['R-package/',
_WHITE_LIST = [
# Licensed under docker/Dockerfiles/License.md
'docker/Dockerfiles',

# Git submodules under different licenses
'3rdparty',
'src/operator/mkl/',

# Code shared with project by author - see file for details
'src/operator/special_functions-inl.h',

# Licensed under Caffe header
'src/operator/nn/pool.h',
'src/operator/contrib/psroi_pooling-inl.h',
'src/operator/contrib/nn/deformable_im2col.h',
'src/operator/contrib/nn/deformable_im2col.cuh',
'src/operator/nn/im2col.h',
'src/operator/nn/im2col.cuh',

# Licenses in headers
'docs/_static/searchtools_custom.js',
'docs/_static/js/clipboard.js',
'docs/_static/js/clipboard.min.js',

# Licensed under 2-Clause BSD in header
'example/ssd/dataset/pycocotools/coco.py',
'example/rcnn/rcnn/cython/setup.py',
'example/rcnn/rcnn/cython/nms_kernel.cu',
'prepare_mkl.sh',
'example/image-classification/predict-cpp/image-classification-predict.cc',
'src/operator/contrib/ctc_include/',
'julia/REQUIRE'
]

# language extensions and the according commment mark
_LANGS = {'.cc':'*', '.h':'*', '.cu':'*', '.cuh':'*', '.py':'#',
'.pm':'#', '.scala':'*', '.cc':'*', '.sh':'#', '.cmake':'#',
'.java':'*', '.sh':'#', '.cpp':'*', '.hpp':'*', '.c':'*',
'.bat':'rem', '.pl':'#', '.m':'%', '.R':'#', '.mk':'#', '.cfg':'#',
'.t':'#', '.ps1':'#', '.jl':'#'}
'.t':'#', '.ps1':'#', '.jl':'#', '.clj':';;', '.pyx':'#', '.js':'*'}

# Previous license header, which will be removed
_OLD_LICENSE = re.compile('.*Copyright.*by Contributors')
Expand Down

0 comments on commit 56bf0bd

Please sign in to comment.