From d51075968c5fd40b37a55d20c8e945c1f181d529 Mon Sep 17 00:00:00 2001 From: Oh233 Date: Tue, 12 Jun 2018 20:47:58 +0800 Subject: [PATCH] license change --- LICENSE | 238 ++---------------- deeplab/config/config.py | 9 +- deeplab/core/DataParallelExecutorGroup.py | 9 +- deeplab/core/callback.py | 9 +- deeplab/core/loader.py | 9 +- deeplab/core/metric.py | 9 +- deeplab/core/module.py | 9 +- deeplab/core/tester.py | 9 +- deeplab/demo.py | 10 +- deeplab/function/reeval.py | 9 +- deeplab/function/test_deeplab.py | 9 +- deeplab/symbols/resnet_v1_101_deeplab.py | 11 +- deeplab/symbols/resnet_v1_101_deeplab_dcn.py | 11 +- deeplab/test.py | 11 +- deeplab/train.py | 11 +- faster_rcnn/config/config.py | 9 +- faster_rcnn/core/DataParallelExecutorGroup.py | 9 +- faster_rcnn/core/callback.py | 9 +- faster_rcnn/core/loader.py | 9 +- faster_rcnn/core/metric.py | 9 +- faster_rcnn/core/module.py | 10 +- faster_rcnn/core/rcnn.py | 9 +- faster_rcnn/core/tester.py | 9 +- faster_rcnn/function/test_rcnn.py | 11 +- faster_rcnn/function/test_rpn.py | 9 +- faster_rcnn/function/train_rcnn.py | 11 +- faster_rcnn/function/train_rpn.py | 9 +- .../operator_cxx/deformable_convolution-inl.h | 2 +- .../operator_cxx/deformable_convolution.cc | 2 +- .../operator_cxx/deformable_convolution.cu | 2 +- .../deformable_psroi_pooling-inl.h | 12 +- .../operator_cxx/deformable_psroi_pooling.cc | 2 +- .../operator_cxx/deformable_psroi_pooling.cu | 2 +- .../operator_cxx/nn/deformable_im2col.cuh | 2 +- .../operator_cxx/nn/deformable_im2col.h | 2 +- faster_rcnn/operator_cxx/psroi_pooling-inl.h | 2 +- faster_rcnn/operator_cxx/psroi_pooling.cc | 2 +- faster_rcnn/operator_cxx/psroi_pooling.cu | 2 +- faster_rcnn/operator_py/box_annotator_ohem.py | 2 +- faster_rcnn/operator_py/proposal.py | 12 + faster_rcnn/operator_py/proposal_target.py | 9 +- faster_rcnn/symbols/resnet_v1_101_rcnn.py | 5 +- faster_rcnn/symbols/resnet_v1_101_rcnn_dcn.py | 2 +- faster_rcnn/test.py | 11 +- faster_rcnn/train_end2end.py | 11 +- faster_rcnn/train_rcnn.py | 11 +- fpn/config/config.py | 9 +- fpn/core/DataParallelExecutorGroup.py | 9 +- fpn/core/callback.py | 9 +- fpn/core/loader.py | 9 +- fpn/core/metric.py | 11 +- fpn/core/module.py | 9 +- fpn/core/rcnn.py | 11 +- fpn/core/tester.py | 11 +- fpn/function/test_rcnn.py | 13 +- fpn/function/train_rcnn.py | 15 +- fpn/operator_py/box_annotator_ohem.py | 4 +- fpn/operator_py/fpn_roi_pooling.py | 4 +- fpn/operator_py/proposal_target.py | 9 +- fpn/operator_py/pyramid_proposal.py | 2 +- fpn/symbols/resnet_v1_101_fpn_dcn_rcnn.py | 2 +- fpn/symbols/resnet_v1_101_fpn_rcnn.py | 2 +- fpn/test.py | 11 +- fpn/train_end2end.py | 12 +- lib/bbox/bbox_regression.py | 12 +- lib/bbox/bbox_transform.py | 13 + lib/bbox/setup_linux.py | 12 +- lib/bbox/setup_windows.py | 11 +- lib/dataset/cityscape.py | 3 +- lib/dataset/coco.py | 13 + lib/mask/mask_transform.py | 2 +- lib/rpn/generate_anchor.py | 13 + lib/rpn/rpn.py | 10 +- lib/segmentation/segmentation.py | 7 + lib/utils/PrefetchingIter.py | 10 +- lib/utils/create_logger.py | 2 +- lib/utils/image.py | 7 + lib/utils/image_processing.py | 7 + lib/utils/load_data.py | 7 + lib/utils/load_model.py | 7 + lib/utils/lr_scheduler.py | 2 +- lib/utils/mask_coco2voc.py | 2 +- lib/utils/mask_voc2coco.py | 2 +- lib/utils/roidb.py | 7 + lib/utils/save_model.py | 7 + lib/utils/show_boxes.py | 2 +- lib/utils/show_masks.py | 7 + lib/utils/show_offset.py | 2 +- lib/utils/symbol.py | 2 +- rfcn/config/config.py | 9 +- rfcn/core/DataParallelExecutorGroup.py | 9 +- rfcn/core/callback.py | 9 +- rfcn/core/loader.py | 9 +- rfcn/core/metric.py | 9 +- rfcn/core/module.py | 9 +- rfcn/core/rcnn.py | 10 +- rfcn/core/tester.py | 9 +- rfcn/deform_conv_demo.py | 4 +- rfcn/deform_psroi_demo.py | 7 + rfcn/demo.py | 4 +- rfcn/function/test_rcnn.py | 10 +- rfcn/function/test_rpn.py | 9 +- rfcn/function/train_rcnn.py | 9 +- rfcn/function/train_rpn.py | 9 +- .../operator_cxx/deformable_convolution-inl.h | 2 +- rfcn/operator_cxx/deformable_convolution.cc | 2 +- rfcn/operator_cxx/deformable_convolution.cu | 2 +- .../deformable_psroi_pooling-inl.h | 2 +- rfcn/operator_cxx/deformable_psroi_pooling.cc | 2 +- rfcn/operator_cxx/deformable_psroi_pooling.cu | 2 +- rfcn/operator_cxx/nn/deformable_im2col.cuh | 2 +- rfcn/operator_cxx/nn/deformable_im2col.h | 2 +- rfcn/operator_cxx/psroi_pooling-inl.h | 2 +- rfcn/operator_cxx/psroi_pooling.cc | 2 +- rfcn/operator_cxx/psroi_pooling.cu | 2 +- rfcn/operator_py/box_annotator_ohem.py | 2 +- rfcn/operator_py/proposal.py | 16 +- rfcn/operator_py/proposal_target.py | 9 +- rfcn/symbols/deform_conv_demo.py | 2 +- rfcn/symbols/deform_psroi_demo.py | 2 +- rfcn/symbols/resnet_v1_101_rfcn.py | 2 +- rfcn/symbols/resnet_v1_101_rfcn_dcn.py | 2 +- rfcn/symbols/rfcn_demo.py | 7 + rfcn/test.py | 9 +- rfcn/train_alternate.py | 9 +- rfcn/train_end2end.py | 9 +- rfcn/train_rfcn.py | 9 +- 127 files changed, 694 insertions(+), 433 deletions(-) diff --git a/LICENSE b/LICENSE index 552af9f..f9c3ddd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,222 +1,30 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright Microsoft Corporation - - Licensed 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. - - -Apache License, Version 2.0 - -Copyright (c) by respective contributors +Deformable ConvNets -Licensed 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 +The MIT License (MIT) - http://www.apache.org/licenses/LICENSE-2.0 +Copyright (c) 2017 Microsoft Corporation -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. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +************************************************************************ +THIRD-PARTY SOFTWARE NOTICES AND INFORMATION MXNet diff --git a/deeplab/config/config.py b/deeplab/config/config.py index cae1c8d..b6e652f 100644 --- a/deeplab/config/config.py +++ b/deeplab/config/config.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import yaml import numpy as np diff --git a/deeplab/core/DataParallelExecutorGroup.py b/deeplab/core/DataParallelExecutorGroup.py index 15c8469..14c3a50 100644 --- a/deeplab/core/DataParallelExecutorGroup.py +++ b/deeplab/core/DataParallelExecutorGroup.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import logging import numpy as np diff --git a/deeplab/core/callback.py b/deeplab/core/callback.py index f970d5e..06ffa14 100644 --- a/deeplab/core/callback.py +++ b/deeplab/core/callback.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import time import logging diff --git a/deeplab/core/loader.py b/deeplab/core/loader.py index c796fae..f6a58be 100644 --- a/deeplab/core/loader.py +++ b/deeplab/core/loader.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import numpy as np import mxnet as mx diff --git a/deeplab/core/metric.py b/deeplab/core/metric.py index b3eb4b8..6eff6fc 100644 --- a/deeplab/core/metric.py +++ b/deeplab/core/metric.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import mxnet as mx import numpy as np diff --git a/deeplab/core/module.py b/deeplab/core/module.py index c20ad17..c4b9884 100644 --- a/deeplab/core/module.py +++ b/deeplab/core/module.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """A `MutableModule` implement the `BaseModule` API, and allows input shape varying with training iterations. If shapes vary, executors will rebind, diff --git a/deeplab/core/tester.py b/deeplab/core/tester.py index 7309cac..1202f68 100644 --- a/deeplab/core/tester.py +++ b/deeplab/core/tester.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import cPickle import os diff --git a/deeplab/demo.py b/deeplab/demo.py index 9ce80b3..5010054 100644 --- a/deeplab/demo.py +++ b/deeplab/demo.py @@ -1,8 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Zheng Zhang +# Licensed under The MIT License [see LICENSE for details] +# Modified by Zheng Zhang +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ # -------------------------------------------------------- import _init_paths diff --git a/deeplab/function/reeval.py b/deeplab/function/reeval.py index 0fdd77f..b5ee0be 100644 --- a/deeplab/function/reeval.py +++ b/deeplab/function/reeval.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import cPickle diff --git a/deeplab/function/test_deeplab.py b/deeplab/function/test_deeplab.py index 0853c41..b8f5681 100644 --- a/deeplab/function/test_deeplab.py +++ b/deeplab/function/test_deeplab.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import pprint diff --git a/deeplab/symbols/resnet_v1_101_deeplab.py b/deeplab/symbols/resnet_v1_101_deeplab.py index fc41aee..bc64698 100644 --- a/deeplab/symbols/resnet_v1_101_deeplab.py +++ b/deeplab/symbols/resnet_v1_101_deeplab.py @@ -1,9 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Zheng Zhang +# Licensed under The MIT License [see LICENSE for details] +# Modified by Zheng Zhang +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ # -------------------------------------------------------- import cPickle diff --git a/deeplab/symbols/resnet_v1_101_deeplab_dcn.py b/deeplab/symbols/resnet_v1_101_deeplab_dcn.py index ebecc0d..0fa522d 100644 --- a/deeplab/symbols/resnet_v1_101_deeplab_dcn.py +++ b/deeplab/symbols/resnet_v1_101_deeplab_dcn.py @@ -1,9 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Zheng Zhang +# Licensed under The MIT License [see LICENSE for details] +# Modified by Zheng Zhang +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ # -------------------------------------------------------- import cPickle diff --git a/deeplab/test.py b/deeplab/test.py index ab59064..509bfd3 100644 --- a/deeplab/test.py +++ b/deeplab/test.py @@ -1,9 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Zheng Zhang +# Licensed under The MIT License [see LICENSE for details] +# Modified by Zheng Zhang +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ # -------------------------------------------------------- import _init_paths diff --git a/deeplab/train.py b/deeplab/train.py index 5007481..d735e72 100644 --- a/deeplab/train.py +++ b/deeplab/train.py @@ -1,9 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Zheng Zhang +# Licensed under The MIT License [see LICENSE for details] +# Modified by Zheng Zhang +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ # -------------------------------------------------------- import _init_paths diff --git a/faster_rcnn/config/config.py b/faster_rcnn/config/config.py index 70845ea..970c582 100644 --- a/faster_rcnn/config/config.py +++ b/faster_rcnn/config/config.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong, Bin Xiao # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import yaml import numpy as np diff --git a/faster_rcnn/core/DataParallelExecutorGroup.py b/faster_rcnn/core/DataParallelExecutorGroup.py index 9579514..69fdd5c 100644 --- a/faster_rcnn/core/DataParallelExecutorGroup.py +++ b/faster_rcnn/core/DataParallelExecutorGroup.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import logging import numpy as np diff --git a/faster_rcnn/core/callback.py b/faster_rcnn/core/callback.py index 4286f43..059fe71 100644 --- a/faster_rcnn/core/callback.py +++ b/faster_rcnn/core/callback.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import time import logging diff --git a/faster_rcnn/core/loader.py b/faster_rcnn/core/loader.py index 78de81b..777367a 100644 --- a/faster_rcnn/core/loader.py +++ b/faster_rcnn/core/loader.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import numpy as np import mxnet as mx diff --git a/faster_rcnn/core/metric.py b/faster_rcnn/core/metric.py index 52f885b..b458f2f 100644 --- a/faster_rcnn/core/metric.py +++ b/faster_rcnn/core/metric.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import mxnet as mx import numpy as np diff --git a/faster_rcnn/core/module.py b/faster_rcnn/core/module.py index c20ad17..0adcdda 100644 --- a/faster_rcnn/core/module.py +++ b/faster_rcnn/core/module.py @@ -1,11 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- - +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """A `MutableModule` implement the `BaseModule` API, and allows input shape varying with training iterations. If shapes vary, executors will rebind, using shared arrays from the initial module binded with maximum shape. diff --git a/faster_rcnn/core/rcnn.py b/faster_rcnn/core/rcnn.py index d3863ac..85103fa 100644 --- a/faster_rcnn/core/rcnn.py +++ b/faster_rcnn/core/rcnn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """ Fast R-CNN: data = diff --git a/faster_rcnn/core/tester.py b/faster_rcnn/core/tester.py index db7e433..05c49db 100644 --- a/faster_rcnn/core/tester.py +++ b/faster_rcnn/core/tester.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import cPickle import os diff --git a/faster_rcnn/function/test_rcnn.py b/faster_rcnn/function/test_rcnn.py index f25de84..515b6dd 100644 --- a/faster_rcnn/function/test_rcnn.py +++ b/faster_rcnn/function/test_rcnn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Guodong Zhang -# -------------------------------------------------------- +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import pprint diff --git a/faster_rcnn/function/test_rpn.py b/faster_rcnn/function/test_rpn.py index 8393495..e323725 100644 --- a/faster_rcnn/function/test_rpn.py +++ b/faster_rcnn/function/test_rpn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import pprint diff --git a/faster_rcnn/function/train_rcnn.py b/faster_rcnn/function/train_rcnn.py index c9e2691..e948fe5 100644 --- a/faster_rcnn/function/train_rcnn.py +++ b/faster_rcnn/function/train_rcnn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Guodong Zhang -# -------------------------------------------------------- +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import logging diff --git a/faster_rcnn/function/train_rpn.py b/faster_rcnn/function/train_rpn.py index be1be47..ef447a5 100644 --- a/faster_rcnn/function/train_rpn.py +++ b/faster_rcnn/function/train_rpn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import logging diff --git a/faster_rcnn/operator_cxx/deformable_convolution-inl.h b/faster_rcnn/operator_cxx/deformable_convolution-inl.h index 963a669..5948865 100644 --- a/faster_rcnn/operator_cxx/deformable_convolution-inl.h +++ b/faster_rcnn/operator_cxx/deformable_convolution-inl.h @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_convolution-inl.h * \brief * \ref: https://github.com/Yangqing/caffe/wiki/Convolution-in-Caffe:-a-memo diff --git a/faster_rcnn/operator_cxx/deformable_convolution.cc b/faster_rcnn/operator_cxx/deformable_convolution.cc index a5916a5..49e6c28 100644 --- a/faster_rcnn/operator_cxx/deformable_convolution.cc +++ b/faster_rcnn/operator_cxx/deformable_convolution.cc @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_convolution.cc * \brief * \author Yuwen Xiong, Haozhi Qi, Jifeng Dai diff --git a/faster_rcnn/operator_cxx/deformable_convolution.cu b/faster_rcnn/operator_cxx/deformable_convolution.cu index 59948fd..5ee446c 100644 --- a/faster_rcnn/operator_cxx/deformable_convolution.cu +++ b/faster_rcnn/operator_cxx/deformable_convolution.cu @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_convolution.cu * \brief * \author Yuwen Xiong, Haozhi Qi, Jifeng Dai diff --git a/faster_rcnn/operator_cxx/deformable_psroi_pooling-inl.h b/faster_rcnn/operator_cxx/deformable_psroi_pooling-inl.h index 7226299..c4f06a9 100644 --- a/faster_rcnn/operator_cxx/deformable_psroi_pooling-inl.h +++ b/faster_rcnn/operator_cxx/deformable_psroi_pooling-inl.h @@ -1,9 +1,11 @@ /*! -* Copyright (c) 2017 Microsoft -* Licensed under The Apache-2.0 License [see LICENSE for details] -* \file deformable_psroi_pooling-inl.h -* \brief deformable psroi pooling operator and symbol -* \author Yi Li, Guodong Zhang, Jifeng Dai + * Copyright (c) 2017 Microsoft + * Licensed under The MIT License [see LICENSE for details] + * \file deformable_convolution-inl.h + * \brief + * \ref: https://github.com/Yangqing/caffe/wiki/Convolution-in-Caffe:-a-memo + * \ref: https://arxiv.org/abs/1703.06211 + * \author Yuwen Xiong, Haozhi Qi, Jifeng Dai */ #ifndef MXNET_OPERATOR_DEFORMABLE_PSROI_POOLING_INL_H_ #define MXNET_OPERATOR_DEFORMABLE_PSROI_POOLING_INL_H_ diff --git a/faster_rcnn/operator_cxx/deformable_psroi_pooling.cc b/faster_rcnn/operator_cxx/deformable_psroi_pooling.cc index 4a21a79..83e40c0 100644 --- a/faster_rcnn/operator_cxx/deformable_psroi_pooling.cc +++ b/faster_rcnn/operator_cxx/deformable_psroi_pooling.cc @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_psroi_pooling.cc * \brief * \author Yi Li, Guodong Zhang, Jifeng Dai diff --git a/faster_rcnn/operator_cxx/deformable_psroi_pooling.cu b/faster_rcnn/operator_cxx/deformable_psroi_pooling.cu index 5b8f361..3b17056 100644 --- a/faster_rcnn/operator_cxx/deformable_psroi_pooling.cu +++ b/faster_rcnn/operator_cxx/deformable_psroi_pooling.cu @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_psroi_pooling.cu * \brief * \author Yi Li, Guodong Zhang, Jifeng Dai diff --git a/faster_rcnn/operator_cxx/nn/deformable_im2col.cuh b/faster_rcnn/operator_cxx/nn/deformable_im2col.cuh index d9e7b97..f0dc2e5 100644 --- a/faster_rcnn/operator_cxx/nn/deformable_im2col.cuh +++ b/faster_rcnn/operator_cxx/nn/deformable_im2col.cuh @@ -49,7 +49,7 @@ ***************** END Caffe Copyright Notice and Disclaimer ******************** * * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_im2col.cuh * \brief Function definitions of converting an image to * column matrix based on kernel, padding, dilation, and offset. diff --git a/faster_rcnn/operator_cxx/nn/deformable_im2col.h b/faster_rcnn/operator_cxx/nn/deformable_im2col.h index 93a5551..60a2ecd 100644 --- a/faster_rcnn/operator_cxx/nn/deformable_im2col.h +++ b/faster_rcnn/operator_cxx/nn/deformable_im2col.h @@ -49,7 +49,7 @@ ***************** END Caffe Copyright Notice and Disclaimer ******************** * * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_im2col.h * \brief Function definitions of converting an image to * column matrix based on kernel, padding, dilation, and offset. diff --git a/faster_rcnn/operator_cxx/psroi_pooling-inl.h b/faster_rcnn/operator_cxx/psroi_pooling-inl.h index 956861c..39489f4 100644 --- a/faster_rcnn/operator_cxx/psroi_pooling-inl.h +++ b/faster_rcnn/operator_cxx/psroi_pooling-inl.h @@ -1,7 +1,7 @@ /*! * Copyright (c) 2017 by Contributors * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file psroi_pooling-inl.h * \brief psroi pooling operator and symbol * \author Yi Li, Tairui Chen, Guodong Zhang, Jifeng Dai diff --git a/faster_rcnn/operator_cxx/psroi_pooling.cc b/faster_rcnn/operator_cxx/psroi_pooling.cc index 4edaf4f..5c7e126 100644 --- a/faster_rcnn/operator_cxx/psroi_pooling.cc +++ b/faster_rcnn/operator_cxx/psroi_pooling.cc @@ -1,7 +1,7 @@ /*! * Copyright (c) 2017 by Contributors * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file psroi_pooling.cc * \brief psroi pooling operator * \author Yi Li, Tairui Chen, Guodong Zhang, Jifeng Dai diff --git a/faster_rcnn/operator_cxx/psroi_pooling.cu b/faster_rcnn/operator_cxx/psroi_pooling.cu index 43c57ee..07ccf1c 100644 --- a/faster_rcnn/operator_cxx/psroi_pooling.cu +++ b/faster_rcnn/operator_cxx/psroi_pooling.cu @@ -1,7 +1,7 @@ /*! * Copyright (c) 2017 by Contributors * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file psroi_pooling.cu * \brief psroi pooling operator * \author Yi Li, Tairui Chen, Guodong Zhang, Jifeng Dai diff --git a/faster_rcnn/operator_py/box_annotator_ohem.py b/faster_rcnn/operator_py/box_annotator_ohem.py index f11b7b5..df867b0 100644 --- a/faster_rcnn/operator_py/box_annotator_ohem.py +++ b/faster_rcnn/operator_py/box_annotator_ohem.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yuwen Xiong # -------------------------------------------------------- diff --git a/faster_rcnn/operator_py/proposal.py b/faster_rcnn/operator_py/proposal.py index c8b868d..815ad58 100644 --- a/faster_rcnn/operator_py/proposal.py +++ b/faster_rcnn/operator_py/proposal.py @@ -1,3 +1,15 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """ Proposal Operator transform anchor coordinates into ROI coordinates with prediction results on classification probability and bounding box prediction results, and image size and scale information. diff --git a/faster_rcnn/operator_py/proposal_target.py b/faster_rcnn/operator_py/proposal_target.py index d56ae5b..f837742 100644 --- a/faster_rcnn/operator_py/proposal_target.py +++ b/faster_rcnn/operator_py/proposal_target.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """ Proposal Target Operator selects foreground and background roi and assigns label, bbox_transform to them. diff --git a/faster_rcnn/symbols/resnet_v1_101_rcnn.py b/faster_rcnn/symbols/resnet_v1_101_rcnn.py index 12059ba..0df9e47 100644 --- a/faster_rcnn/symbols/resnet_v1_101_rcnn.py +++ b/faster_rcnn/symbols/resnet_v1_101_rcnn.py @@ -1,9 +1,8 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Guodong Zhang -# Modified by Bin Xiao +# Licensed under The MIT License [see LICENSE for details] +# Written by Guodong Zhang, Bin Xiao # -------------------------------------------------------- import cPickle diff --git a/faster_rcnn/symbols/resnet_v1_101_rcnn_dcn.py b/faster_rcnn/symbols/resnet_v1_101_rcnn_dcn.py index 376a359..a0b3676 100644 --- a/faster_rcnn/symbols/resnet_v1_101_rcnn_dcn.py +++ b/faster_rcnn/symbols/resnet_v1_101_rcnn_dcn.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Guodong Zhang # -------------------------------------------------------- diff --git a/faster_rcnn/test.py b/faster_rcnn/test.py index 917062e..7381e78 100644 --- a/faster_rcnn/test.py +++ b/faster_rcnn/test.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong -# -------------------------------------------------------- +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import _init_paths diff --git a/faster_rcnn/train_end2end.py b/faster_rcnn/train_end2end.py index 3dcbf69..6deac43 100644 --- a/faster_rcnn/train_end2end.py +++ b/faster_rcnn/train_end2end.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong -# -------------------------------------------------------- +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import _init_paths import cv2 diff --git a/faster_rcnn/train_rcnn.py b/faster_rcnn/train_rcnn.py index 8f7333b..1182c47 100644 --- a/faster_rcnn/train_rcnn.py +++ b/faster_rcnn/train_rcnn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong -# -------------------------------------------------------- +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import _init_paths diff --git a/fpn/config/config.py b/fpn/config/config.py index 6225c33..f5f59bf 100644 --- a/fpn/config/config.py +++ b/fpn/config/config.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong, Bin Xiao # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import yaml import numpy as np diff --git a/fpn/core/DataParallelExecutorGroup.py b/fpn/core/DataParallelExecutorGroup.py index 9579514..69fdd5c 100644 --- a/fpn/core/DataParallelExecutorGroup.py +++ b/fpn/core/DataParallelExecutorGroup.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import logging import numpy as np diff --git a/fpn/core/callback.py b/fpn/core/callback.py index 4286f43..059fe71 100644 --- a/fpn/core/callback.py +++ b/fpn/core/callback.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import time import logging diff --git a/fpn/core/loader.py b/fpn/core/loader.py index e67f310..329bd7c 100644 --- a/fpn/core/loader.py +++ b/fpn/core/loader.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Haozhi Qi # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import numpy as np import mxnet as mx diff --git a/fpn/core/metric.py b/fpn/core/metric.py index 0548d15..d77cf22 100644 --- a/fpn/core/metric.py +++ b/fpn/core/metric.py @@ -1,9 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Modified by Yuwen Xiong +# Licensed under The MIT License [see LICENSE for details] +# Modified by Haozhi Qi +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ # -------------------------------------------------------- import mxnet as mx diff --git a/fpn/core/module.py b/fpn/core/module.py index c20ad17..c4b9884 100644 --- a/fpn/core/module.py +++ b/fpn/core/module.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """A `MutableModule` implement the `BaseModule` API, and allows input shape varying with training iterations. If shapes vary, executors will rebind, diff --git a/fpn/core/rcnn.py b/fpn/core/rcnn.py index d3863ac..1c0f983 100644 --- a/fpn/core/rcnn.py +++ b/fpn/core/rcnn.py @@ -1,9 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Modified by Yuwen Xiong +# Licensed under The MIT License [see LICENSE for details] +# Modified by Haozhi Qi +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ # -------------------------------------------------------- """ Fast R-CNN: diff --git a/fpn/core/tester.py b/fpn/core/tester.py index c7ce628..5748bd1 100644 --- a/fpn/core/tester.py +++ b/fpn/core/tester.py @@ -1,9 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Haozhi Qi +# Licensed under The MIT License [see LICENSE for details] +# Modified by Haozhi Qi +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ # -------------------------------------------------------- import cPickle diff --git a/fpn/function/test_rcnn.py b/fpn/function/test_rcnn.py index f25de84..4fa00a6 100644 --- a/fpn/function/test_rcnn.py +++ b/fpn/function/test_rcnn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Modified by Guodong Zhang -# -------------------------------------------------------- +# Licensed under The MIT License [see LICENSE for details] +# Modified by Haozhi Qi +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import pprint diff --git a/fpn/function/train_rcnn.py b/fpn/function/train_rcnn.py index c9e2691..b241c92 100644 --- a/fpn/function/train_rcnn.py +++ b/fpn/function/train_rcnn.py @@ -1,11 +1,16 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Modified by Guodong Zhang -# -------------------------------------------------------- - +# Licensed under The MIT License [see LICENSE for details] +# Modified by Haozhi Qi +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- + import argparse import logging import pprint diff --git a/fpn/operator_py/box_annotator_ohem.py b/fpn/operator_py/box_annotator_ohem.py index ac03c6a..3779032 100644 --- a/fpn/operator_py/box_annotator_ohem.py +++ b/fpn/operator_py/box_annotator_ohem.py @@ -1,8 +1,8 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Yuwen Xiong +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong # -------------------------------------------------------- """ diff --git a/fpn/operator_py/fpn_roi_pooling.py b/fpn/operator_py/fpn_roi_pooling.py index 11664d1..f7247f1 100644 --- a/fpn/operator_py/fpn_roi_pooling.py +++ b/fpn/operator_py/fpn_roi_pooling.py @@ -1,8 +1,8 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Haozhi Qi, Yuwen Xiong +# Licensed under The MIT License [see LICENSE for details] +# Modified by Haozhi Qi, Yuwen Xiong # -------------------------------------------------------- import mxnet as mx diff --git a/fpn/operator_py/proposal_target.py b/fpn/operator_py/proposal_target.py index 9939bc6..270edbf 100644 --- a/fpn/operator_py/proposal_target.py +++ b/fpn/operator_py/proposal_target.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """ Proposal Target Operator selects foreground and background roi and assigns label, bbox_transform to them. diff --git a/fpn/operator_py/pyramid_proposal.py b/fpn/operator_py/pyramid_proposal.py index e8ebb9c..f94d046 100644 --- a/fpn/operator_py/pyramid_proposal.py +++ b/fpn/operator_py/pyramid_proposal.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Haozhi Qi # -------------------------------------------------------- diff --git a/fpn/symbols/resnet_v1_101_fpn_dcn_rcnn.py b/fpn/symbols/resnet_v1_101_fpn_dcn_rcnn.py index ef62a62..33aad8e 100644 --- a/fpn/symbols/resnet_v1_101_fpn_dcn_rcnn.py +++ b/fpn/symbols/resnet_v1_101_fpn_dcn_rcnn.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Haozhi Qi # -------------------------------------------------------- diff --git a/fpn/symbols/resnet_v1_101_fpn_rcnn.py b/fpn/symbols/resnet_v1_101_fpn_rcnn.py index f72b3cc..4278d99 100644 --- a/fpn/symbols/resnet_v1_101_fpn_rcnn.py +++ b/fpn/symbols/resnet_v1_101_fpn_rcnn.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Haozhi Qi # -------------------------------------------------------- diff --git a/fpn/test.py b/fpn/test.py index d19601d..9bd70c5 100644 --- a/fpn/test.py +++ b/fpn/test.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Haozhi Qi -# -------------------------------------------------------- +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import _init_paths diff --git a/fpn/train_end2end.py b/fpn/train_end2end.py index 76ff250..5d7605d 100644 --- a/fpn/train_end2end.py +++ b/fpn/train_end2end.py @@ -1,10 +1,16 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Haozhi Qi -# -------------------------------------------------------- +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- + import _init_paths import cv2 diff --git a/lib/bbox/bbox_regression.py b/lib/bbox/bbox_regression.py index 7b9d5bc..793607d 100644 --- a/lib/bbox/bbox_regression.py +++ b/lib/bbox/bbox_regression.py @@ -1,11 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Modified by Yuwen Xiong, from py-faster-rcnn (https://github.com/rbgirshick/py-faster-rcnn) +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong +# -------------------------------------------------------- +# Based on: +# py-faster-rcnn +# Copyright (c) 2016 by Contributors +# Licence under The MIT License +# py-faster-rcnn (https://github.com/rbgirshick/py-faster-rcnn) # -------------------------------------------------------- - """ This file has functions about generating bounding box regression targets diff --git a/lib/bbox/bbox_transform.py b/lib/bbox/bbox_transform.py index c149a16..583e395 100644 --- a/lib/bbox/bbox_transform.py +++ b/lib/bbox/bbox_transform.py @@ -1,3 +1,16 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong +# -------------------------------------------------------- +# Based on: +# py-faster-rcnn +# Copyright (c) 2016 by Contributors +# Licence under The MIT License +# py-faster-rcnn (https://github.com/rbgirshick/py-faster-rcnn) +# -------------------------------------------------------- + import numpy as np from bbox import bbox_overlaps_cython diff --git a/lib/bbox/setup_linux.py b/lib/bbox/setup_linux.py index dc35242..f1cd677 100644 --- a/lib/bbox/setup_linux.py +++ b/lib/bbox/setup_linux.py @@ -1,11 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Modified from py-faster-rcnn (https://github.com/rbgirshick/py-faster-rcnn) +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong +# -------------------------------------------------------- +# Based on: +# py-faster-rcnn +# Copyright (c) 2016 by Contributors +# Licence under The MIT License +# py-faster-rcnn (https://github.com/rbgirshick/py-faster-rcnn) # -------------------------------------------------------- - import os from os.path import join as pjoin diff --git a/lib/bbox/setup_windows.py b/lib/bbox/setup_windows.py index 404abc7..8e85ab2 100644 --- a/lib/bbox/setup_windows.py +++ b/lib/bbox/setup_windows.py @@ -1,9 +1,14 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Modified from py-faster-rcnn (https://github.com/rbgirshick/py-faster-rcnn) +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong +# -------------------------------------------------------- +# Based on: +# py-faster-rcnn +# Copyright (c) 2016 by Contributors +# Licence under The MIT License +# py-faster-rcnn (https://github.com/rbgirshick/py-faster-rcnn) # -------------------------------------------------------- import numpy as np diff --git a/lib/dataset/cityscape.py b/lib/dataset/cityscape.py index 76134a5..7bc94a2 100644 --- a/lib/dataset/cityscape.py +++ b/lib/dataset/cityscape.py @@ -1,8 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Zheng Zhang # -------------------------------------------------------- diff --git a/lib/dataset/coco.py b/lib/dataset/coco.py index 6bed171..0b828e4 100644 --- a/lib/dataset/coco.py +++ b/lib/dataset/coco.py @@ -1,3 +1,16 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- + import cPickle import cv2 import os diff --git a/lib/mask/mask_transform.py b/lib/mask/mask_transform.py index 84e6ad5..6ce8a1f 100644 --- a/lib/mask/mask_transform.py +++ b/lib/mask/mask_transform.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Haozhi Qi, Yi Li, Guodong Zhang # -------------------------------------------------------- diff --git a/lib/rpn/generate_anchor.py b/lib/rpn/generate_anchor.py index 8996a3a..09dde2f 100644 --- a/lib/rpn/generate_anchor.py +++ b/lib/rpn/generate_anchor.py @@ -1,3 +1,16 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- + """ Generate base anchors on index 0 """ diff --git a/lib/rpn/rpn.py b/lib/rpn/rpn.py index 5324131..a902953 100644 --- a/lib/rpn/rpn.py +++ b/lib/rpn/rpn.py @@ -1,11 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Haozhi Qi # -------------------------------------------------------- - +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """ RPN: data = diff --git a/lib/segmentation/segmentation.py b/lib/segmentation/segmentation.py index 394d989..2bfbf67 100644 --- a/lib/segmentation/segmentation.py +++ b/lib/segmentation/segmentation.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong +# -------------------------------------------------------- + """ Segmentation: data = diff --git a/lib/utils/PrefetchingIter.py b/lib/utils/PrefetchingIter.py index 988d3fd..95ac625 100644 --- a/lib/utils/PrefetchingIter.py +++ b/lib/utils/PrefetchingIter.py @@ -1,11 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- - +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import mxnet as mx from mxnet.io import DataDesc, DataBatch diff --git a/lib/utils/create_logger.py b/lib/utils/create_logger.py index d43bc7b..1898905 100644 --- a/lib/utils/create_logger.py +++ b/lib/utils/create_logger.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Bin Xiao # -------------------------------------------------------- diff --git a/lib/utils/image.py b/lib/utils/image.py index b213fcb..a17242f 100644 --- a/lib/utils/image.py +++ b/lib/utils/image.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong +# -------------------------------------------------------- + import numpy as np import os import cv2 diff --git a/lib/utils/image_processing.py b/lib/utils/image_processing.py index 4227ba3..49567f3 100644 --- a/lib/utils/image_processing.py +++ b/lib/utils/image_processing.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong +# -------------------------------------------------------- + import numpy as np import cv2 diff --git a/lib/utils/load_data.py b/lib/utils/load_data.py index 9cbf045..434f778 100644 --- a/lib/utils/load_data.py +++ b/lib/utils/load_data.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong +# -------------------------------------------------------- + import numpy as np from dataset import * diff --git a/lib/utils/load_model.py b/lib/utils/load_model.py index 6f83548..982c0b4 100644 --- a/lib/utils/load_model.py +++ b/lib/utils/load_model.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong +# -------------------------------------------------------- + import mxnet as mx diff --git a/lib/utils/lr_scheduler.py b/lib/utils/lr_scheduler.py index 76fd4e9..62409d5 100644 --- a/lib/utils/lr_scheduler.py +++ b/lib/utils/lr_scheduler.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yuwen Xiong # -------------------------------------------------------- diff --git a/lib/utils/mask_coco2voc.py b/lib/utils/mask_coco2voc.py index 95d747b..5283a49 100644 --- a/lib/utils/mask_coco2voc.py +++ b/lib/utils/mask_coco2voc.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yi Li # -------------------------------------------------------- diff --git a/lib/utils/mask_voc2coco.py b/lib/utils/mask_voc2coco.py index 51c0fb3..1d104cb 100644 --- a/lib/utils/mask_voc2coco.py +++ b/lib/utils/mask_voc2coco.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yi Li # -------------------------------------------------------- diff --git a/lib/utils/roidb.py b/lib/utils/roidb.py index 3abe078..4347842 100644 --- a/lib/utils/roidb.py +++ b/lib/utils/roidb.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong +# -------------------------------------------------------- + """ roidb basic format [image_index]['boxes', 'gt_classes', 'gt_overlaps', 'flipped'] diff --git a/lib/utils/save_model.py b/lib/utils/save_model.py index 1c98869..180d4f9 100644 --- a/lib/utils/save_model.py +++ b/lib/utils/save_model.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong +# -------------------------------------------------------- + import mxnet as mx diff --git a/lib/utils/show_boxes.py b/lib/utils/show_boxes.py index 50ad06d..42b7ec2 100644 --- a/lib/utils/show_boxes.py +++ b/lib/utils/show_boxes.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yi Li, Haocheng Zhang # -------------------------------------------------------- diff --git a/lib/utils/show_masks.py b/lib/utils/show_masks.py index eb79d02..0bee42d 100644 --- a/lib/utils/show_masks.py +++ b/lib/utils/show_masks.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong +# -------------------------------------------------------- + import numpy as np import matplotlib.pyplot as plt import random diff --git a/lib/utils/show_offset.py b/lib/utils/show_offset.py index 88f40f0..9fb07f6 100644 --- a/lib/utils/show_offset.py +++ b/lib/utils/show_offset.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Guodong Zhang # -------------------------------------------------------- diff --git a/lib/utils/symbol.py b/lib/utils/symbol.py index 31b6be7..f12b622 100644 --- a/lib/utils/symbol.py +++ b/lib/utils/symbol.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yuwen Xiong # -------------------------------------------------------- diff --git a/rfcn/config/config.py b/rfcn/config/config.py index 70845ea..970c582 100644 --- a/rfcn/config/config.py +++ b/rfcn/config/config.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong, Bin Xiao # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import yaml import numpy as np diff --git a/rfcn/core/DataParallelExecutorGroup.py b/rfcn/core/DataParallelExecutorGroup.py index 9579514..69fdd5c 100644 --- a/rfcn/core/DataParallelExecutorGroup.py +++ b/rfcn/core/DataParallelExecutorGroup.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import logging import numpy as np diff --git a/rfcn/core/callback.py b/rfcn/core/callback.py index 1887c42..1766a18 100644 --- a/rfcn/core/callback.py +++ b/rfcn/core/callback.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import time import logging diff --git a/rfcn/core/loader.py b/rfcn/core/loader.py index 78de81b..777367a 100644 --- a/rfcn/core/loader.py +++ b/rfcn/core/loader.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import numpy as np import mxnet as mx diff --git a/rfcn/core/metric.py b/rfcn/core/metric.py index 52f885b..b458f2f 100644 --- a/rfcn/core/metric.py +++ b/rfcn/core/metric.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import mxnet as mx import numpy as np diff --git a/rfcn/core/module.py b/rfcn/core/module.py index c20ad17..c4b9884 100644 --- a/rfcn/core/module.py +++ b/rfcn/core/module.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Zheng Zhang # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """A `MutableModule` implement the `BaseModule` API, and allows input shape varying with training iterations. If shapes vary, executors will rebind, diff --git a/rfcn/core/rcnn.py b/rfcn/core/rcnn.py index d3863ac..b5cab4c 100644 --- a/rfcn/core/rcnn.py +++ b/rfcn/core/rcnn.py @@ -1,10 +1,16 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- + """ Fast R-CNN: data = diff --git a/rfcn/core/tester.py b/rfcn/core/tester.py index db7e433..05c49db 100644 --- a/rfcn/core/tester.py +++ b/rfcn/core/tester.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import cPickle import os diff --git a/rfcn/deform_conv_demo.py b/rfcn/deform_conv_demo.py index 0cdd15d..b158965 100644 --- a/rfcn/deform_conv_demo.py +++ b/rfcn/deform_conv_demo.py @@ -1,8 +1,8 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Yi Li, Haocheng Zhang +# Licensed under The MIT License [see LICENSE for details] +# Written by Yi Li, Haochen Zhang # -------------------------------------------------------- import _init_paths diff --git a/rfcn/deform_psroi_demo.py b/rfcn/deform_psroi_demo.py index 4c02a4c..0b32dd7 100644 --- a/rfcn/deform_psroi_demo.py +++ b/rfcn/deform_psroi_demo.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yi Li, Haochen Zhang +# -------------------------------------------------------- + import _init_paths import os diff --git a/rfcn/demo.py b/rfcn/demo.py index dc4f4ba..b7b169d 100644 --- a/rfcn/demo.py +++ b/rfcn/demo.py @@ -1,8 +1,8 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] -# Written by Yi Li, Haocheng Zhang +# Licensed under The MIT License [see LICENSE for details] +# Written by Yi Li, Haochen Zhang # -------------------------------------------------------- import _init_paths diff --git a/rfcn/function/test_rcnn.py b/rfcn/function/test_rcnn.py index 8a91dea..36e985e 100644 --- a/rfcn/function/test_rcnn.py +++ b/rfcn/function/test_rcnn.py @@ -1,10 +1,16 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- + import argparse import pprint diff --git a/rfcn/function/test_rpn.py b/rfcn/function/test_rpn.py index 8393495..e323725 100644 --- a/rfcn/function/test_rpn.py +++ b/rfcn/function/test_rpn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import pprint diff --git a/rfcn/function/train_rcnn.py b/rfcn/function/train_rcnn.py index 59470a5..d318030 100644 --- a/rfcn/function/train_rcnn.py +++ b/rfcn/function/train_rcnn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import logging diff --git a/rfcn/function/train_rpn.py b/rfcn/function/train_rpn.py index be1be47..ef447a5 100644 --- a/rfcn/function/train_rpn.py +++ b/rfcn/function/train_rpn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import argparse import logging diff --git a/rfcn/operator_cxx/deformable_convolution-inl.h b/rfcn/operator_cxx/deformable_convolution-inl.h index 6ca7d21..888a597 100644 --- a/rfcn/operator_cxx/deformable_convolution-inl.h +++ b/rfcn/operator_cxx/deformable_convolution-inl.h @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_convolution-inl.h * \brief * \ref: https://github.com/Yangqing/caffe/wiki/Convolution-in-Caffe:-a-memo diff --git a/rfcn/operator_cxx/deformable_convolution.cc b/rfcn/operator_cxx/deformable_convolution.cc index a5916a5..49e6c28 100644 --- a/rfcn/operator_cxx/deformable_convolution.cc +++ b/rfcn/operator_cxx/deformable_convolution.cc @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_convolution.cc * \brief * \author Yuwen Xiong, Haozhi Qi, Jifeng Dai diff --git a/rfcn/operator_cxx/deformable_convolution.cu b/rfcn/operator_cxx/deformable_convolution.cu index 59948fd..5ee446c 100644 --- a/rfcn/operator_cxx/deformable_convolution.cu +++ b/rfcn/operator_cxx/deformable_convolution.cu @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_convolution.cu * \brief * \author Yuwen Xiong, Haozhi Qi, Jifeng Dai diff --git a/rfcn/operator_cxx/deformable_psroi_pooling-inl.h b/rfcn/operator_cxx/deformable_psroi_pooling-inl.h index 7226299..8a41505 100644 --- a/rfcn/operator_cxx/deformable_psroi_pooling-inl.h +++ b/rfcn/operator_cxx/deformable_psroi_pooling-inl.h @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft -* Licensed under The Apache-2.0 License [see LICENSE for details] +* Licensed under The MIT License [see LICENSE for details] * \file deformable_psroi_pooling-inl.h * \brief deformable psroi pooling operator and symbol * \author Yi Li, Guodong Zhang, Jifeng Dai diff --git a/rfcn/operator_cxx/deformable_psroi_pooling.cc b/rfcn/operator_cxx/deformable_psroi_pooling.cc index 4a21a79..83e40c0 100644 --- a/rfcn/operator_cxx/deformable_psroi_pooling.cc +++ b/rfcn/operator_cxx/deformable_psroi_pooling.cc @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_psroi_pooling.cc * \brief * \author Yi Li, Guodong Zhang, Jifeng Dai diff --git a/rfcn/operator_cxx/deformable_psroi_pooling.cu b/rfcn/operator_cxx/deformable_psroi_pooling.cu index 5b8f361..3b17056 100644 --- a/rfcn/operator_cxx/deformable_psroi_pooling.cu +++ b/rfcn/operator_cxx/deformable_psroi_pooling.cu @@ -1,6 +1,6 @@ /*! * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_psroi_pooling.cu * \brief * \author Yi Li, Guodong Zhang, Jifeng Dai diff --git a/rfcn/operator_cxx/nn/deformable_im2col.cuh b/rfcn/operator_cxx/nn/deformable_im2col.cuh index d9e7b97..f0dc2e5 100644 --- a/rfcn/operator_cxx/nn/deformable_im2col.cuh +++ b/rfcn/operator_cxx/nn/deformable_im2col.cuh @@ -49,7 +49,7 @@ ***************** END Caffe Copyright Notice and Disclaimer ******************** * * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_im2col.cuh * \brief Function definitions of converting an image to * column matrix based on kernel, padding, dilation, and offset. diff --git a/rfcn/operator_cxx/nn/deformable_im2col.h b/rfcn/operator_cxx/nn/deformable_im2col.h index 93a5551..60a2ecd 100644 --- a/rfcn/operator_cxx/nn/deformable_im2col.h +++ b/rfcn/operator_cxx/nn/deformable_im2col.h @@ -49,7 +49,7 @@ ***************** END Caffe Copyright Notice and Disclaimer ******************** * * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file deformable_im2col.h * \brief Function definitions of converting an image to * column matrix based on kernel, padding, dilation, and offset. diff --git a/rfcn/operator_cxx/psroi_pooling-inl.h b/rfcn/operator_cxx/psroi_pooling-inl.h index 956861c..39489f4 100644 --- a/rfcn/operator_cxx/psroi_pooling-inl.h +++ b/rfcn/operator_cxx/psroi_pooling-inl.h @@ -1,7 +1,7 @@ /*! * Copyright (c) 2017 by Contributors * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file psroi_pooling-inl.h * \brief psroi pooling operator and symbol * \author Yi Li, Tairui Chen, Guodong Zhang, Jifeng Dai diff --git a/rfcn/operator_cxx/psroi_pooling.cc b/rfcn/operator_cxx/psroi_pooling.cc index 4edaf4f..5c7e126 100644 --- a/rfcn/operator_cxx/psroi_pooling.cc +++ b/rfcn/operator_cxx/psroi_pooling.cc @@ -1,7 +1,7 @@ /*! * Copyright (c) 2017 by Contributors * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file psroi_pooling.cc * \brief psroi pooling operator * \author Yi Li, Tairui Chen, Guodong Zhang, Jifeng Dai diff --git a/rfcn/operator_cxx/psroi_pooling.cu b/rfcn/operator_cxx/psroi_pooling.cu index 43c57ee..07ccf1c 100644 --- a/rfcn/operator_cxx/psroi_pooling.cu +++ b/rfcn/operator_cxx/psroi_pooling.cu @@ -1,7 +1,7 @@ /*! * Copyright (c) 2017 by Contributors * Copyright (c) 2017 Microsoft - * Licensed under The Apache-2.0 License [see LICENSE for details] + * Licensed under The MIT License [see LICENSE for details] * \file psroi_pooling.cu * \brief psroi pooling operator * \author Yi Li, Tairui Chen, Guodong Zhang, Jifeng Dai diff --git a/rfcn/operator_py/box_annotator_ohem.py b/rfcn/operator_py/box_annotator_ohem.py index f11b7b5..df867b0 100644 --- a/rfcn/operator_py/box_annotator_ohem.py +++ b/rfcn/operator_py/box_annotator_ohem.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yuwen Xiong # -------------------------------------------------------- diff --git a/rfcn/operator_py/proposal.py b/rfcn/operator_py/proposal.py index c8b868d..3131581 100644 --- a/rfcn/operator_py/proposal.py +++ b/rfcn/operator_py/proposal.py @@ -1,7 +1,15 @@ -""" -Proposal Operator transform anchor coordinates into ROI coordinates with prediction results on -classification probability and bounding box prediction results, and image size and scale information. -""" +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Modified by Yuwen Xiong +# -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import mxnet as mx import numpy as np diff --git a/rfcn/operator_py/proposal_target.py b/rfcn/operator_py/proposal_target.py index d56ae5b..f837742 100644 --- a/rfcn/operator_py/proposal_target.py +++ b/rfcn/operator_py/proposal_target.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- """ Proposal Target Operator selects foreground and background roi and assigns label, bbox_transform to them. diff --git a/rfcn/symbols/deform_conv_demo.py b/rfcn/symbols/deform_conv_demo.py index b036c12..9624661 100644 --- a/rfcn/symbols/deform_conv_demo.py +++ b/rfcn/symbols/deform_conv_demo.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yuwen Xiong, Xizhou Zhu # -------------------------------------------------------- diff --git a/rfcn/symbols/deform_psroi_demo.py b/rfcn/symbols/deform_psroi_demo.py index 1a9cc58..81a5a01 100644 --- a/rfcn/symbols/deform_psroi_demo.py +++ b/rfcn/symbols/deform_psroi_demo.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yuwen Xiong, Xizhou Zhu # -------------------------------------------------------- diff --git a/rfcn/symbols/resnet_v1_101_rfcn.py b/rfcn/symbols/resnet_v1_101_rfcn.py index b95dc07..f95003b 100644 --- a/rfcn/symbols/resnet_v1_101_rfcn.py +++ b/rfcn/symbols/resnet_v1_101_rfcn.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yuwen Xiong, Xizhou Zhu # -------------------------------------------------------- diff --git a/rfcn/symbols/resnet_v1_101_rfcn_dcn.py b/rfcn/symbols/resnet_v1_101_rfcn_dcn.py index 0bcf652..4158aaa 100644 --- a/rfcn/symbols/resnet_v1_101_rfcn_dcn.py +++ b/rfcn/symbols/resnet_v1_101_rfcn_dcn.py @@ -1,7 +1,7 @@ # -------------------------------------------------------- # Deformable Convolutional Networks # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Written by Yuwen Xiong, Xizhou Zhu # -------------------------------------------------------- diff --git a/rfcn/symbols/rfcn_demo.py b/rfcn/symbols/rfcn_demo.py index 8361856..535bc33 100644 --- a/rfcn/symbols/rfcn_demo.py +++ b/rfcn/symbols/rfcn_demo.py @@ -1,3 +1,10 @@ +# -------------------------------------------------------- +# Deformable Convolutional Networks +# Copyright (c) 2017 Microsoft +# Licensed under The MIT License [see LICENSE for details] +# Written by Yuwen Xiong, Xizhou Zhu +# -------------------------------------------------------- + import cPickle import mxnet as mx from utils.symbol import Symbol diff --git a/rfcn/test.py b/rfcn/test.py index 687274c..fd8ea69 100644 --- a/rfcn/test.py +++ b/rfcn/test.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import _init_paths diff --git a/rfcn/train_alternate.py b/rfcn/train_alternate.py index 637b924..45844c8 100644 --- a/rfcn/train_alternate.py +++ b/rfcn/train_alternate.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import _init_paths diff --git a/rfcn/train_end2end.py b/rfcn/train_end2end.py index 5229f8a..cd4626c 100644 --- a/rfcn/train_end2end.py +++ b/rfcn/train_end2end.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import _init_paths diff --git a/rfcn/train_rfcn.py b/rfcn/train_rfcn.py index fd5a6a5..e1887b3 100644 --- a/rfcn/train_rfcn.py +++ b/rfcn/train_rfcn.py @@ -1,10 +1,15 @@ # -------------------------------------------------------- # Deformable Convolutional Networks -# Copyright (c) 2016 by Contributors # Copyright (c) 2017 Microsoft -# Licensed under The Apache-2.0 License [see LICENSE for details] +# Licensed under The MIT License [see LICENSE for details] # Modified by Yuwen Xiong # -------------------------------------------------------- +# Based on: +# MX-RCNN +# Copyright (c) 2016 by Contributors +# Licence under The Apache 2.0 License +# https://github.com/ijkguo/mx-rcnn/ +# -------------------------------------------------------- import _init_paths