bump v0.17.0

Techtonique · Apr 27, 2024 · 06fa746 · 06fa746
1 parent ee8e2b6
commit 06fa746
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 7 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -30,8 +30,8 @@ jobs:
       - name: Run examples 
         run: pip install .&&find examples -maxdepth 2 -name "*.py" -exec  python3 {} \;
 
-      # - name: Publish to PyPI                
-      #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   with:
-      #     password: ${{ secrets.PYPI_GLOBAL_MLSAUCE }}
-      #     repository-url: https://upload.pypi.org/legacy/          
+      - name: Publish to PyPI                
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+           password: ${{ secrets.PYPI_GLOBAL_MLSAUCE }}
+           repository-url: https://upload.pypi.org/legacy/          
diff --git a/examples/lasso_regressor.py b/examples/lasso_regressor.py
@@ -28,6 +28,15 @@
 print(time()-start)
 print(obj.beta)
 
+obj = ms.LassoRegressor(backend="cpu")
+start = time()
+obj.fit(X_train, y_train)
+print(time()-start)
+start = time()
+print(np.sqrt(np.mean(np.square(obj.predict(X_test) - y_test))))
+print(time()-start)
+print(obj.beta)
+
 # obj = ms.LassoRegressor(backend="gpu")
 # print(obj.get_params())
 # start = time()

diff --git a/examples/lsboost_classifier.py b/examples/lsboost_classifier.py
@@ -258,6 +258,28 @@
 print(obj.score(X_test, y_test))
 print(time()-start)
 
+obj = ms.LSBoostClassifier(solver="lasso", 
+                           n_clusters=3, degree=2, 
+                           clustering_method="gmm")
+print(obj.get_params())
+start = time()
+obj.fit(X_train, y_train)
+print(time()-start)
+start = time()
+print(obj.score(X_test, y_test))
+print(time()-start)
+
+
+obj = ms.LSBoostClassifier(solver="enet", 
+                           n_clusters=3, degree=2, 
+                           clustering_method="gmm")
+print(obj.get_params())
+start = time()
+obj.fit(X_train, y_train)
+print(time()-start)
+start = time()
+print(obj.score(X_test, y_test))
+print(time()-start)
 # MORE DATA NEEDED # MORE DATA NEEDED # MORE DATA NEEDED
 # obj = ms.LSBoostClassifier(backend="gpu", solver="lasso")
 # print(obj.get_params())

diff --git a/examples/lsboost_regressor_pi.py b/examples/lsboost_regressor_pi.py
@@ -259,3 +259,17 @@
                     method="splitconformal")
 print(time()-start)
 print(f"splitconformal bootstrap coverage 5: {np.mean((preds.upper >= y_test)*(preds.lower <= y_test))}")   
+
+
+obj = ms.LSBoostRegressor(n_estimators=50, solver="enet", reg_lambda=0.002, 
+                          col_sample=0.8, row_sample=0.8)
+print(obj.get_params())
+start = time()
+obj.fit(X_train, y_train)
+print(time()-start)
+start = time()
+preds = obj.predict(X_test, return_pi=True, 
+                    level = 90, 
+                    method="splitconformal")
+print(time()-start)
+print(f"splitconformal bootstrap coverage 6: {np.mean((preds.upper >= y_test)*(preds.lower <= y_test))}")   
diff --git a/mlsauce.egg-info/PKG-INFO b/mlsauce.egg-info/PKG-INFO
@@ -22,6 +22,7 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: Cython
 Requires-Dist: joblib
+Requires-Dist: matplotlib
 Requires-Dist: pandas
 Requires-Dist: requests
 Requires-Dist: scikit-learn

diff --git a/mlsauce.egg-info/requires.txt b/mlsauce.egg-info/requires.txt
@@ -1,6 +1,7 @@
 numpy
 Cython
 joblib
+matplotlib
 pandas
 requests
 scikit-learn

diff --git a/mlsauce/adaopt/_adaoptc.cpython-311-darwin.so b/mlsauce/adaopt/_adaoptc.cpython-311-darwin.so
diff --git a/mlsauce/booster/_booster_regressor.py b/mlsauce/booster/_booster_regressor.py
@@ -131,7 +131,8 @@ def __init__(
         assert solver in (
             "ridge",
             "lasso",
-        ), "`solver` must be in ('ridge', 'lasso')"
+            "enet"
+        ), "`solver` must be in ('ridge', 'lasso', 'enet')"
 
         sys_platform = platform.system()
 

diff --git a/mlsauce/booster/_boosterc.cpython-311-darwin.so b/mlsauce/booster/_boosterc.cpython-311-darwin.so
diff --git a/mlsauce/lasso/_lassoc.cpython-311-darwin.so b/mlsauce/lasso/_lassoc.cpython-311-darwin.so
diff --git a/mlsauce/ridge/_ridgec.cpython-311-darwin.so b/mlsauce/ridge/_ridgec.cpython-311-darwin.so
diff --git a/mlsauce/stump/_stumpc.cpython-311-darwin.so b/mlsauce/stump/_stumpc.cpython-311-darwin.so
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
 MAINTAINER_EMAIL = '[email protected]'
 LICENSE = 'BSD3 Clause Clear'
 
-__version__ = '0.16.0'
+__version__ = '0.17.0'
 
 VERSION = __version__