From 25505e9da4ea24ce37f1e60916d1afc3fcd15300 Mon Sep 17 00:00:00 2001 From: Lai Wei Date: Tue, 21 Jan 2020 05:00:51 -0800 Subject: [PATCH] license np_einsum file under bsd (#17367) * license under bsd * fix rat exclude --- LICENSE | 6 +++-- src/operator/numpy/np_einsum_op-inl.h | 23 ++++--------------- .../apache_rat_license_check/rat-excludes | 1 + tools/license_header.py | 1 + 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/LICENSE b/LICENSE index eb622637f19c..e190c1890644 100644 --- a/LICENSE +++ b/LICENSE @@ -335,9 +335,11 @@ cmake/Modules/FindCUDAToolkit.cmake 3rdparty/mkldnn/cmake/FindOpenCL.cmake Copyright 2000-2019 Kitware, Inc. and Contributors - 10 ittnotify - For details, see, 3rdparty/mkldnn/src/cpu/jit_utils/jitprofiling/ + 10. ittnotify - For details, see, 3rdparty/mkldnn/src/cpu/jit_utils/jitprofiling/ Copyright (c) 2011, Intel Corporation - + 11. Numpy einsum operator - For details, see src/operator/numpy/np_einsum_op-inl.h + Copyright (c) 2005-2019, NumPy Developers. + Copyright (c) 2019, The Apache Software Foundation. ======================================================================================= 2-clause BSD licenses diff --git a/src/operator/numpy/np_einsum_op-inl.h b/src/operator/numpy/np_einsum_op-inl.h index d2f399b2533d..551b7189822a 100644 --- a/src/operator/numpy/np_einsum_op-inl.h +++ b/src/operator/numpy/np_einsum_op-inl.h @@ -1,24 +1,7 @@ -/* - * 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) 2005-2019, NumPy Developers. + * Copyright (c) 2019, The Apache Software Foundation. + * * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -53,6 +36,8 @@ /*! * \file np_einsum_op-inl.h * \brief Function definition of numpy-compatible einsum operator + * modified by Haozheng Fan(@hzfan) from: + * https://github.com/numpy/numpy/blob/master/numpy/core/src/multiarray/einsum.c.src */ #ifndef MXNET_OPERATOR_NUMPY_NP_EINSUM_OP_INL_H_ diff --git a/tests/nightly/apache_rat_license_check/rat-excludes b/tests/nightly/apache_rat_license_check/rat-excludes index cc0001fd92d7..aa78f0de8b6b 100755 --- a/tests/nightly/apache_rat_license_check/rat-excludes +++ b/tests/nightly/apache_rat_license_check/rat-excludes @@ -76,3 +76,4 @@ searchtools_custom.js theme.conf LICENSE.binary.dependencies cmake/Modules/FindCUDAToolkit.cmake +np_einsum_op-inl.h \ No newline at end of file diff --git a/tools/license_header.py b/tools/license_header.py index 668a74b2817f..5d1eeacc4a77 100755 --- a/tools/license_header.py +++ b/tools/license_header.py @@ -99,6 +99,7 @@ 'docs/_static/js/clipboard.min.js', 'docs/static_site/src/assets/js/clipboard.js', 'cmake/Modules/FindCUDAToolkit.cmake', + 'src/operator/numpy/np_einsum_op-inl.h', # Licensed under 2-Clause BSD in header 'example/ssd/dataset/pycocotools/coco.py',