flexcode 0.2.1__tar.gz → 0.2.2__tar.gz

{flexcode-0.2.1 → flexcode-0.2.2}/.github/workflows/smoke-test.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v3

{flexcode-0.2.1 → flexcode-0.2.2}/.github/workflows/testing-and-coverage.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v3
@@ -40,4 +40,4 @@ jobs:
         sudo apt-get install pandoc
     - name: Build docs
       run: |
-        sphinx-build -T -E -b html -d docs/build/doctrees ./docs docs/build/html
+        sphinx-build -T -E -b html -d docs/build/doctrees ./docs docs/build/html

{flexcode-0.2.1 → flexcode-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: flexcode
-Version: 0.2.1
+Version: 0.2.2
 Author-email: Ann Lee <annlee@andrew.cmu.edu>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 2, June 1991
@@ -349,8 +349,26 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE
+Requires-Dist: deprecated
+Requires-Dist: ipykernel
+Requires-Dist: pywavelets
+Requires-Dist: scikit-learn>=0.18
+Requires-Dist: xgboost
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx_rtd_theme; extra == "dev"
+Requires-Dist: sphinx-autoapi; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: nbconvert; extra == "dev"
+Requires-Dist: nbsphinx; extra == "dev"
+Requires-Dist: ipython; extra == "dev"
+Requires-Dist: matplotlib; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
+Dynamic: license-file
 
 Implementation of Flexible Conditional Density Estimator (FlexCode) in Python. See Izbicki, R.; Lee, A.B. [Converting High-Dimensional Regression to High-Dimensional Conditional Density Estimation](https://projecteuclid.org/euclid.ejs/1499133755). Electronic Journal of Statistics, 2017 for details. Port of the original [R package](https://github.com/rizbicki/FlexCoDE).
 

{flexcode-0.2.1 → flexcode-0.2.2}/pyproject.toml

@@ -27,9 +27,9 @@ dev = [
     "pytest",
     "pytest-cov", # Used to report total code coverage
     "pre-commit", # Used to run checks before finalizing a git commit
-    "sphinx==6.1.3", # Used to automatically generate documentation
-    "sphinx_rtd_theme==1.2.0", # Used to render documentation
-    "sphinx-autoapi==2.0.1", # Used to automatically generate api documentation
+    "sphinx", # Used to automatically generate documentation
+    "sphinx_rtd_theme", # Used to render documentation
+    "sphinx-autoapi", # Used to automatically generate api documentation
     "black", # Used for static linting of files
     "nbconvert", # Needed for pre-commit check to clear output from Python notebooks
     "nbsphinx", # Used to itegrate Python notebooks into Sphinx documentation

flexcode-0.2.2/src/flexcode/_version.py

@@ -0,0 +1,21 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '0.2.2'
+__version_tuple__ = version_tuple = (0, 2, 2)

{flexcode-0.2.1 → flexcode-0.2.2}/src/flexcode/regression_models.py

@@ -38,6 +38,7 @@ class NN(FlexCodeRegression):
             raise Exception("NN requires scikit-learn to be installed")
 
         super(NN, self).__init__(max_basis)
+        self.n_jobs = kwargs.get("n_jobs", -1)
 
         # Historically, we have used 'k' to indicate the number of neighbors, so
         # this just puts the right notation for KNeighborsRegressor
@@ -50,7 +51,7 @@ class NN(FlexCodeRegression):
             None
             if opt_flag
             else sklearn.multioutput.MultiOutputRegressor(
-                sklearn.neighbors.KNeighborsRegressor(**self.params), n_jobs=-1
+                sklearn.neighbors.KNeighborsRegressor(**self.params), n_jobs=self.n_jobs
             )
         )
 
@@ -64,7 +65,9 @@ class NN(FlexCodeRegression):
         self.models.fit(x_train, z_basis)
 
     def cv_optim(self, x_train, z_basis):
-        nn_obj = sklearn.multioutput.MultiOutputRegressor(sklearn.neighbors.KNeighborsRegressor(), n_jobs=-1)
+        nn_obj = sklearn.multioutput.MultiOutputRegressor(
+            sklearn.neighbors.KNeighborsRegressor(), n_jobs=self.n_jobs
+        )
         clf = sklearn.model_selection.GridSearchCV(
             nn_obj, self.params, cv=5, scoring="neg_mean_squared_error", verbose=2
         )
@@ -72,7 +75,7 @@ class NN(FlexCodeRegression):
 
         self.params = params_name_format(clf.best_params_, str_rem="estimator__")
         self.models = sklearn.multioutput.MultiOutputRegressor(
-            sklearn.neighbors.KNeighborsRegressor(**self.params), n_jobs=-1
+            sklearn.neighbors.KNeighborsRegressor(**self.params), n_jobs=self.n_jobs
         )
 
     def predict(self, x_test):
@@ -86,6 +89,7 @@ class RandomForest(FlexCodeRegression):
             raise Exception("RandomForest requires scikit-learn to be installed")
 
         super(RandomForest, self).__init__(max_basis)
+        self.n_jobs = kwargs.get("n_jobs", -1)
 
         params_opt, opt_flag = params_dict_optim_decision(params, multi_output=True)
         self.params = params_opt
@@ -93,7 +97,7 @@ class RandomForest(FlexCodeRegression):
             None
             if opt_flag
             else sklearn.multioutput.MultiOutputRegressor(
-                sklearn.ensemble.RandomForestRegressor(**self.params), n_jobs=-1
+                sklearn.ensemble.RandomForestRegressor(**self.params), n_jobs=self.n_jobs
             )
         )
 
@@ -104,7 +108,9 @@ class RandomForest(FlexCodeRegression):
         self.models.fit(x_train, z_basis, sample_weight=weight)
 
     def cv_optim(self, x_train, z_basis, weight=None):
-        rf_obj = sklearn.multioutput.MultiOutputRegressor(sklearn.ensemble.RandomForestRegressor(), n_jobs=-1)
+        rf_obj = sklearn.multioutput.MultiOutputRegressor(
+            sklearn.ensemble.RandomForestRegressor(), n_jobs=self.n_jobs
+        )
         clf = sklearn.model_selection.GridSearchCV(
             rf_obj, self.params, cv=5, scoring="neg_mean_squared_error", verbose=2
         )
@@ -112,7 +118,7 @@ class RandomForest(FlexCodeRegression):
 
         self.params = params_name_format(clf.best_params_, str_rem="estimator__")
         self.models = sklearn.multioutput.MultiOutputRegressor(
-            sklearn.ensemble.RandomForestRegressor(**self.params), n_jobs=-1
+            sklearn.ensemble.RandomForestRegressor(**self.params), n_jobs=self.n_jobs
         )
 
     def predict(self, x_test):
@@ -125,6 +131,7 @@ class XGBoost(FlexCodeRegression):
         if not XGBOOST_AVAILABLE:
             raise Exception("XGBoost requires xgboost to be installed")
         super(XGBoost, self).__init__(max_basis)
+        self.n_jobs = kwargs.get("n_jobs", -1)
 
         # Historically, people have used `eta` for `learning_rate` - taking that
         # into account
@@ -143,7 +150,7 @@ class XGBoost(FlexCodeRegression):
         self.models = (
             None
             if opt_flag
-            else sklearn.multioutput.MultiOutputRegressor(xgb.XGBRegressor(**self.params), n_jobs=-1)
+            else sklearn.multioutput.MultiOutputRegressor(xgb.XGBRegressor(**self.params), n_jobs=self.n_jobs)
         )
 
     def fit(self, x_train, z_basis, weight=None):
@@ -153,14 +160,16 @@ class XGBoost(FlexCodeRegression):
         self.models.fit(x_train, z_basis, sample_weight=weight)
 
     def cv_optim(self, x_train, z_basis, weight=None):
-        xgb_obj = sklearn.multioutput.MultiOutputRegressor(xgb.XGBRegressor(), n_jobs=-1)
+        xgb_obj = sklearn.multioutput.MultiOutputRegressor(xgb.XGBRegressor(), n_jobs=self.n_jobs)
         clf = sklearn.model_selection.GridSearchCV(
             xgb_obj, self.params, cv=5, scoring="neg_mean_squared_error", verbose=2
         )
         clf.fit(x_train, z_basis, sample_weight=weight)
 
         self.params = params_name_format(clf.best_params_, str_rem="estimator__")
-        self.models = sklearn.multioutput.MultiOutputRegressor(xgb.XGBRegressor(**self.params), n_jobs=-1)
+        self.models = sklearn.multioutput.MultiOutputRegressor(
+            xgb.XGBRegressor(**self.params), n_jobs=self.n_jobs
+        )
 
     def predict(self, x_test):
         coefs = self.models.predict(x_test)
@@ -172,6 +181,7 @@ class Lasso(FlexCodeRegression):
         if not SKLEARN_AVAILABLE:
             raise Exception("Lasso requires scikit-learn to be installed")
         super(Lasso, self).__init__(max_basis)
+        self.n_jobs = kwargs.get("n_jobs", -1)
 
         # Also, set the default values if not passed
         params["alpha"] = params.get("alpha", 1.0)
@@ -183,7 +193,7 @@ class Lasso(FlexCodeRegression):
             None
             if opt_flag
             else sklearn.multioutput.MultiOutputRegressor(
-                sklearn.linear_model.ElasticNet(**self.params), n_jobs=-1
+                sklearn.linear_model.ElasticNet(**self.params), n_jobs=self.n_jobs
             )
         )
 
