From 2239ecbf3a079945319dd7ea1c073dfa46a0c457 Mon Sep 17 00:00:00 2001
From: Yang Zhang <yangzhang@live.com>
Date: Mon, 24 Jun 2019 11:57:40 +0800
Subject: [PATCH] simplify setup and fix bug in cascade head (#2500)

* Merge setup.py and requirements.txt
* Fix cascade head initializer fanout
---
 .../ppdet/modeling/roi_heads/cascade_head.py  |  4 +--
 PaddleCV/object_detection/requirements.txt    |  2 ++
 PaddleCV/object_detection/setup.py            | 25 -------------------
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100755 PaddleCV/object_detection/setup.py

diff --git a/PaddleCV/object_detection/ppdet/modeling/roi_heads/cascade_head.py b/PaddleCV/object_detection/ppdet/modeling/roi_heads/cascade_head.py
index e73f1ad9..8971b4e0 100644
--- a/PaddleCV/object_detection/ppdet/modeling/roi_heads/cascade_head.py
+++ b/PaddleCV/object_detection/ppdet/modeling/roi_heads/cascade_head.py
@@ -213,7 +213,7 @@ class CascadeBBoxHead(object):
 
     def _head_share(self, roi_feat, wb_scalar=2.0, name=''):
         # FC6 FC7
-        fan = roi_feat[1] * roi_feat[2] * roi_feat[3]
+        fan = roi_feat.shape[1] * roi_feat.shape[2] * roi_feat.shape[3]
         fc6 = fluid.layers.fc(input=roi_feat,
                               size=self.head.num_chan,
                               act='relu',
@@ -268,7 +268,7 @@ class FC6FC7Head(object):
         self.num_chan = num_chan
 
     def __call__(self, roi_feat, wb_scalar=1.0, name=''):
-        fan = roi_feat[1] * roi_feat[2] * roi_feat[3]
+        fan = roi_feat.shape[1] * roi_feat.shape[2] * roi_feat.shape[3]
         fc6 = fluid.layers.fc(input=roi_feat,
                               size=self.num_chan,
                               act='relu',
diff --git a/PaddleCV/object_detection/requirements.txt b/PaddleCV/object_detection/requirements.txt
index f3ce0a8b..4ff2bdc9 100644
--- a/PaddleCV/object_detection/requirements.txt
+++ b/PaddleCV/object_detection/requirements.txt
@@ -1,2 +1,4 @@
 pre-commit
 tqdm
+docstring_parser @ http://github.com/willthefrog/docstring_parser/tarball/master
+typeguard ; python_version >= '3.4'
diff --git a/PaddleCV/object_detection/setup.py b/PaddleCV/object_detection/setup.py
deleted file mode 100755
index 68a0f448..00000000
--- a/PaddleCV/object_detection/setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
-#
-# 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.
-
-import setuptools
-import sys
-
-docstring_parser = 'docstring_parser @ ' \
-    + 'http://github.com/willthefrog/docstring_parser/tarball/master'
-install_requires = [docstring_parser]
-
-if sys.version_info[0] > 2:
-    install_requires += ['typeguard']
-
-setuptools.setup(install_requires=install_requires, )
-- 
GitLab