Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

[master] Forward-port #20492 #20519

Merged
Zha0q1 merged 2 commits into from
Aug 14, 2021
Merged

[master] Forward-port #20492 #20519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4508e94
[v1.9.x] Make sure files with 2 licenses are listed properly in LICEN…
josephevans Aug 9, 2021
600c224
Merge remote-tracking branch 'upstream/master' into issue1_master
josephevans Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

=======================================================================================
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/operator/numpy/np_einsum_op-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

/*
* Copyright (c) 2005-2019, NumPy Developers.
* Copyright (c) 2019, The Apache Software Foundation.
*
* All rights reserved.
*
Expand Down