@@ -199,7 +209,9 @@ class Lasso(FlexCodeRegression):
         self.models.fit(x_train, z_basis)
 
     def cv_optim(self, x_train, z_basis):
-        lasso_obj = sklearn.multioutput.MultiOutputRegressor(sklearn.linear_model.ElasticNet(), n_jobs=-1)
+        lasso_obj = sklearn.multioutput.MultiOutputRegressor(
+            sklearn.linear_model.ElasticNet(), n_jobs=self.n_jobs
+        )
         clf = sklearn.model_selection.GridSearchCV(
             lasso_obj, self.params, cv=5, scoring="neg_mean_squared_error", verbose=2
         )
@@ -220,6 +232,7 @@ class CustomModel(FlexCodeRegression):
         if not SKLEARN_AVAILABLE:
             raise Exception("Custom class requires scikit-learn to be installed")
         super(CustomModel, self).__init__(max_basis)
+        self.n_jobs = kwargs.get("n_jobs", -1)
 
         params_opt, opt_flag = params_dict_optim_decision(params, multi_output=True)
         self.params = params_opt
@@ -227,7 +240,7 @@ class CustomModel(FlexCodeRegression):
         self.models = (
             None
             if opt_flag
-            else sklearn.multioutput.MultiOutputRegressor(self.base_model(**self.params), n_jobs=-1)
+            else sklearn.multioutput.MultiOutputRegressor(self.base_model(**self.params), n_jobs=self.n_jobs)
         )
 
     def fit(self, x_train, z_basis, weight=None):
