fix condition of layer_forward in ofa (#777)

Author: ceci3

paddleslim/nas/ofa/get_sub_model.py

@@ -225,7 +225,7 @@ def check_search_space(graph):
                     depthwise_conv.append(inp._var.name)
 
     if len(same_search_space) == 0:
-        return None, None
+        return None, []
 
     same_search_space = sorted([sorted(x) for x in same_search_space])
     final_search_space = []

paddleslim/nas/ofa/ofa.py

@@ -108,9 +108,9 @@ def layers_forward(self, block, *inputs, **kwargs):
         if getattr(self, 'current_config', None) != None:
             ### if block is fixed, donnot join key into candidate
             ### concrete config as parameter in kwargs
-            if block.fixed == False and (
-                    self._skip_layers != None and
-                    self._key2name[block.key] not in self._skip_layers) and  \
+            if block.fixed == False and (self._skip_layers == None or
+                    (self._skip_layers != None and
+                    self._key2name[block.key] not in self._skip_layers)) and  \
                     (block.fn.weight.name not in self._depthwise_conv):
                 assert self._key2name[
                     block.
@@ -180,6 +180,7 @@ def __init__(self,
         self._build_ss = False
         self._broadcast = False
         self._skip_layers = None
+        self._depthwise_conv = []
 
         ### if elastic_order is none, use default order
         if self.elastic_order is not None: