Skip to content

Commit

Permalink
license np_einsum file under bsd (apache#17367)
Browse files Browse the repository at this point in the history
* license under bsd

* fix rat exclude
  • Loading branch information
roywei authored and Zheng committed Jan 21, 2020
1 parent 30ae36c commit af634e2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 21 deletions.
6 changes: 4 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 4 additions & 19 deletions src/operator/numpy/np_einsum_op-inl.h
Original file line number Diff line number Diff line change
@@ -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:https://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
Expand Down Expand Up @@ -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_
Expand Down
1 change: 1 addition & 0 deletions tests/nightly/apache_rat_license_check/rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ searchtools_custom.js
theme.conf
LICENSE.binary.dependencies
cmake/Modules/FindCUDAToolkit.cmake
np_einsum_op-inl.h
1 change: 1 addition & 0 deletions tools/license_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit af634e2

Please sign in to comment.