From d4433613f1723f1b41ce6498e16fdc6b6f85593b Mon Sep 17 00:00:00 2001
From: Chandan Singh <chandan_singh@berkeley.edu>
Date: Wed, 22 May 2024 13:16:54 -0700
Subject: [PATCH] update import for newer sklearn compatibility

---
 imodels/util/score.py | 11 ++++++-----
 setup.py              |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/imodels/util/score.py b/imodels/util/score.py
index c45f1a14..b372fbfd 100644
--- a/imodels/util/score.py
+++ b/imodels/util/score.py
@@ -3,7 +3,7 @@
 
 import pandas as pd
 import numpy as np
-from sklearn.utils import indices_to_mask
+from sklearn.utils._mask import indices_to_mask
 from sklearn.linear_model import Lasso, LogisticRegression
 from sklearn.linear_model._coordinate_descent import _alpha_grid
 from sklearn.model_selection import cross_val_score
@@ -92,7 +92,8 @@ def score_linear(X, y, rules: List[str],
         raise ValueError("Invalid alpha and max_rules passed")
 
     if prediction_task == 'regression':
-        lin_model = Lasso(alpha=final_alpha, random_state=random_state, max_iter=2000)
+        lin_model = Lasso(alpha=final_alpha,
+                          random_state=random_state, max_iter=2000)
     else:
         lin_model = LogisticRegression(
             penalty=penalty, C=(1 / final_alpha), solver='liblinear',
@@ -110,7 +111,7 @@ def score_linear(X, y, rules: List[str],
         if abs(w) > coef_zero_threshold:
             nonzero_rules.append(Rule(r, args=[w], support=s))
             coefs.append(w)
-    
+
     return nonzero_rules, coefs, lin_model.intercept_
 
 
@@ -139,7 +140,7 @@ def get_best_alpha_under_max_rules(X, y, rules: List[str],
             m = LogisticRegression(
                 penalty=penalty, C=(1 / alpha), solver='liblinear', random_state=random_state)
             cv_scoring = 'accuracy'
-        
+
         m.fit(X, y)
         rule_coefs = m.coef_.flatten()
         rule_count = np.sum(np.abs(rule_coefs) > coef_zero_threshold)
@@ -156,5 +157,5 @@ def get_best_alpha_under_max_rules(X, y, rules: List[str],
         final_alpha = alphas[np.argmax(alpha_scores)]
     else:
         final_alpha = alphas[i - 1]
-        
+
     return final_alpha
diff --git a/setup.py b/setup.py
index d4275c5b..52a1bf2e 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
 
 setuptools.setup(
     name="imodels",
-    version="1.4.3",
+    version="1.4.4",
     author="Chandan Singh, Keyan Nasseri, Matthew Epland, Yan Shuo Tan, Omer Ronen, Tiffany Tang, Abhineet Agarwal, Theo Saarinen, Bin Yu, and others",
     author_email="chandan_singh@berkeley.edu",
     description="Implementations of various interpretable models",