You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ba...@apache.org on 2018/01/22 03:40:50 UTC
[incubator-mxnet] branch master updated: [ReviewRequired] License
Fixes post 1.0.0 Release (based on Voting Thread Feedback) (#9462)
This is an automated email from the ASF dual-hosted git repository.
bayard 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 df88901 [ReviewRequired] License Fixes post 1.0.0 Release (based on Voting Thread Feedback) (#9462)
df88901 is described below
commit df8890159fb65abf1b54939006691a50b31354bb
Author: mbaijal <30...@users.noreply.github.com>
AuthorDate: Sun Jan 21 19:40:45 2018 -0800
[ReviewRequired] License Fixes post 1.0.0 Release (based on Voting Thread Feedback) (#9462)
* remove ASF license src/operator/nn/im2col.cuh and src/operator/nn/im2col.h
* Remove ASF header from deformable_im2col.cuh and update license_header.py
* Remove ASF header from coco.py
* Remove ASF header cython/setup.py
* Remove ASF header from nms_kernel.cu
* Remove ASF header from prepare_mkl.sh
---
example/rcnn/rcnn/cython/nms_kernel.cu | 19 -------------------
example/rcnn/rcnn/cython/setup.py | 17 -----------------
example/ssd/dataset/pycocotools/coco.py | 17 -----------------
prepare_mkl.sh | 17 -----------------
src/operator/contrib/nn/deformable_im2col.cuh | 19 -------------------
src/operator/nn/im2col.cuh | 19 -------------------
src/operator/nn/im2col.h | 19 -------------------
tools/license_header.py | 7 +++++++
8 files changed, 7 insertions(+), 127 deletions(-)
diff --git a/example/rcnn/rcnn/cython/nms_kernel.cu b/example/rcnn/rcnn/cython/nms_kernel.cu
index 047a5e0..038a590 100644
--- a/example/rcnn/rcnn/cython/nms_kernel.cu
+++ b/example/rcnn/rcnn/cython/nms_kernel.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.
- */
-
// ------------------------------------------------------------------
// Faster R-CNN
// Copyright (c) 2015 Microsoft
diff --git a/example/rcnn/rcnn/cython/setup.py b/example/rcnn/rcnn/cython/setup.py
index 4ab6f75..2646398 100644
--- a/example/rcnn/rcnn/cython/setup.py
+++ b/example/rcnn/rcnn/cython/setup.py
@@ -1,20 +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.
-
# --------------------------------------------------------
# Fast R-CNN
# Copyright (c) 2015 Microsoft
diff --git a/example/ssd/dataset/pycocotools/coco.py b/example/ssd/dataset/pycocotools/coco.py
index 4dd54ad..a8939f6 100755
--- a/example/ssd/dataset/pycocotools/coco.py
+++ b/example/ssd/dataset/pycocotools/coco.py
@@ -1,20 +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.
-
__author__ = 'tylin'
__version__ = '2.0'
# Interface for accessing the Microsoft COCO dataset.
diff --git a/prepare_mkl.sh b/prepare_mkl.sh
index 657722e..12e5df7 100755
--- a/prepare_mkl.sh
+++ b/prepare_mkl.sh
@@ -1,22 +1,5 @@
#!/bin/bash
-# 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.
-
# set -ex
#
# All modification made by Intel Corporation: © 2016 Intel Corporation
diff --git a/src/operator/contrib/nn/deformable_im2col.cuh b/src/operator/contrib/nn/deformable_im2col.cuh
index 0238921..d874276 100644
--- a/src/operator/contrib/nn/deformable_im2col.cuh
+++ b/src/operator/contrib/nn/deformable_im2col.cuh
@@ -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.
- */
-
/*!
******************* BEGIN Caffe Copyright Notice and Disclaimer ****************
*
diff --git a/src/operator/nn/im2col.cuh b/src/operator/nn/im2col.cuh
index edd5b0d..f9b601c 100644
--- a/src/operator/nn/im2col.cuh
+++ b/src/operator/nn/im2col.cuh
@@ -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.
- */
-
/*!
******************* BEGIN Caffe Copyright Notice and Disclaimer ****************
*
diff --git a/src/operator/nn/im2col.h b/src/operator/nn/im2col.h
index 256319d..ce4d9e3 100644
--- a/src/operator/nn/im2col.h
+++ b/src/operator/nn/im2col.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.
- */
-
/*!
******************* BEGIN Caffe Copyright Notice and Disclaimer ****************
*
diff --git a/tools/license_header.py b/tools/license_header.py
index 5d9d0eb..be73dc3 100644
--- a/tools/license_header.py
+++ b/tools/license_header.py
@@ -68,6 +68,13 @@ _WHITE_LIST = ['R-package/',
'src/operator/nn/pool.h',
'src/operator/contrib/psroi_pooling-inl.h',
'src/operator/contrib/nn/deformable_im2col.h',
+ 'src/operator/contrib/nn/deformable_im2col.cuh',
+ 'src/operator/nn/im2col.h',
+ 'src/operator/nn/im2col.cuh',
+ 'example/ssd/dataset/pycocotools/coco.py',
+ 'example/rcnn/rcnn/cython/setup.py',
+ 'example/rcnn/rcnn/cython/nms_kernel.cu',
+ 'prepare_mkl.sh',
'example/image-classification/predict-cpp/image-classification-predict.cc',
'src/operator/contrib/ctc_include/']
--
To stop receiving notification emails like this one, please contact
bayard@apache.org.