From 4508e9494467604e7ac4c63cbaee852cdd88f179 Mon Sep 17 00:00:00 2001 From: Joe Evans Date: Mon, 9 Aug 2021 11:18:48 -0700 Subject: [PATCH] [v1.9.x] Make sure files with 2 licenses are listed properly in LICENSE. (#20492) * Make sure files with 2 licenses are listed properly in LICENSE. * Remove ASF copyright line. --- LICENSE | 8 ++++---- src/operator/numpy/np_einsum_op-inl.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 17099072f64a..1eca980dbf93 100644 --- a/LICENSE +++ b/LICENSE @@ -250,7 +250,6 @@ docs/python_docs/themes/mx-theme 3rdparty/intgemm 3rdparty/tvm/3rdparty/compiler-rt/builtin_fp16.h - src/operator/nn/layer_norm.cc ======================================================================================= 3-clause BSD license @@ -268,9 +267,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 ======================================================================================= @@ -314,6 +310,9 @@ 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_path_op-inl.h + src/operator/numpy/np_einsum_op.cc ======================================================================================= Apache-2.0 license + MIT License @@ -322,6 +321,7 @@ src/serialization/cnpy.h (Copy of the AL2 License available at the top of this file, MIT License available at licenses/MIT) src/serialization/cnpy.cc (Copy of the AL2 License available at the top of this file, MIT License available at licenses/MIT) 3rdparty/onnx-tensorrt/third_party/onnx/tools/protoc-gen-mypy.py (Copy of the referenced AL2 License available at top of current file) + src/operator/nn/layer_norm.cc (function LayerNormCPUKernel is adapated from MIT-licensed code) ======================================================================================= Apache-2.0 license + Boost Software License, Version 1.0 diff --git a/src/operator/numpy/np_einsum_op-inl.h b/src/operator/numpy/np_einsum_op-inl.h index 5947433c00fd..17bb3d0e9e80 100644 --- a/src/operator/numpy/np_einsum_op-inl.h +++ b/src/operator/numpy/np_einsum_op-inl.h @@ -19,7 +19,6 @@ /* * Copyright (c) 2005-2019, NumPy Developers. - * Copyright (c) 2019, The Apache Software Foundation. * * All rights reserved. *