Clean up pyreader vestiges (#228)

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",

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'],

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'],

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'],

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'],

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'],

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'],