You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by pt...@apache.org on 2020/01/17 19:09:35 UTC
[incubator-mxnet] branch v1.6.x updated: Don't relicense
FindCUDAToolkit.cmake (#17334) (#17361)
This is an automated email from the ASF dual-hosted git repository.
ptrendx pushed a commit to branch v1.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.6.x by this push:
new 134d199 Don't relicense FindCUDAToolkit.cmake (#17334) (#17361)
134d199 is described below
commit 134d199f14cc09ce0a3a9f92a87419350ee3a0c8
Author: Leonard Lausen <la...@amazon.com>
AuthorDate: Fri Jan 17 19:08:58 2020 +0000
Don't relicense FindCUDAToolkit.cmake (#17334) (#17361)
https://www.apache.org/legal/src-headers.html#3party recommends to license small changes based on the original license. Thus I re-license my changes to FindCUDAToolkit.cmake under the BSD license used by CMake (see file header).
---
LICENSE | 2 ++
cmake/Modules/FindCUDAToolkit.cmake | 19 -------------------
tests/nightly/apache_rat_license_check/rat-excludes | 1 +
tools/license_header.py | 3 ++-
4 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/LICENSE b/LICENSE
index 877e458..8918793 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/Modules/FindCUDAToolkit.cmake
+ Copyright 2000-2019 Kitware, Inc. and Contributors
=======================================================================================
diff --git a/cmake/Modules/FindCUDAToolkit.cmake b/cmake/Modules/FindCUDAToolkit.cmake
index 1d9af2f..d37c44d 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 4297fa6..cc0001f 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/Modules/FindCUDAToolkit.cmake
diff --git a/tools/license_header.py b/tools/license_header.py
index 2e3a034..668a74b 100755
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -76,7 +76,7 @@ _WHITE_LIST = [
# 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 @@ _WHITE_LIST = [
'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',