Merge pull request #60 from theislab/dev

Merge dev into master v0.5.0

Author: davidsebfischer

batchglm/__init__.py

@@ -2,3 +2,5 @@
 
 __version__ = get_versions()['version']
 del get_versions
+
+from .log_cfg import logger, unconfigure_logging, setup_logging

batchglm/api/__init__.py

@@ -1,3 +1,6 @@
+from .. import __version__
+from ..log_cfg import logger, unconfigure_logging, setup_logging
+
 from . import models
 from . import data
 from . import utils

batchglm/api/models/__init__.py

@@ -1,8 +1 @@
-from batchglm.models.base import BasicInputData
-from batchglm.models.base import BasicModel
-from batchglm.models.base import BasicEstimator
-from batchglm.models.base import BasicSimulator
-
-from . import glm
-from . import nb
-from . import nb_glm
+from . import glm_nb

batchglm/api/models/glm.py

@@ -0,0 +1,2 @@
+from batchglm.models.glm_nb import InputData, Model, Simulator
+from batchglm.train.tf.glm_nb import Estimator

batchglm/api/models/glm_nb.py

@@ -1,2 +1,4 @@
 from . import stats
 from . import random
+from . import numeric
+from . import linalg

batchglm/api/models/nb.py

@@ -0,0 +1 @@
+from batchglm.utils.linalg import stacked_lstsq, groupwise_solve_lm

batchglm/api/models/nb_glm.py

@@ -0,0 +1 @@
+from batchglm.utils.numeric import combine_matrices, softmax, weighted_mean, weighted_variance