Merge pull request #741 from weisy11/develop_reg

Develop reg

ppcls/arch/__init__.py

@@ -15,5 +15,5 @@
 from . import backbone
 
 from .backbone import *
-from .loss import *
+from ppcls.arch.loss_metrics.loss import *
 from .utils import *

ppcls/arch/backbone/base/theseus_layer.py

@@ -11,11 +11,11 @@ class Identity(nn.Layer):
         return inputs
 
 
-class TheseusLayer(nn.Layer, ABC):
+class TheseusLayer(nn.Layer):
     def __init__(self, *args, return_patterns=None, **kwargs):
         super(TheseusLayer, self).__init__()
         self.res_dict = None
-        self.register_forward_post_hook(self._disconnect_res_dict_hook)
+        # self.register_forward_post_hook(self._disconnect_res_dict_hook)
         if return_patterns is not None:
             self._update_res(return_patterns)
 
@@ -45,11 +45,11 @@ class TheseusLayer(nn.Layer, ABC):
                 if return_layers is not None and re.match(return_pattern, layer_name):
                     self._sub_layers[layer_i].register_forward_post_hook(self._save_sub_res_hook)
 
-    def _save_sub_res_hook(self, layer, input, output):
-        self.res_dict[layer.full_name()] = output
-
-    def _disconnect_res_dict_hook(self, input, output):
-        self.res_dict = None
+    # def _save_sub_res_hook(self, layer, input, output):
+    #     self.res_dict[layer.full_name()] = output
+    #
+    # def _disconnect_res_dict_hook(self, input, output):
+    #     self.res_dict = None
 
     def replace_sub(self, layer_name_pattern, replace_function, recursive=True):
         for layer_i in self._sub_layers: