Add integrative_nmf as top-level wrapper for iNMF; reorg nmf and inmf…

… models
lilab-bcb · Jun 20, 2021 · 6d11406 · 6d11406
1 parent 3b58739
commit 6d11406
Show file tree

Hide file tree

Showing 27 changed files with 372 additions and 406 deletions.
diff --git a/nmf/__init__.py b/nmf/__init__.py
@@ -1,19 +1,19 @@
 
-from ._nmf_batch_mu import NMFBatchMU
-from ._nmf_batch_hals import NMFBatchHALS
-from ._nmf_batch_nnls_bpp import NMFBatchNnlsBpp
-from ._nmf_online_mu import NMFOnlineMU
-from ._nmf_online_hals import NMFOnlineHALS
-from ._nmf_online_nnls_bpp import NMFOnlineNnlsBpp
+#from ._nmf_batch_mu import NMFBatchMU
+#from ._nmf_batch_hals import NMFBatchHALS
+#from ._nmf_batch_nnls_bpp import NMFBatchNnlsBpp
+#from ._nmf_online_mu import NMFOnlineMU
+#from ._nmf_online_hals import NMFOnlineHALS
+#from ._nmf_online_nnls_bpp import NMFOnlineNnlsBpp
 
-from .nmf import run_nmf
+from .nmf import run_nmf, integrative_nmf
 
-from ._inmf_batch_mu import INMFBatchMU
-from ._inmf_batch_hals import INMFBatchHALS
-from ._inmf_batch_nnls_bpp import INMFBatchNnlsBpp
-from ._inmf_online_mu import INMFOnlineMU
-from ._inmf_online_hals import INMFOnlineHALS
-from ._inmf_online_nnls_bpp import INMFOnlineNnlsBpp
+#from ._inmf_batch_mu import INMFBatchMU
+#from ._inmf_batch_hals import INMFBatchHALS
+#from ._inmf_batch_nnls_bpp import INMFBatchNnlsBpp
+#from ._inmf_online_mu import INMFOnlineMU
+#from ._inmf_online_hals import INMFOnlineHALS
+#from ._inmf_online_nnls_bpp import INMFOnlineNnlsBpp
 
 try:
     from importlib.metadata import version, PackageNotFoundError

diff --git a/nmf/inmf/_inmf_online.py b/nmf/inmf/_inmf_online.py
diff --git a/nmf/inmf_models/__init__.py b/nmf/inmf_models/__init__.py
@@ -0,0 +1,6 @@
+from ._inmf_batch_hals import INMFBatchHALS
+from ._inmf_batch_mu import INMFBatchMU
+from ._inmf_batch_nnls_bpp import INMFBatchNnlsBpp
+from ._inmf_online_hals import INMFOnlineHALS
+from ._inmf_online_mu import INMFOnlineMU
+from ._inmf_online_nnls_bpp import INMFOnlineNnlsBpp