From 0551fa5012a3dcbe78d07f9191c69e2b64fe8358 Mon Sep 17 00:00:00 2001 From: Thierry Moudiki Date: Fri, 26 Apr 2024 14:46:46 +0200 Subject: [PATCH] bump v0.15.2 --- CHANGES.md | 2 +- mlsauce.egg-info/PKG-INFO | 36 +++++++++++++++ mlsauce.egg-info/SOURCES.txt | 64 ++++++++++++++++++++++++++ mlsauce.egg-info/dependency_links.txt | 1 + mlsauce.egg-info/not-zip-safe | 1 + mlsauce.egg-info/requires.txt | 14 ++++++ mlsauce.egg-info/top_level.txt | 1 + mlsauce/adaopt/_adaopt.py | 9 +++- mlsauce/adaopt/fallbacksetup.py | 8 ++++ mlsauce/booster/_booster_classifier.py | 10 +++- mlsauce/booster/_booster_regressor.py | 9 +++- mlsauce/booster/fallbacksetup.py | 8 ++++ mlsauce/lasso/_lasso.py | 10 +++- mlsauce/lasso/fallbacksetup.py | 8 ++++ mlsauce/ridge/_ridge.py | 9 +++- mlsauce/ridge/fallbacksetup.py | 8 ++++ mlsauce/stump/_stump_classifier.py | 9 +++- mlsauce/stump/fallbacksetup.py | 8 ++++ setup.py | 2 +- 19 files changed, 203 insertions(+), 14 deletions(-) create mode 100644 mlsauce.egg-info/PKG-INFO create mode 100644 mlsauce.egg-info/SOURCES.txt create mode 100644 mlsauce.egg-info/dependency_links.txt create mode 100644 mlsauce.egg-info/not-zip-safe create mode 100644 mlsauce.egg-info/requires.txt create mode 100644 mlsauce.egg-info/top_level.txt create mode 100644 mlsauce/adaopt/fallbacksetup.py create mode 100644 mlsauce/booster/fallbacksetup.py create mode 100644 mlsauce/lasso/fallbacksetup.py create mode 100644 mlsauce/ridge/fallbacksetup.py create mode 100644 mlsauce/stump/fallbacksetup.py diff --git a/CHANGES.md b/CHANGES.md index f57a005..6d03c58 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -# version 0.15.1 +# version 0.15.2 - Can use pandas DataFrame in `LSBoostRegressor`, `LSBoostClassifier` and `AdaOpt` diff --git a/mlsauce.egg-info/PKG-INFO b/mlsauce.egg-info/PKG-INFO new file mode 100644 index 0000000..2ed7c37 --- /dev/null +++ b/mlsauce.egg-info/PKG-INFO @@ -0,0 +1,36 @@ +Metadata-Version: 2.1 +Name: mlsauce +Version: 0.15.1 +Summary: Miscellaneous Statistical/Machine Learning tools +Maintainer: T. Moudiki +Maintainer-email: thierry.moudiki@gmail.com +License: BSD3 Clause Clear +Platform: linux +Platform: macosx +Platform: windows +Classifier: Development Status :: 2 - Pre-Alpha +Classifier: Intended Audience :: Developers +Classifier: License :: OSI Approved :: BSD License +Classifier: Natural Language :: English +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 +Requires-Python: >=3.5 +License-File: LICENSE +Requires-Dist: numpy +Requires-Dist: Cython +Requires-Dist: joblib +Requires-Dist: pandas +Requires-Dist: requests +Requires-Dist: scikit-learn +Requires-Dist: scipy +Requires-Dist: tqdm +Requires-Dist: jax +Requires-Dist: jaxlib +Provides-Extra: alldeps +Requires-Dist: numpy>=1.13.0; extra == "alldeps" +Requires-Dist: scipy>=0.19.0; extra == "alldeps" + +Miscellaneous Statistical/Machine Learning tools diff --git a/mlsauce.egg-info/SOURCES.txt b/mlsauce.egg-info/SOURCES.txt new file mode 100644 index 0000000..66e2723 --- /dev/null +++ b/mlsauce.egg-info/SOURCES.txt @@ -0,0 +1,64 @@ +LICENSE +README.md +setup.cfg +setup.py +mlsauce/__init__.py +mlsauce/_config.py +mlsauce/setup.py +mlsauce.egg-info/PKG-INFO +mlsauce.egg-info/SOURCES.txt +mlsauce.egg-info/dependency_links.txt +mlsauce.egg-info/not-zip-safe +mlsauce.egg-info/requires.txt +mlsauce.egg-info/top_level.txt +mlsauce/adaopt/__init__.py +mlsauce/adaopt/_adaopt.py +mlsauce/adaopt/_adaoptc.c +mlsauce/adaopt/fallbacksetup.py +mlsauce/adaopt/setup.py +mlsauce/booster/__init__.py +mlsauce/booster/_booster_classifier.py +mlsauce/booster/_booster_regressor.py +mlsauce/booster/_boosterc.c +mlsauce/booster/fallbacksetup.py +mlsauce/booster/setup.py +mlsauce/datasets/__init__.py +mlsauce/datasets/dowload.py +mlsauce/encoders/__init__.py +mlsauce/encoders/target_encoders.py +mlsauce/lasso/__init__.py +mlsauce/lasso/_lasso.py +mlsauce/lasso/_lassoc.c +mlsauce/lasso/fallbacksetup.py +mlsauce/lasso/setup.py +mlsauce/nonconformist/__init__.py +mlsauce/nonconformist/acp.py +mlsauce/nonconformist/base.py +mlsauce/nonconformist/cp.py +mlsauce/nonconformist/evaluation.py +mlsauce/nonconformist/icp.py +mlsauce/nonconformist/nc.py +mlsauce/nonconformist/util.py +mlsauce/predictioninterval/__init__.py +mlsauce/predictioninterval/predictioninterval.py +mlsauce/ridge/__init__.py +mlsauce/ridge/_ridge.py +mlsauce/ridge/_ridgec.c +mlsauce/ridge/fallbacksetup.py +mlsauce/ridge/setup.py +mlsauce/stump/__init__.py +mlsauce/stump/_stump_classifier.py +mlsauce/stump/_stumpc.c +mlsauce/stump/fallbacksetup.py +mlsauce/stump/setup.py +mlsauce/tests/__init__.py +mlsauce/tests/test_adaopt.py +mlsauce/utils/__init__.py +mlsauce/utils/get_beta.py +mlsauce/utils/progress_bar.py +mlsauce/utils/memoryuse/__init__.py +mlsauce/utils/memoryuse/mem_usage.py +mlsauce/utils/misc/__init__.py +mlsauce/utils/misc/misc.py +mlsauce/utils/sampling/__init__.py +mlsauce/utils/sampling/rowsubsampling.py \ No newline at end of file diff --git a/mlsauce.egg-info/dependency_links.txt b/mlsauce.egg-info/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/mlsauce.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/mlsauce.egg-info/not-zip-safe b/mlsauce.egg-info/not-zip-safe new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/mlsauce.egg-info/not-zip-safe @@ -0,0 +1 @@ + diff --git a/mlsauce.egg-info/requires.txt b/mlsauce.egg-info/requires.txt new file mode 100644 index 0000000..b3f1862 --- /dev/null +++ b/mlsauce.egg-info/requires.txt @@ -0,0 +1,14 @@ +numpy +Cython +joblib +pandas +requests +scikit-learn +scipy +tqdm +jax +jaxlib + +[alldeps] +numpy>=1.13.0 +scipy>=0.19.0 diff --git a/mlsauce.egg-info/top_level.txt b/mlsauce.egg-info/top_level.txt new file mode 100644 index 0000000..2ccd09c --- /dev/null +++ b/mlsauce.egg-info/top_level.txt @@ -0,0 +1 @@ +mlsauce diff --git a/mlsauce/adaopt/_adaopt.py b/mlsauce/adaopt/_adaopt.py index 87ea295..ce92209 100644 --- a/mlsauce/adaopt/_adaopt.py +++ b/mlsauce/adaopt/_adaopt.py @@ -1,6 +1,7 @@ import pickle import numpy as np import pandas as pd +import subprocess from joblib import Parallel, delayed from joblib import wrap_non_picklable_objects from sklearn.base import BaseEstimator @@ -14,8 +15,12 @@ try: from . import _adaoptc as adaoptc except ImportError: - cythonize_file("_adaoptc.pyx") - import _adaoptc + try: + cythonize_file("./_adaoptc.pyx") + import _adaoptc + except ModuleNotFoundError: + subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace']) + import _adaoptc class AdaOpt(BaseEstimator, ClassifierMixin): diff --git a/mlsauce/adaopt/fallbacksetup.py b/mlsauce/adaopt/fallbacksetup.py new file mode 100644 index 0000000..c857679 --- /dev/null +++ b/mlsauce/adaopt/fallbacksetup.py @@ -0,0 +1,8 @@ +import os +from distutils.core import setup +from Cython.Build import cythonize + +dir_path = os.path.dirname(os.path.realpath(__file__)) + +setup(ext_modules=cythonize(os.path.join(dir_path, "_adaoptc.pyx"), + compiler_directives={'language_level' : "3"})) \ No newline at end of file diff --git a/mlsauce/booster/_booster_classifier.py b/mlsauce/booster/_booster_classifier.py index aa791ce..e526181 100644 --- a/mlsauce/booster/_booster_classifier.py +++ b/mlsauce/booster/_booster_classifier.py @@ -6,13 +6,19 @@ from sklearn.preprocessing import PolynomialFeatures from sklearn.base import BaseEstimator from sklearn.base import ClassifierMixin +import subprocess from ..utils import cluster from ..utils import cythonize_file try: from . import _boosterc as boosterc except ModuleNotFoundError: - cythonize_file("_boosterc.pyx") - import _boosterc + try: + cythonize_file("./_boosterc.pyx") + import _boosterc + except ModuleNotFoundError: + subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace']) + import _boosterc + class LSBoostClassifier(BaseEstimator, ClassifierMixin): """LSBoost classifier. diff --git a/mlsauce/booster/_booster_regressor.py b/mlsauce/booster/_booster_regressor.py index 73a6ab8..91a023a 100644 --- a/mlsauce/booster/_booster_regressor.py +++ b/mlsauce/booster/_booster_regressor.py @@ -5,14 +5,19 @@ from sklearn.base import BaseEstimator from sklearn.base import RegressorMixin from sklearn.preprocessing import PolynomialFeatures +import subprocess from . import _boosterc as boosterc from ..predictioninterval import PredictionInterval from ..utils import cluster, cythonize_file try: from . import _boosterc as boosterc except ModuleNotFoundError: - cythonize_file("_boosterc.pyx") - import _boosterc + try: + cythonize_file("./_boosterc.pyx") + import _boosterc + except ModuleNotFoundError: + subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace']) + import _boosterc class LSBoostRegressor(BaseEstimator, RegressorMixin): """LSBoost regressor. diff --git a/mlsauce/booster/fallbacksetup.py b/mlsauce/booster/fallbacksetup.py new file mode 100644 index 0000000..5bcdc84 --- /dev/null +++ b/mlsauce/booster/fallbacksetup.py @@ -0,0 +1,8 @@ +from distutils.core import setup +from Cython.Build import cythonize +import os + +dir_path = os.path.dirname(os.path.realpath(__file__)) + +setup(ext_modules=cythonize(os.path.join(dir_path, "_stumpc.pyx"), + compiler_directives={'language_level' : "3"})) \ No newline at end of file diff --git a/mlsauce/lasso/_lasso.py b/mlsauce/lasso/_lasso.py index 5efd195..35da544 100644 --- a/mlsauce/lasso/_lasso.py +++ b/mlsauce/lasso/_lasso.py @@ -1,9 +1,11 @@ import numpy as np import pickle +import subprocess import platform import warnings from sklearn.base import BaseEstimator from sklearn.base import RegressorMixin +import subprocess from numpy.linalg import inv from ..utils import get_beta, cythonize_file @@ -15,8 +17,12 @@ try: from . import _lassoc as mo except ModuleNotFoundError: - cythonize_file("_lassoc.pyx") - import _lassoc + try: + cythonize_file("./_lassoc.pyx") + import _lassoc + except ModuleNotFoundError: + subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace']) + import _lassoc class LassoRegressor(BaseEstimator, RegressorMixin): diff --git a/mlsauce/lasso/fallbacksetup.py b/mlsauce/lasso/fallbacksetup.py new file mode 100644 index 0000000..61ff0f4 --- /dev/null +++ b/mlsauce/lasso/fallbacksetup.py @@ -0,0 +1,8 @@ +from distutils.core import setup +from Cython.Build import cythonize +import os + +dir_path = os.path.dirname(os.path.realpath(__file__)) + +setup(ext_modules=cythonize(os.path.join(dir_path, "_lassoc.pyx"), + compiler_directives={'language_level' : "3"})) \ No newline at end of file diff --git a/mlsauce/ridge/_ridge.py b/mlsauce/ridge/_ridge.py index d35d456..8238a42 100644 --- a/mlsauce/ridge/_ridge.py +++ b/mlsauce/ridge/_ridge.py @@ -1,4 +1,5 @@ import numpy as np +import subprocess import platform import warnings from sklearn.base import BaseEstimator @@ -15,8 +16,12 @@ try: from . import _ridgec as mo except ModuleNotFoundError: - cythonize_file("_ridgec.pyx") - import _ridgec + try: + cythonize_file("./_ridgec.pyx") + import _ridgec + except ModuleNotFoundError: + subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace']) + import _ridgec class RidgeRegressor(BaseEstimator, RegressorMixin): diff --git a/mlsauce/ridge/fallbacksetup.py b/mlsauce/ridge/fallbacksetup.py new file mode 100644 index 0000000..6265d61 --- /dev/null +++ b/mlsauce/ridge/fallbacksetup.py @@ -0,0 +1,8 @@ +from distutils.core import setup +from Cython.Build import cythonize +import os + +dir_path = os.path.dirname(os.path.realpath(__file__)) + +setup(ext_modules=cythonize(os.path.join(dir_path, "_ridgec.pyx"), + compiler_directives={'language_level' : "3"})) \ No newline at end of file diff --git a/mlsauce/stump/_stump_classifier.py b/mlsauce/stump/_stump_classifier.py index 6fcfbd1..77bec40 100644 --- a/mlsauce/stump/_stump_classifier.py +++ b/mlsauce/stump/_stump_classifier.py @@ -1,4 +1,5 @@ import numpy as np +import subprocess from sklearn.base import BaseEstimator from sklearn.base import ClassifierMixin from ..utils import cythonize_file @@ -6,8 +7,12 @@ try: from . import _stumpc as stumpc except ModuleNotFoundError: - cythonize_file("_stumpc.pyx") - import _stumpc + try: + cythonize_file("./_stumpc.pyx") + import _stumpc + except ModuleNotFoundError: + subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace']) + import _stumpc class StumpClassifier(BaseEstimator, ClassifierMixin): diff --git a/mlsauce/stump/fallbacksetup.py b/mlsauce/stump/fallbacksetup.py new file mode 100644 index 0000000..5bcdc84 --- /dev/null +++ b/mlsauce/stump/fallbacksetup.py @@ -0,0 +1,8 @@ +from distutils.core import setup +from Cython.Build import cythonize +import os + +dir_path = os.path.dirname(os.path.realpath(__file__)) + +setup(ext_modules=cythonize(os.path.join(dir_path, "_stumpc.pyx"), + compiler_directives={'language_level' : "3"})) \ No newline at end of file diff --git a/setup.py b/setup.py index 7e789c2..7b4a6ab 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ MAINTAINER_EMAIL = 'thierry.moudiki@gmail.com' LICENSE = 'BSD3 Clause Clear' -__version__ = '0.15.1' +__version__ = '0.15.2' VERSION = __version__