From 0b73ca0de79fef4d13525ec4860fc2e2602dd8e2 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 16 Jan 2020 00:04:33 +0000 Subject: [PATCH 1/3] Don't unnecessarily relicense FindCUDAToolkit.cmake --- LICENSE | 2 ++ cmake/Modules/FindCUDAToolkit.cmake | 19 ------------------- .../apache_rat_license_check/rat-excludes | 1 + 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/LICENSE b/LICENSE index 877e458ef7dd..2e26f813a751 100644 --- a/LICENSE +++ b/LICENSE @@ -326,6 +326,8 @@ Copyright 2005-2015, Google Inc. 8. OpenMP Testsuite - For details, see, 3rdparty/openmp/testsuite/LICENSE Copyright (c) 2011, 2012 University of Houston System + 9. CMake FindCUDAToolkit.cmake - For details, see, cmake/Module/FindCUDAToolkit.cmake + Copyright 2000-2019 Kitware, Inc. and Contributors ======================================================================================= diff --git a/cmake/Modules/FindCUDAToolkit.cmake b/cmake/Modules/FindCUDAToolkit.cmake index 1d9af2f548d0..d37c44d9c782 100644 --- a/cmake/Modules/FindCUDAToolkit.cmake +++ b/cmake/Modules/FindCUDAToolkit.cmake @@ -1,22 +1,3 @@ -# 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. - -# Original license notice, prior to modification by MXNet Contributors: -# # Copyright 2000-2019 Kitware, Inc. and Contributors # All rights reserved. # diff --git a/tests/nightly/apache_rat_license_check/rat-excludes b/tests/nightly/apache_rat_license_check/rat-excludes index 4297fa6bdec4..3cd03a2a919c 100755 --- a/tests/nightly/apache_rat_license_check/rat-excludes +++ b/tests/nightly/apache_rat_license_check/rat-excludes @@ -75,3 +75,4 @@ include/* searchtools_custom.js theme.conf LICENSE.binary.dependencies +cmake/Module/FindCUDAToolkit.cmake From 66c96d4ebac8a3ec61f0d47faf94335cedf3d3ad Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 16 Jan 2020 11:58:14 +0000 Subject: [PATCH 2/3] Fix typo --- LICENSE | 2 +- tests/nightly/apache_rat_license_check/rat-excludes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 2e26f813a751..8918793a6e95 100644 --- a/LICENSE +++ b/LICENSE @@ -326,7 +326,7 @@ Copyright 2005-2015, Google Inc. 8. OpenMP Testsuite - For details, see, 3rdparty/openmp/testsuite/LICENSE Copyright (c) 2011, 2012 University of Houston System - 9. CMake FindCUDAToolkit.cmake - For details, see, cmake/Module/FindCUDAToolkit.cmake + 9. CMake FindCUDAToolkit.cmake - For details, see, cmake/Modules/FindCUDAToolkit.cmake Copyright 2000-2019 Kitware, Inc. and Contributors diff --git a/tests/nightly/apache_rat_license_check/rat-excludes b/tests/nightly/apache_rat_license_check/rat-excludes index 3cd03a2a919c..cc0001fd92d7 100755 --- a/tests/nightly/apache_rat_license_check/rat-excludes +++ b/tests/nightly/apache_rat_license_check/rat-excludes @@ -75,4 +75,4 @@ include/* searchtools_custom.js theme.conf LICENSE.binary.dependencies -cmake/Module/FindCUDAToolkit.cmake +cmake/Modules/FindCUDAToolkit.cmake From 0e0e3220c9c581c0a648b7f25b9e718fe7271019 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 16 Jan 2020 15:30:43 +0000 Subject: [PATCH 3/3] Fix tools/license_header.py --- tools/license_header.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/license_header.py b/tools/license_header.py index 2e3a03451369..668a74b2817f 100755 --- a/tools/license_header.py +++ b/tools/license_header.py @@ -76,7 +76,7 @@ # Docs Jekyll website under different licenses 'docs/static_site', - + # Code shared with project by author - see file for details 'src/operator/special_functions-inl.h', @@ -98,6 +98,7 @@ 'docs/_static/js/clipboard.js', 'docs/_static/js/clipboard.min.js', 'docs/static_site/src/assets/js/clipboard.js', + 'cmake/Modules/FindCUDAToolkit.cmake', # Licensed under 2-Clause BSD in header 'example/ssd/dataset/pycocotools/coco.py',