You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by zh...@apache.org on 2021/09/28 18:39:54 UTC
[incubator-mxnet] branch master updated: Port #20520 (#20609)
This is an automated email from the ASF dual-hosted git repository.
zhenghuijin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 80d72b5 Port #20520 (#20609)
80d72b5 is described below
commit 80d72b534d4bd07d2db929c5c8dbb6181bdf62ea
Author: Zhenghui Jin <69...@users.noreply.github.com>
AuthorDate: Tue Sep 28 11:38:32 2021 -0700
Port #20520 (#20609)
Co-authored-by: Sandeep Krishnamurthy <sa...@gmail.com>
---
LICENSE | 9 +++++++++
rat-excludes | 18 ++++++++++++++++++
src/operator/contrib/deformable_psroi_pooling-inl.h | 19 -------------------
src/operator/contrib/deformable_psroi_pooling.cc | 19 -------------------
src/operator/contrib/deformable_psroi_pooling.cu | 19 -------------------
src/operator/contrib/multi_proposal-inl.h | 19 -------------------
src/operator/contrib/multi_proposal.cc | 19 -------------------
src/operator/contrib/multi_proposal.cu | 19 -------------------
src/operator/contrib/psroi_pooling.cc | 19 -------------------
src/operator/contrib/psroi_pooling.cu | 19 -------------------
src/operator/deformable_convolution-inl.h | 19 -------------------
src/operator/deformable_convolution.cc | 19 -------------------
src/operator/deformable_convolution.cu | 19 -------------------
src/operator/modulated_deformable_convolution-inl.h | 19 -------------------
src/operator/modulated_deformable_convolution.cc | 19 -------------------
src/operator/modulated_deformable_convolution.cu | 19 -------------------
tools/license_header.py | 20 ++++++++++++++++++++
17 files changed, 47 insertions(+), 266 deletions(-)
diff --git a/LICENSE b/LICENSE
index ded6a01..d70e5ed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -249,6 +249,11 @@
docs/python_docs/themes/mx-theme
3rdparty/intgemm
3rdparty/tvm/3rdparty/compiler-rt/builtin_fp16.h
+ src/operator/contrib/nn/modulated_deformable_im2col.cuh
+ src/operator/contrib/nn/modulated_deformable_im2col.h
+ src/operator/modulated_deformable_convolution-inl.h
+ src/operator/modulated_deformable_convolution.cc
+ src/operator/modulated_deformable_convolution.cu
=======================================================================================
3-clause BSD license
@@ -321,6 +326,10 @@
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)
+ (Source repository for below deformable conv operators - https://github.com/msracver/Deformable-ConvNets/tree/master/DCNv2_op)
+ src/operator/deformable_convolution-inl.h
+ src/operator/deformable_convolution.cc
+ src/operator/deformable_convolution.cu
=======================================================================================
Apache-2.0 license + Boost Software License, Version 1.0
diff --git a/rat-excludes b/rat-excludes
index fcd99ae..12f7ca6 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -124,6 +124,24 @@ FindBLAS.cmake
FindJeMalloc.cmake
select_compute_arch.cmake
+# Incorporated third-party source files from Microsoft that carry Apache 2.0 license, captured in licenses/
+deformable_psroi_pooling.cu
+deformable_convolution.cu
+deformable_convolution-inl.h
+psroi_pooling.cc
+multi_proposal.cu
+deformable_psroi_pooling-inl.h
+deformable_psroi_pooling.cc
+deformable_convolution.cc
+psroi_pooling.cu
+multi_proposal.cc
+multi_proposal-inl.h
+
+# Incorporated third-party source files from Microsoft that carry MIT license, captured in licenses/
+modulated_deformable_convolution-inl.h
+modulated_deformable_convolution.cc
+modulated_deformable_convolution.cu
+
# AL2 License header not at the beginning of the file
doap.rdf
diff --git a/src/operator/contrib/deformable_psroi_pooling-inl.h b/src/operator/contrib/deformable_psroi_pooling-inl.h
index 908c36c..ad223c7 100644
--- a/src/operator/contrib/deformable_psroi_pooling-inl.h
+++ b/src/operator/contrib/deformable_psroi_pooling-inl.h
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/contrib/deformable_psroi_pooling.cc b/src/operator/contrib/deformable_psroi_pooling.cc
index 77c57c7..411802c 100644
--- a/src/operator/contrib/deformable_psroi_pooling.cc
+++ b/src/operator/contrib/deformable_psroi_pooling.cc
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/contrib/deformable_psroi_pooling.cu b/src/operator/contrib/deformable_psroi_pooling.cu
index b1888ad..b629fb9 100644
--- a/src/operator/contrib/deformable_psroi_pooling.cu
+++ b/src/operator/contrib/deformable_psroi_pooling.cu
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/contrib/multi_proposal-inl.h b/src/operator/contrib/multi_proposal-inl.h
index f77158f..d63080d 100644
--- a/src/operator/contrib/multi_proposal-inl.h
+++ b/src/operator/contrib/multi_proposal-inl.h
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/contrib/multi_proposal.cc b/src/operator/contrib/multi_proposal.cc
index 555886c..bec9b08 100644
--- a/src/operator/contrib/multi_proposal.cc
+++ b/src/operator/contrib/multi_proposal.cc
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/contrib/multi_proposal.cu b/src/operator/contrib/multi_proposal.cu
index b1cf133..1283f1e 100644
--- a/src/operator/contrib/multi_proposal.cu
+++ b/src/operator/contrib/multi_proposal.cu
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/contrib/psroi_pooling.cc b/src/operator/contrib/psroi_pooling.cc
index fdb737c..8c72a74 100644
--- a/src/operator/contrib/psroi_pooling.cc
+++ b/src/operator/contrib/psroi_pooling.cc
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/contrib/psroi_pooling.cu b/src/operator/contrib/psroi_pooling.cu
index a46851e..65d9251 100644
--- a/src/operator/contrib/psroi_pooling.cu
+++ b/src/operator/contrib/psroi_pooling.cu
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/deformable_convolution-inl.h b/src/operator/deformable_convolution-inl.h
index 7782a8b..e18b002 100644
--- a/src/operator/deformable_convolution-inl.h
+++ b/src/operator/deformable_convolution-inl.h
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/deformable_convolution.cc b/src/operator/deformable_convolution.cc
index 777cdbc..f7d2ee5 100644
--- a/src/operator/deformable_convolution.cc
+++ b/src/operator/deformable_convolution.cc
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/deformable_convolution.cu b/src/operator/deformable_convolution.cu
index 3846f89..0d1864d 100644
--- a/src/operator/deformable_convolution.cu
+++ b/src/operator/deformable_convolution.cu
@@ -1,22 +1,3 @@
-/*
- * 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) 2017 Microsoft
* Licensed under The Apache-2.0 License [see LICENSE for details]
diff --git a/src/operator/modulated_deformable_convolution-inl.h b/src/operator/modulated_deformable_convolution-inl.h
index 7ffa204..b58c8f4d 100644
--- a/src/operator/modulated_deformable_convolution-inl.h
+++ b/src/operator/modulated_deformable_convolution-inl.h
@@ -1,22 +1,3 @@
-/*
- * 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) 2018 Microsoft
* Licensed under The MIT License [see LICENSE for details]
diff --git a/src/operator/modulated_deformable_convolution.cc b/src/operator/modulated_deformable_convolution.cc
index c0c7101..e200eea 100644
--- a/src/operator/modulated_deformable_convolution.cc
+++ b/src/operator/modulated_deformable_convolution.cc
@@ -1,22 +1,3 @@
-/*
- * 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) 2018 Microsoft
* Licensed under The MIT License [see LICENSE for details]
diff --git a/src/operator/modulated_deformable_convolution.cu b/src/operator/modulated_deformable_convolution.cu
index 2a100c2..56f8aba 100644
--- a/src/operator/modulated_deformable_convolution.cu
+++ b/src/operator/modulated_deformable_convolution.cu
@@ -1,22 +1,3 @@
-/*
- * 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) 2018 Microsoft
* Licensed under The MIT License [see LICENSE for details]
diff --git a/tools/license_header.py b/tools/license_header.py
index 9fb0b03..4475171 100755
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -110,6 +110,26 @@ _WHITE_LIST = [
# Licensed under the Boost Software License, Version 1.0
'cmake/Modules/FindJeMalloc.cmake',
+ # Licensed under MIT license and contributed by Microsoft
+ 'src/operator/contrib/nn/modulated_deformable_im2col.cuh',
+ 'src/operator/contrib/nn/modulated_deformable_im2col.h',
+ 'src/operator/modulated_deformable_convolution-inl.h',
+ 'src/operator/modulated_deformable_convolution.cc',
+ 'src/operator/modulated_deformable_convolution.cu',
+
+ # Licensed under Apache 2.0 license and contributed by Microsoft
+ 'src/operator/contrib/deformable_psroi_pooling.cu',
+ 'src/operator/deformable_convolution.cu',
+ 'src/operator/deformable_convolution-inl.h',
+ 'src/operator/contrib/psroi_pooling.cc',
+ 'src/operator/contrib/multi_proposal.cu',
+ 'src/operator/contrib/deformable_psroi_pooling-inl.h',
+ 'src/operator/contrib/deformable_psroi_pooling.cc',
+ 'src/operator/deformable_convolution.cc',
+ 'src/operator/contrib/psroi_pooling.cu',
+ 'src/operator/contrib/multi_proposal.cc',
+ 'src/operator/contrib/multi_proposal-inl.h',
+
# Licensed under Apache 2.0 license
'src/operator/nn/mkldnn/mkldnn_base-inl.h',