You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by sk...@apache.org on 2021/08/12 23:09:42 UTC
[incubator-mxnet] branch v1.x updated: [v1.9.x] Make sure files
with 2 licenses are listed properly in LICENSE. (#20492) (#20518)
This is an automated email from the ASF dual-hosted git repository.
skm pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.x by this push:
new 3f7321e [v1.9.x] Make sure files with 2 licenses are listed properly in LICENSE. (#20492) (#20518)
3f7321e is described below
commit 3f7321e6f7e00da83d308450d40daf020d845f60
Author: Joe Evans <jo...@gmail.com>
AuthorDate: Thu Aug 12 16:08:20 2021 -0700
[v1.9.x] Make sure files with 2 licenses are listed properly in LICENSE. (#20492) (#20518)
* Make sure files with 2 licenses are listed properly in LICENSE.
* Remove ASF copyright line.
---
LICENSE | 13 +++++++------
src/operator/numpy/np_einsum_op-inl.h | 1 -
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/LICENSE b/LICENSE
index 9408024..56976f1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -245,7 +245,6 @@
3rdparty/onnx-tensorrt/third_party/onnx
3rdparty/intgemm
3rdparty/tvm/3rdparty/compiler-rt/builtin_fp16.h
- src/operator/nn/layer_norm.cc
=======================================================================================
3-clause BSD license
@@ -263,9 +262,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
=======================================================================================
@@ -307,14 +303,19 @@
Apache-2.0 license + 3-clause BSD license
=======================================================================================
- python/mxnet/contrib/onnx/mx2onnx/_op_translations.py
- python/mxnet/contrib/onnx/mx2onnx/export_onnx.py
+ 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
=======================================================================================
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 0a964e2..fe8f516 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.
*