@@ -242,14 +255,16 @@ class CustomModel(FlexCodeRegression):
         self.models.fit(x_train, z_basis)
 
     def cv_optim(self, x_train, z_basis):
-        custom_obj = sklearn.multioutput.MultiOutputRegressor(self.base_model(), n_jobs=-1)
+        custom_obj = sklearn.multioutput.MultiOutputRegressor(self.base_model(), n_jobs=self.n_jobs)
         clf = sklearn.model_selection.GridSearchCV(
             custom_obj, self.params, cv=5, scoring="neg_mean_squared_error", verbose=2
         )
         clf.fit(x_train, z_basis)
 
         self.params = params_name_format(clf.best_params_, str_rem="estimator__")
-        self.models = sklearn.multioutput.MultiOutputRegressor(self.base_model(**self.params), n_jobs=-1)
+        self.models = sklearn.multioutput.MultiOutputRegressor(
+            self.base_model(**self.params), n_jobs=self.n_jobs
+        )
 
     def predict(self, x_test):
         coefs = self.models.predict(x_test)

{flexcode-0.2.1 → flexcode-0.2.2}/src/flexcode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: flexcode
-Version: 0.2.1
+Version: 0.2.2
 Author-email: Ann Lee <annlee@andrew.cmu.edu>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 2, June 1991
@@ -349,8 +349,26 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Description-Content-Type: text/markdown
-Provides-Extra: dev
 License-File: LICENSE
+Requires-Dist: deprecated
+Requires-Dist: ipykernel
+Requires-Dist: pywavelets
+Requires-Dist: scikit-learn>=0.18
+Requires-Dist: xgboost
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx_rtd_theme; extra == "dev"
+Requires-Dist: sphinx-autoapi; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: nbconvert; extra == "dev"
+Requires-Dist: nbsphinx; extra == "dev"
+Requires-Dist: ipython; extra == "dev"
+Requires-Dist: matplotlib; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
+Dynamic: license-file
 
 Implementation of Flexible Conditional Density Estimator (FlexCode) in Python. See Izbicki, R.; Lee, A.B. [Converting High-Dimensional Regression to High-Dimensional Conditional Density Estimation](https://projecteuclid.org/euclid.ejs/1499133755). Electronic Journal of Statistics, 2017 for details. Port of the original [R package](https://github.com/rizbicki/FlexCoDE).
 

{flexcode-0.2.1 → flexcode-0.2.2}/src/flexcode.egg-info/requires.txt

@@ -8,9 +8,9 @@ xgboost
 pytest
 pytest-cov
 pre-commit
-sphinx==6.1.3
-sphinx_rtd_theme==1.2.0
-sphinx-autoapi==2.0.1
+sphinx
+sphinx_rtd_theme
+sphinx-autoapi
 black
 nbconvert
 nbsphinx

flexcode-0.2.1/src/flexcode/_version.py

@@ -1,4 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-__version__ = version = '0.2.1'
-__version_tuple__ = version_tuple = (0, 2, 1)