Work on import infrastructure

openfold/__init__.py

+from . import model
+from . import utils
+from . import np
+__all__ = ["model", "utils", "np"]

openfold/model/__init__.py

+import os
+import glob
+import importlib as importlib
+
+_files = glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))
+__all__ = [os.path.basename(f)[:-3] for f in _files if os.path.isfile(f) and not f.endswith("__init__.py")]
+_modules = [(m, importlib.import_module('.' + m, __name__)) for m in __all__]
+for _m in _modules:
+    globals()[_m[0]] = _m[1]
+
+# Avoid needlessly cluttering the global namespace
+del _files, _m, _modules
+
+
+

openfold/np/__init__.py

+import os
+import glob
+import importlib as importlib
+
+_files = glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))
+__all__ = [os.path.basename(f)[:-3] for f in _files if os.path.isfile(f) and not f.endswith("__init__.py")]
+_modules = [(m, importlib.import_module('.' + m, __name__)) for m in __all__]
+for _m in _modules:
+    globals()[_m[0]] = _m[1]
+
+# Avoid needlessly cluttering the global namespace
+del _files, _m, _modules
+
+from . import relax
+
+__all__.extend(["relax"])
+
+
+

openfold/np/relax/__init__.py

+import os
+import glob
+import importlib as importlib
+
+_files = glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))
+__all__ = [os.path.basename(f)[:-3] for f in _files if os.path.isfile(f) and not f.endswith("__init__.py")]
+_modules = [(m, importlib.import_module('.' + m, __name__)) for m in __all__]
+for _m in _modules:
+    globals()[_m[0]] = _m[1]
+
+# Avoid needlessly cluttering the global namespace
+del _files, _m, _modules
+
+
+

openfold/utils/__init__.py

+import os
+import glob
+import importlib as importlib
+
+_files = glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))
+__all__ = [os.path.basename(f)[:-3] for f in _files if os.path.isfile(f) and not f.endswith("__init__.py")]
+_modules = [(m, importlib.import_module('.' + m, __name__)) for m in __all__]
+for _m in _modules:
+    globals()[_m[0]] = _m[1]
+
+# Avoid needlessly cluttering the global namespace
+del _files, _m, _modules
+
+
+

openfold/utils/loss.py

@@ -21,7 +21,6 @@ import torch.nn as nn
 from typing import Dict, Optional
 
 from openfold.np import residue_constants
-from openfold.model.primitives import Linear
 from openfold.utils import feats
 from openfold.utils.affine_utils import T
 from openfold.utils.tensor_utils import (

setup.py

@@ -23,7 +23,8 @@ setup(
     author_email='gahdritz@gmail.com',
     license='Apache License, Version 2.0',
     url='https://github.com/aqlaboratory/openfold',
-    packages=find_packages(),
+    packages=find_packages(where="openfold"),
+    package_dir={"":"openfold"},
     install_requires=[
         'torch',
         'deepspeed',