Add try/catch for interface compatibility

msracver · Dec 26, 2017 · db4ef25 · db4ef25
1 parent 1cf8e12
commit db4ef25
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/deeplab/core/module.py b/deeplab/core/module.py
@@ -567,9 +567,14 @@ def update(self):
 
         self._params_dirty = True
         if self._update_on_kvstore:
-            _update_params_on_kvstore(self._exec_group.param_arrays,
-                                      self._exec_group.grad_arrays,
-                                      self._kvstore, self._exec_group.param_names)
+            try:
+                _update_params_on_kvstore(self._exec_group.param_arrays,
+                                          self._exec_group.grad_arrays,
+                                          self._kvstore)
+            except:
+                _update_params_on_kvstore(self._exec_group.param_arrays,
+                                          self._exec_group.grad_arrays,
+                                          self._kvstore, param_names=self._exec_group.param_names)
         else:
             _update_params(self._exec_group.param_arrays,
                            self._exec_group.grad_arrays,

diff --git a/faster_rcnn/core/module.py b/faster_rcnn/core/module.py
@@ -567,9 +567,14 @@ def update(self):
 
         self._params_dirty = True
         if self._update_on_kvstore:
-            _update_params_on_kvstore(self._exec_group.param_arrays,
-                                      self._exec_group.grad_arrays,
-                                      self._kvstore, self._exec_group.param_names)
+            try:
+                _update_params_on_kvstore(self._exec_group.param_arrays,
+                                          self._exec_group.grad_arrays,
+                                          self._kvstore)
+            except:
+                _update_params_on_kvstore(self._exec_group.param_arrays,
+                                          self._exec_group.grad_arrays,
+                                          self._kvstore, param_names=self._exec_group.param_names)
         else:
             _update_params(self._exec_group.param_arrays,
                            self._exec_group.grad_arrays,

diff --git a/fpn/core/module.py b/fpn/core/module.py
@@ -574,7 +574,7 @@ def update(self):
             except:
                 _update_params_on_kvstore(self._exec_group.param_arrays,
                                           self._exec_group.grad_arrays,
-                                          self._kvstore, self._exec_group.param_names)
+                                          self._kvstore, param_names=self._exec_group.param_names)
         else:
             _update_params(self._exec_group.param_arrays,
                            self._exec_group.grad_arrays,

diff --git a/rfcn/core/module.py b/rfcn/core/module.py
@@ -567,9 +567,14 @@ def update(self):
 
         self._params_dirty = True
         if self._update_on_kvstore:
-            _update_params_on_kvstore(self._exec_group.param_arrays,
-                                      self._exec_group.grad_arrays,
-                                      self._kvstore, self._exec_group.param_names)
+            try:
+                _update_params_on_kvstore(self._exec_group.param_arrays,
+                                          self._exec_group.grad_arrays,
+                                          self._kvstore)
+            except:
+                _update_params_on_kvstore(self._exec_group.param_arrays,
+                                          self._exec_group.grad_arrays,
+                                          self._kvstore, param_names=self._exec_group.param_names)
         else:
             _update_params(self._exec_group.param_arrays,
                            self._exec_group.grad_arrays,