Revert D21870844: Create lazy_dyndeps to avoid caffe2 import costs.

Test Plan: revert-hammer

Differential Revision:
D21870844 (pytorch@07fd5f8)

Original commit changeset: 3f65fedb65bb

fbshipit-source-id: 4f661072d72486a9c14711e368247b3d30e28af9

caffe2/python/core.py

@@ -49,18 +49,6 @@ def _InitDataType():
 
 _InitDataType()
 
-_import_lazy_calls = []
-
-def RegisterLazyImport(lazy):
-    global _import_lazy_calls
-    _import_lazy_calls += [lazy]
-
-
-def _import_lazy():
-    global _import_lazy_calls
-    for lazy in _import_lazy_calls:
-        lazy()
-
 
 def _GetRegisteredOperators():
     return set(workspace.RegisteredOperators())
@@ -69,9 +57,7 @@ def _GetRegisteredOperators():
 _REGISTERED_OPERATORS = _GetRegisteredOperators()
 
 
-def RefreshRegisteredOperators(trigger_lazy=True):
-    if trigger_lazy:
-        _import_lazy()
+def RefreshRegisteredOperators():
     global _REGISTERED_OPERATORS
     _REGISTERED_OPERATORS = _GetRegisteredOperators()
 
@@ -80,7 +66,6 @@ def RefreshRegisteredOperators(trigger_lazy=True):
 
 
 def GlobalInit(args):
-    _import_lazy()
     _GLOBAL_INIT_ARGS.extend(args[1:])
     C.global_init(args)
 
@@ -94,7 +79,6 @@ def IsOperator(op_type):
 
 
 def IsOperatorWithEngine(op_type, engine):
-    _import_lazy()
     return C.op_registry_key(op_type, engine) in _REGISTERED_OPERATORS
 
 
@@ -294,7 +278,6 @@ def __getattr__(self, op_type):
             op_type, *args, **kwargs)
 
     def __dir__(self):
-        _import_lazy()
         additional_methods = [
             op
             for op in _REGISTERED_OPERATORS
@@ -2228,7 +2211,6 @@ def __getattr__(self, op_type):
             op_type, *args, **kwargs)
 
     def __dir__(self):
-        _import_lazy()
         additional_methods = [
             op
             for op in _REGISTERED_OPERATORS

caffe2/python/dyndep.py

@@ -11,7 +11,7 @@
 from caffe2.python import core, extension_loader
 
 
-def InitOpsLibrary(name, trigger_lazy=True):
+def InitOpsLibrary(name):
     """Loads a dynamic library that contains custom operators into Caffe2.
 
     Since Caffe2 uses static variable registration, you can optionally load a
@@ -32,7 +32,7 @@ def InitOpsLibrary(name, trigger_lazy=True):
         # time when an actual call is made.
         print('Ignoring {} as it is not a valid file.'.format(name))
         return
-    _init_impl(name, trigger_lazy=trigger_lazy)
+    _init_impl(name)
 
 
 _IMPORTED_DYNDEPS = set()
@@ -43,10 +43,10 @@ def GetImportedOpsLibraries():
     return _IMPORTED_DYNDEPS
 
 
-def _init_impl(path, trigger_lazy=True):
+def _init_impl(path):
     with dll_lock:
         _IMPORTED_DYNDEPS.add(path)
         with extension_loader.DlopenGuard():
             ctypes.CDLL(path)
         # reinitialize available ops
-        core.RefreshRegisteredOperators(trigger_lazy)
+        core.RefreshRegisteredOperators()