bump v0.15.4

Makefile

@@ -33,6 +33,7 @@ clean-build: ## remove build artifacts
 	rm -fr .eggs/
 	find . -name '*.egg-info' -exec rm -fr {} +
 	find . -name '*.egg' -exec rm -f {} +
+	find . -name '*.so' -exec rm -f {} +
 
 clean-pyc: ## remove Python file artifacts
 	find . -name '*.pyc' -exec rm -f {} +

mlsauce/adaopt/_adaopt.py

@@ -1,3 +1,4 @@
+import os 
 import pickle
 import numpy as np
 import pandas as pd
@@ -13,15 +14,11 @@
 from ..utils import cythonize_file 
 
 try:
-    from . import _adaoptc as adaoptc
-except ModuleNotFoundError:
-    try: 
-        cythonize_file("./_adaoptc.pyx")        
-        import _adaoptc
-    except ModuleNotFoundError: 
-        subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace'])    
-        import _adaoptc
-
+    from . import _adaoptc as adaoptc        
+except ImportError:
+    import pyximport; pyximport.install()
+    import _adaoptc    
+
 
 class AdaOpt(BaseEstimator, ClassifierMixin):
     """AdaOpt classifier.

mlsauce/booster/_booster_classifier.py

@@ -12,12 +12,8 @@
 try:
     from . import _boosterc as boosterc
 except ModuleNotFoundError:
-    try: 
-        cythonize_file("./_boosterc.pyx")        
-        import _boosterc
-    except ModuleNotFoundError: 
-        subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace'])    
-        import _boosterc
+    import pyximport; pyximport.install()
+    import _boosterc
 
 
 class LSBoostClassifier(BaseEstimator, ClassifierMixin):

mlsauce/booster/_booster_regressor.py

@@ -12,12 +12,8 @@
 try:
     from . import _boosterc as boosterc
 except ModuleNotFoundError:
-    try: 
-        cythonize_file("./_boosterc.pyx")        
-        import _boosterc
-    except ModuleNotFoundError: 
-        subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace'])    
-        import _boosterc
+    import pyximport; pyximport.install()
+    import _boosterc
 
 class LSBoostRegressor(BaseEstimator, RegressorMixin):
     """LSBoost regressor.

mlsauce/booster/fallbacksetup.py

@@ -4,5 +4,5 @@
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 
-setup(ext_modules=cythonize(os.path.join(dir_path, "_stumpc.pyx"), 
+setup(ext_modules=cythonize(os.path.join(dir_path, "_boosterc.pyx"), 
                             compiler_directives={'language_level' : "3"}))

mlsauce/lasso/_lasso.py

@@ -17,12 +17,8 @@
 try:
     from . import _lassoc as mo
 except ModuleNotFoundError:
-    try: 
-        cythonize_file("./_lassoc.pyx")        
-        import _lassoc
-    except ModuleNotFoundError: 
-        subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace'])    
-        import _lassoc
+    import pyximport; pyximport.install()
+    import _lassoc
 
 
 class LassoRegressor(BaseEstimator, RegressorMixin):

mlsauce/ridge/_ridge.py

@@ -16,12 +16,8 @@
 try:
     from . import _ridgec as mo
 except ModuleNotFoundError:
-    try: 
-        cythonize_file("./_ridgec.pyx")        
-        import _ridgec
-    except ModuleNotFoundError: 
-        subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace'])    
-        import _ridgec
+    import pyximport; pyximport.install()
+    import _ridgec
 
 
 class RidgeRegressor(BaseEstimator, RegressorMixin):

mlsauce/stump/_stump_classifier.py

@@ -7,12 +7,8 @@
 try:
     from . import _stumpc as stumpc
 except ModuleNotFoundError:
-    try: 
-        cythonize_file("./_stumpc.pyx")        
-        import _stumpc
-    except ModuleNotFoundError: 
-        subprocess.run(['python3', './fallbacksetup.py', 'build_ext', '--inplace'])    
-        import _stumpc
+    import pyximport; pyximport.install()
+    import _stumpc
 
 
 class StumpClassifier(BaseEstimator, ClassifierMixin):

setup.py

@@ -38,7 +38,7 @@
 MAINTAINER_EMAIL = '[email protected]'
 LICENSE = 'BSD3 Clause Clear'
 
-__version__ = '0.15.3'
+__version__ = '0.15.4'
 
 VERSION = __version__
 
@@ -200,4 +200,18 @@ def setup_package():
     setup(**metadata)
 
 if __name__ == "__main__":
-    setup_package()
+
+    # /!\ do not change the order of execution of the following commands 
+
+    setup_package()
+
+    dir_path = os.path.dirname(os.path.realpath(__file__))
+    folders = ['adaopt', 'booster', 'lasso', 'ridge', 'stump']
+
+    for folder in folders: 
+
+        filename = os.path.join(dir_path, "mlsauce", folder, 'fallbacksetup.py')
+
+        print(f"\n\n Running command: {filename} \n\n")
+
+        subprocess.run(['python3', filename, 'build_ext', '--inplace'])