This is an automated email from the ASF dual-hosted git repository.
lausen pushed a commit to branch v1.9.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.9.x by this push:
new ffb764f [License] Remove mistakenly placed ASF headers (#20520)
ffb764f is described below
commit ffb764f0c0ccdccbbe75e625ad197506481d2acf
Author: Sandeep Krishnamurthy <[email protected]>
AuthorDate: Mon Aug 16 18:37:57 2021 -0700
[License] Remove mistakenly placed ASF headers (#20520)
https://lists.apache.org/thread.html/r9cb5611653594f7cb68ee55d8be7e5edbb0858fd287337d5fece7e04%40%3Cgeneral.incubator.apache.org%3E
---
LICENSE | 9 +++++++++
rat-excludes | 18 ++++++++++++++++++
src/operator/contrib/deformable_convolution-inl.h | 19 -------------------
src/operator/contrib/deformable_convolution.cc | 19 -------------------
src/operator/contrib/deformable_convolution.cu | 19 -------------------
.../contrib/deformable_psroi_pooling-inl.h | 19 -------------------
src/operator/contrib/deformable_psroi_pooling.cc | 19 -------------------
src/operator/contrib/deformable_psroi_pooling.cu | 19 -------------------
.../contrib/modulated_deformable_convolution-inl.h | 22 ++--------------------
.../contrib/modulated_deformable_convolution.cc | 21 +--------------------
.../contrib/modulated_deformable_convolution.cu | 22 ++--------------------
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 -------------------
tools/license_header.py | 20 ++++++++++++++++++++
17 files changed, 52 insertions(+), 269 deletions(-)
diff --git a/LICENSE b/LICENSE
index 56976f1..9b94e8e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -245,6 +245,11 @@
3rdparty/onnx-tensorrt/third_party/onnx
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/contrib/modulated_deformable_convolution-inl.h
+ src/operator/contrib/modulated_deformable_convolution.cc
+ src/operator/contrib/modulated_deformable_convolution.cu
=======================================================================================
3-clause BSD license
@@ -316,6 +321,10 @@
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/contrib/deformable_convolution-inl.h
+ src/operator/contrib/deformable_convolution.cc
+ src/operator/contrib/deformable_convolution.cu
=======================================================================================
Apache-2.0 license + Boost Software License, Version 1.0
diff --git a/rat-excludes b/rat-excludes
index 488a228..d877d0e 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -132,6 +132,24 @@ FindCUDAToolkit.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_convolution-inl.h
b/src/operator/contrib/deformable_convolution-inl.h
index 5e0e86b..4dbec14 100644
--- a/src/operator/contrib/deformable_convolution-inl.h
+++ b/src/operator/contrib/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/contrib/deformable_convolution.cc
b/src/operator/contrib/deformable_convolution.cc
index 6013837..c83c42a 100644
--- a/src/operator/contrib/deformable_convolution.cc
+++ b/src/operator/contrib/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/contrib/deformable_convolution.cu
b/src/operator/contrib/deformable_convolution.cu
index cf13bfa..4b5ed7a 100644
--- a/src/operator/contrib/deformable_convolution.cu
+++ b/src/operator/contrib/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/contrib/deformable_psroi_pooling-inl.h
b/src/operator/contrib/deformable_psroi_pooling-inl.h
index e7e108a..b397053 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 697376d..3e3b8ed 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 50ad178..48a8841 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/modulated_deformable_convolution-inl.h
b/src/operator/contrib/modulated_deformable_convolution-inl.h
index 6ec5d88..983ec12 100644
--- a/src/operator/contrib/modulated_deformable_convolution-inl.h
+++ b/src/operator/contrib/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]
@@ -25,7 +6,8 @@
* \ref: https://github.com/Yangqing/caffe/wiki/Convolution-in-Caffe:-a-memo
* \ref: https://arxiv.org/abs/1811.11168
* \author Yuwen Xiong, Haozhi Qi, Jifeng Dai, Xizhou Zhu, Han Hu
-*/
+ */
+
#ifndef MXNET_OPERATOR_CONTRIB_MODULATED_DEFORMABLE_CONVOLUTION_INL_H_
#define MXNET_OPERATOR_CONTRIB_MODULATED_DEFORMABLE_CONVOLUTION_INL_H_
diff --git a/src/operator/contrib/modulated_deformable_convolution.cc
b/src/operator/contrib/modulated_deformable_convolution.cc
index 5fa25f7..eff7f05 100644
--- a/src/operator/contrib/modulated_deformable_convolution.cc
+++ b/src/operator/contrib/modulated_deformable_convolution.cc
@@ -1,29 +1,10 @@
-/*
- * 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]
* \file modulated_deformable_convolution.cc
* \brief
* \author Yuwen Xiong, Haozhi Qi, Jifeng Dai, Xizhou Zhu, Han Hu
-*/
+ */
#include "./modulated_deformable_convolution-inl.h"
diff --git a/src/operator/contrib/modulated_deformable_convolution.cu
b/src/operator/contrib/modulated_deformable_convolution.cu
index 470d2c0..541a693 100644
--- a/src/operator/contrib/modulated_deformable_convolution.cu
+++ b/src/operator/contrib/modulated_deformable_convolution.cu
@@ -1,29 +1,11 @@
-/*
- * 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]
* \file modulated_deformable_convolution.cu
* \brief
* \author Yuwen Xiong, Haozhi Qi, Jifeng Dai, Xizhou Zhu, Han Hu
-*/
+ */
+
#include "./modulated_deformable_convolution-inl.h"
#include <vector>
diff --git a/src/operator/contrib/multi_proposal-inl.h
b/src/operator/contrib/multi_proposal-inl.h
index 79d62ef..cc81f3b 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 e77a0b5..4f75023 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 74bb25e..8accae6 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 eb69961..5c8226b 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 fab478c..8524ea0 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/tools/license_header.py b/tools/license_header.py
index b4db33a..c304fc4 100755
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -119,6 +119,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/contrib/modulated_deformable_convolution-inl.h',
+ 'src/operator/contrib/modulated_deformable_convolution.cc',
+ 'src/operator/contrib/modulated_deformable_convolution.cu',
+
+ # Licensed under Apache 2.0 license and contributed by Microsoft
+ 'src/operator/contrib/deformable_psroi_pooling.cu',
+ 'src/operator/contrib/deformable_convolution.cu',
+ 'src/operator/contrib/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/contrib/deformable_convolution.cc',
+ 'src/operator/contrib/psroi_pooling.cu',
+ 'src/operator/contrib/multi_proposal.cc',
+ 'src/operator/contrib/multi_proposal-inl.h',
+
# Julia package metadata, generated by Pkg3.jl
'julia/Project.toml',
