From 94be96d41e4a8e2a99bd129709a30b4c8009dc17 Mon Sep 17 00:00:00 2001 From: Hongshan Li Date: Fri, 6 Aug 2021 20:13:35 +0000 Subject: [PATCH 1/8] remove inappropriate ASF license --- cmake/Modules/FindJeMalloc.cmake | 18 ------------------ src/operator/nn/mkldnn/mkldnn_base-inl.h | 19 ------------------- 2 files changed, 37 deletions(-) diff --git a/cmake/Modules/FindJeMalloc.cmake b/cmake/Modules/FindJeMalloc.cmake index f3ca06faa3ae..b5f9efbe8aef 100644 --- a/cmake/Modules/FindJeMalloc.cmake +++ b/cmake/Modules/FindJeMalloc.cmake @@ -1,21 +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. - - # Copyright (c) 2014 Thomas Heller # Copyright (c) 2007-2012 Hartmut Kaiser # Copyright (c) 2010-2011 Matt Anderson diff --git a/src/operator/nn/mkldnn/mkldnn_base-inl.h b/src/operator/nn/mkldnn/mkldnn_base-inl.h index 3e73103b2f14..3eb42b410a22 100644 --- a/src/operator/nn/mkldnn/mkldnn_base-inl.h +++ b/src/operator/nn/mkldnn/mkldnn_base-inl.h @@ -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. - */ - /******************************************************************************* * Copyright 2016-2017 Intel Corporation * From 8500790fca0745e4dd2db5912a2f1e15b018b14e Mon Sep 17 00:00:00 2001 From: Hongshan Li Date: Fri, 6 Aug 2021 23:55:07 +0000 Subject: [PATCH 2/8] updated LICENSE, files under ASF and BSD3-clause are under the correct section --- LICENSE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 12b11eb21115..373c4c55d476 100644 --- a/LICENSE +++ b/LICENSE @@ -263,9 +263,6 @@ 3rdparty/googletest/googletest cmake/upstream/FindCUDAToolkit.cmake cmake/upstream/select_compute_arch.cmake - src/operator/numpy/np_einsum_op-inl.h - src/operator/numpy/np_einsum_path_op-inl.h - src/operator/numpy/np_einsum_op.cc src/operator/contrib/erfinv-inl.h ======================================================================================= @@ -310,7 +307,10 @@ 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/numpy/np_einsum_op-inl.h + src/operator/numpy/np_einsum_op.cc + src/operator/numpy/np_einsum_path_op-inl.h + ======================================================================================= Apache-2.0 license + MIT License ======================================================================================= From a415fc3799052530ddb22adac0acb2faca4cadea Mon Sep 17 00:00:00 2001 From: Hongshan Li Date: Mon, 9 Aug 2021 23:51:15 +0000 Subject: [PATCH 3/8] added mkldnn_base-inl.h to license whitelist --- tools/license_header.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/license_header.py b/tools/license_header.py index e46934459ea9..08d1bec2f93f 100755 --- a/tools/license_header.py +++ b/tools/license_header.py @@ -121,6 +121,7 @@ # Licensed under Apache 2.0 license 'example/image-classification/predict-cpp/image-classification-predict.cc', + 'src/operator/nn/mkldnn/mkldnn_base-inl.h' # This file 'tools/license_header.py', From 4b307964c1b0913c5f16dae6382f476e1b610810 Mon Sep 17 00:00:00 2001 From: Hongshan Li Date: Mon, 9 Aug 2021 23:53:45 +0000 Subject: [PATCH 4/8] removed duplicated update from 20492 --- LICENSE | 3 --- 1 file changed, 3 deletions(-) diff --git a/LICENSE b/LICENSE index 373c4c55d476..9b558200d142 100644 --- a/LICENSE +++ b/LICENSE @@ -307,9 +307,6 @@ 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/numpy/np_einsum_op-inl.h - src/operator/numpy/np_einsum_op.cc - src/operator/numpy/np_einsum_path_op-inl.h ======================================================================================= Apache-2.0 license + MIT License From a8eb509171d3329cadb53cbfa52fce82e42a6a87 Mon Sep 17 00:00:00 2001 From: Hongshan Li Date: Tue, 10 Aug 2021 01:20:06 +0000 Subject: [PATCH 5/8] minor update --- cmake/Modules/FindJeMalloc.cmake | 18 ++++++++++++++++++ src/operator/nn/mkldnn/mkldnn_base-inl.h | 19 +++++++++++++++++++ tools/license_header.py | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/FindJeMalloc.cmake b/cmake/Modules/FindJeMalloc.cmake index b5f9efbe8aef..f3ca06faa3ae 100644 --- a/cmake/Modules/FindJeMalloc.cmake +++ b/cmake/Modules/FindJeMalloc.cmake @@ -1,3 +1,21 @@ +# 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. + + # Copyright (c) 2014 Thomas Heller # Copyright (c) 2007-2012 Hartmut Kaiser # Copyright (c) 2010-2011 Matt Anderson diff --git a/src/operator/nn/mkldnn/mkldnn_base-inl.h b/src/operator/nn/mkldnn/mkldnn_base-inl.h index 3eb42b410a22..3e73103b2f14 100644 --- a/src/operator/nn/mkldnn/mkldnn_base-inl.h +++ b/src/operator/nn/mkldnn/mkldnn_base-inl.h @@ -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. + */ + /******************************************************************************* * Copyright 2016-2017 Intel Corporation * diff --git a/tools/license_header.py b/tools/license_header.py index 75a5746bf1d8..b0055b202340 100755 --- a/tools/license_header.py +++ b/tools/license_header.py @@ -121,7 +121,7 @@ # Licensed under Apache 2.0 license 'example/image-classification/predict-cpp/image-classification-predict.cc', - 'src/operator/nn/mkldnn/mkldnn_base-inl.h' + 'src/operator/nn/mkldnn/mkldnn_base-inl.h', # This file 'tools/license_header.py', From fb692267e754de6d76f5fbb934ff7ecf78223ddc Mon Sep 17 00:00:00 2001 From: aws-tensorflow-bot Date: Wed, 11 Aug 2021 00:12:08 +0000 Subject: [PATCH 6/8] remove redundant headers --- cmake/Modules/FindJeMalloc.cmake | 24 ------------------------ src/operator/nn/mkldnn/mkldnn_base-inl.h | 19 ------------------- 2 files changed, 43 deletions(-) diff --git a/cmake/Modules/FindJeMalloc.cmake b/cmake/Modules/FindJeMalloc.cmake index f3ca06faa3ae..0ab1cec55f1f 100644 --- a/cmake/Modules/FindJeMalloc.cmake +++ b/cmake/Modules/FindJeMalloc.cmake @@ -1,27 +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. - - -# Copyright (c) 2014 Thomas Heller -# Copyright (c) 2007-2012 Hartmut Kaiser -# Copyright (c) 2010-2011 Matt Anderson -# Copyright (c) 2011 Bryce Lelbach -# -#---- # Distributed under the Boost Software License, Version 1.0. # Boost Software License - Version 1.0 - August 17th, 2003 # diff --git a/src/operator/nn/mkldnn/mkldnn_base-inl.h b/src/operator/nn/mkldnn/mkldnn_base-inl.h index 3e73103b2f14..3eb42b410a22 100644 --- a/src/operator/nn/mkldnn/mkldnn_base-inl.h +++ b/src/operator/nn/mkldnn/mkldnn_base-inl.h @@ -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. - */ - /******************************************************************************* * Copyright 2016-2017 Intel Corporation * From 5073b5cea08db4541e66a3ecef7e2e141240ae98 Mon Sep 17 00:00:00 2001 From: aws-tensorflow-bot Date: Thu, 12 Aug 2021 19:17:32 +0000 Subject: [PATCH 7/8] updated license white list --- cmake/Modules/FindJeMalloc.cmake | 6 ++++++ tools/license_header.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/cmake/Modules/FindJeMalloc.cmake b/cmake/Modules/FindJeMalloc.cmake index 0ab1cec55f1f..b5f9efbe8aef 100644 --- a/cmake/Modules/FindJeMalloc.cmake +++ b/cmake/Modules/FindJeMalloc.cmake @@ -1,3 +1,9 @@ +# Copyright (c) 2014 Thomas Heller +# Copyright (c) 2007-2012 Hartmut Kaiser +# Copyright (c) 2010-2011 Matt Anderson +# Copyright (c) 2011 Bryce Lelbach +# +#---- # Distributed under the Boost Software License, Version 1.0. # Boost Software License - Version 1.0 - August 17th, 2003 # diff --git a/tools/license_header.py b/tools/license_header.py index b0055b202340..b4db33a1369c 100755 --- a/tools/license_header.py +++ b/tools/license_header.py @@ -115,6 +115,9 @@ # Licensed under 2-Clause BSD in header 'example/ssd/dataset/pycocotools/coco.py', + + # Licensed under the Boost Software License, Version 1.0 + 'cmake/Modules/FindJeMalloc.cmake', # Julia package metadata, generated by Pkg3.jl 'julia/Project.toml', From 24b04b97e024095a6cbc779287d8a1236f752ce3 Mon Sep 17 00:00:00 2001 From: aws-tensorflow-bot Date: Fri, 13 Aug 2021 01:49:46 +0000 Subject: [PATCH 8/8] updated rat-excludes whitelist --- rat-excludes | 1 + 1 file changed, 1 insertion(+) diff --git a/rat-excludes b/rat-excludes index 5fc635ce39c9..488a228ec4a1 100644 --- a/rat-excludes +++ b/rat-excludes @@ -129,6 +129,7 @@ deformable_im2col.h modulated_deformable_im2col.cuh modulated_deformable_im2col.h FindCUDAToolkit.cmake +FindJeMalloc.cmake select_compute_arch.cmake # AL2 License header not at the beginning of the file