Move GeneralizedLinearRegressor back to _glm (#909)

Quantco · Feb 7, 2025 · 4172b67 · 4172b67
1 parent 4f9db8f
commit 4172b67
Show file tree

Hide file tree

Showing 8 changed files with 972 additions and 987 deletions.
diff --git a/src/glum/__init__.py b/src/glum/__init__.py
@@ -11,9 +11,8 @@
     PoissonDistribution,
     TweedieDistribution,
 )
-from ._glm import get_family, get_link
+from ._glm import GeneralizedLinearRegressor, get_family, get_link
 from ._glm_cv import GeneralizedLinearRegressorCV
-from ._glm_regressor import GeneralizedLinearRegressor
 from ._link import CloglogLink, IdentityLink, Link, LogitLink, LogLink, TweedieLink
 
 try:

diff --git a/src/glum/_glm.py b/src/glum/_glm.py
diff --git a/src/glum/_glm_regressor.py b/src/glum/_glm_regressor.py
diff --git a/tests/glm/test_distribution.py b/tests/glm/test_distribution.py
@@ -14,8 +14,7 @@
     PoissonDistribution,
     TweedieDistribution,
 )
-from glum._glm import get_family
-from glum._glm_regressor import GeneralizedLinearRegressor
+from glum._glm import GeneralizedLinearRegressor, get_family
 from glum._linalg import _safe_sandwich_dot
 from glum._link import IdentityLink, LogitLink, LogLink, TweedieLink
 

diff --git a/tests/glm/test_formula.py b/tests/glm/test_formula.py
@@ -6,7 +6,7 @@
 import statsmodels.formula.api as smf
 
 from glum._formula import parse_formula
-from glum._glm_regressor import GeneralizedLinearRegressor
+from glum._glm import GeneralizedLinearRegressor
 
 
 @pytest.fixture

diff --git a/tests/glm/test_glm_base.py b/tests/glm/test_glm_base.py
@@ -16,8 +16,8 @@
     NormalDistribution,
     PoissonDistribution,
 )
+from glum._glm import GeneralizedLinearRegressor
 from glum._glm_cv import GeneralizedLinearRegressorCV
-from glum._glm_regressor import GeneralizedLinearRegressor
 from glum._linalg import is_pos_semidef
 from glum._link import IdentityLink, LogitLink, LogLink
 

diff --git a/tests/glm/test_glm_regressor.py b/tests/glm/test_glm_regressor.py
@@ -21,8 +21,8 @@
     PoissonDistribution,
     TweedieDistribution,
 )
+from glum._glm import GeneralizedLinearRegressor
 from glum._glm_cv import GeneralizedLinearRegressorCV
-from glum._glm_regressor import GeneralizedLinearRegressor
 from glum._link import LogitLink, LogLink
 from glum._utils import unstandardize
 

diff --git a/tests/glm/test_golden_master.py b/tests/glm/test_golden_master.py
@@ -10,8 +10,8 @@
 from scipy import sparse
 
 from glum._distribution import TweedieDistribution
+from glum._glm import GeneralizedLinearRegressor
 from glum._glm_cv import GeneralizedLinearRegressorCV
-from glum._glm_regressor import GeneralizedLinearRegressor
 from glum_benchmarks.data import simulate_glm_data
 
 distributions_to_test = ["normal", "poisson", "gamma", "tweedie_p=1.5", "binomial"]