diff --git a/demo/mask_rcnn_demo.ipynb b/demo/mask_rcnn_demo.ipynb index f767cf748813134706de393be22bbee79b04fa25..5027ce1e4518254d1ef30ea512df2a8319a6e9ff 100644 --- a/demo/mask_rcnn_demo.ipynb +++ b/demo/mask_rcnn_demo.ipynb @@ -216,7 +216,7 @@ "with fluid.program_guard(infer_prog, startup_prog):\n", " with fluid.unique_name.guard():\n", " feed_vars = {\n", - " var['name']: fluid.layers.data(\n", + " var['name']: fluid.data(\n", " name=var['name'],\n", " shape=var['shape'],\n", " dtype='float32',\n", diff --git a/ppdet/modeling/architectures/cascade_mask_rcnn.py b/ppdet/modeling/architectures/cascade_mask_rcnn.py index 335e53cd1fdf11768a912a965b7faedca82e149d..168ce29aa5595691c00aac8f2dd48ad750dd21ef 100644 --- a/ppdet/modeling/architectures/cascade_mask_rcnn.py +++ b/ppdet/modeling/architectures/cascade_mask_rcnn.py @@ -411,7 +411,7 @@ class CascadeMaskRCNN(object): 'lod_level': 1 } fields += box_fields - feed_vars = OrderedDict([(key, fluid.layers.data( + feed_vars = OrderedDict([(key, fluid.data( name=key, shape=inputs_def[key]['shape'], dtype=inputs_def[key]['dtype'], diff --git a/ppdet/modeling/architectures/cascade_rcnn.py b/ppdet/modeling/architectures/cascade_rcnn.py index 7f57d932d588121c9fef57148984e79e85b63fad..b239e4d6615497c98aca00788154c0ee2920e2b2 100644 --- a/ppdet/modeling/architectures/cascade_rcnn.py +++ b/ppdet/modeling/architectures/cascade_rcnn.py @@ -312,7 +312,7 @@ class CascadeRCNN(object): fields += ms_fields self.im_info_names = ['image', 'im_info'] + ms_fields - feed_vars = OrderedDict([(key, fluid.layers.data( + feed_vars = OrderedDict([(key, fluid.data( name=key, shape=inputs_def[key]['shape'], dtype=inputs_def[key]['dtype'], diff --git a/ppdet/modeling/architectures/cascade_rcnn_cls_aware.py b/ppdet/modeling/architectures/cascade_rcnn_cls_aware.py index 2f9696db946acdbd6dbd0e05a9a569d63da8fc69..4c3955fd502fd9626da1a0f15b348a9b3f6c63fc 100644 --- a/ppdet/modeling/architectures/cascade_rcnn_cls_aware.py +++ b/ppdet/modeling/architectures/cascade_rcnn_cls_aware.py @@ -195,7 +195,7 @@ class CascadeRCNNClsAware(object): use_dataloader=True, iterable=False): inputs_def = self._inputs_def(image_shape) - feed_vars = OrderedDict([(key, fluid.layers.data( + feed_vars = OrderedDict([(key, fluid.data( name=key, shape=inputs_def[key]['shape'], dtype=inputs_def[key]['dtype'], diff --git a/ppdet/modeling/architectures/faster_rcnn.py b/ppdet/modeling/architectures/faster_rcnn.py index 57a8ffb066280c2da35adaf55ea4f376111ee251..239af60780d06441c7a18183f50fc2b78003b8c4 100644 --- a/ppdet/modeling/architectures/faster_rcnn.py +++ b/ppdet/modeling/architectures/faster_rcnn.py @@ -224,7 +224,7 @@ class FasterRCNN(object): fields += ms_fields self.im_info_names = ['image', 'im_info'] + ms_fields - feed_vars = OrderedDict([(key, fluid.layers.data( + feed_vars = OrderedDict([(key, fluid.data( name=key, shape=inputs_def[key]['shape'], dtype=inputs_def[key]['dtype'], diff --git a/ppdet/modeling/architectures/mask_rcnn.py b/ppdet/modeling/architectures/mask_rcnn.py index 019a4bda70774b4f6ee9d0d6b14ad75d91af2209..3ae28983275ad311dc083d97d137283cb2dec6d2 100644 --- a/ppdet/modeling/architectures/mask_rcnn.py +++ b/ppdet/modeling/architectures/mask_rcnn.py @@ -314,7 +314,7 @@ class MaskRCNN(object): 'lod_level': 1 } fields += box_fields - feed_vars = OrderedDict([(key, fluid.layers.data( + feed_vars = OrderedDict([(key, fluid.data( name=key, shape=inputs_def[key]['shape'], dtype=inputs_def[key]['dtype'], diff --git a/ppdet/modeling/architectures/retinanet.py b/ppdet/modeling/architectures/retinanet.py index e4613aedfeedd0f94e5c343bb151443720205f11..936a4ba4f9b8bf003186e0e2862d52e4d7c6149b 100644 --- a/ppdet/modeling/architectures/retinanet.py +++ b/ppdet/modeling/architectures/retinanet.py @@ -107,7 +107,7 @@ class RetinaNet(object): use_dataloader=True, iterable=False): inputs_def = self._inputs_def(image_shape) - feed_vars = OrderedDict([(key, fluid.layers.data( + feed_vars = OrderedDict([(key, fluid.data( name=key, shape=inputs_def[key]['shape'], dtype=inputs_def[key]['dtype'],