Merge pull request #342 from Gurobi/main

Backport changes to 1.5.x. to get the 2 bug fixes
Gurobi · Sep 4, 2024 · bde9114 · bde9114
2 parents 19473c6 + 13422a8
commit bde9114
Show file tree

Hide file tree

Showing 100 changed files with 35 additions and 20 deletions.
diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml
@@ -31,13 +31,13 @@ jobs:
           gurobi-machinelearning \
           https://pypi.anaconda.org/gurobi-machinelearning-wheels-staging/simple/gurobi-machinelearning/
     - name: Publish package to TestPyPI
-      uses: pypa/gh-action-pypi-publish@v1.9.0
+      uses: pypa/gh-action-pypi-publish@v1.10.0
       with:
         password: ${{ secrets.TEST_PYPI_TOKEN }}
         repository_url: https://test.pypi.org/legacy/
       if: ${{ github.event.inputs.pypi_repo == 'testpypi' }}
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.9.0
+      uses: pypa/gh-action-pypi-publish@v1.10.0
       with:
         password: ${{ secrets.PYPI_TOKEN }}
       if: ${{ github.event.inputs.pypi_repo == 'pypi' }}
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,19 +1,18 @@
-gurobipy==11.0.2
-gurobipy-pandas==1.1.2
-ipykernel==6.29.4
+gurobipy==11.0.3
+gurobipy-pandas==1.1.4
+ipykernel==6.29.5
 jupytext==1.16.2
 matplotlib==3.6.0
 matplotlib-inline==0.1.7
 sphinxcontrib_bibtex==2.6.2
 numpy==1.26.4
 numpydoc==1.7.0
 pandas==2.2.2
-scikit-learn==1.5.0
+scikit-learn==1.5.1
 seaborn==0.13.2
 Sphinx==7.3.7
 sphinx-copybutton==0.5.2
 sphinx-rtd-theme==2.0.0
-nbsphinx==0.9.4
 jupytext==1.16.2
 sphinx_design==0.6.0
 sphinx-pyproject==0.3.0

diff --git a/requirements.lightgbm.txt b/requirements.lightgbm.txt
@@ -1 +1 @@
-lightgbm==4.3.0
+lightgbm==4.5.0
diff --git a/requirements.pandas.txt b/requirements.pandas.txt
@@ -1,2 +1,2 @@
 pandas==2.2.2
-gurobipy-pandas==1.1.2
+gurobipy-pandas==1.1.4
diff --git a/requirements.pytorch.txt b/requirements.pytorch.txt
@@ -1 +1 @@
-torch==2.2.2
+torch==2.4.0
diff --git a/requirements.sklearn.txt b/requirements.sklearn.txt
@@ -1 +1 @@
-scikit-learn==1.5.0
+scikit-learn==1.5.1
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-gurobipy==11.0.2
+gurobipy==11.0.3
 numpy==1.26.4
 pandas==2.2.2
-scikit-learn==1.5.0
+scikit-learn==1.5.1
 seaborn==0.13.2
 .
diff --git a/requirements.xgboost.txt b/requirements.xgboost.txt
@@ -1 +1 @@
-xgboost==2.0.3
+xgboost==2.1.1
diff --git a/src/gurobi_ml/torch/sequential.py b/src/gurobi_ml/torch/sequential.py
@@ -101,11 +101,17 @@ def _mip_model(self, **kwargs):
                 )
                 _input = layer.output
             elif isinstance(step, nn.Linear):
+                layer_weight = None
+                layer_bias = None
                 for name, param in step.named_parameters():
                     if name == "weight":
                         layer_weight = param.detach().numpy().T
                     elif name == "bias":
                         layer_bias = param.detach().numpy()
+                if layer_weight is None:
+                    raise NotImplementedError("No weights specified for newwork layer.")
+                if layer_bias is None:
+                    layer_bias = 0.0
                 layer = self._add_dense_layer(
                     _input,
                     layer_weight,

diff --git a/tests/predictors/circle__decisiontreeregressor.joblib b/tests/predictors/circle__decisiontreeregressor.joblib
diff --git a/tests/predictors/circle__pipeline_polynomialfeatures_decisiontreeregressor.joblib b/tests/predictors/circle__pipeline_polynomialfeatures_decisiontreeregressor.joblib
diff --git a/tests/predictors/circle__pipeline_polynomialfeatures_randomforestregressor.joblib b/tests/predictors/circle__pipeline_polynomialfeatures_randomforestregressor.joblib
diff --git a/tests/predictors/circle__pipeline_standardscaler_decisiontreeregressor.joblib b/tests/predictors/circle__pipeline_standardscaler_decisiontreeregressor.joblib
diff --git a/tests/predictors/circle__pipeline_standardscaler_randomforestregressor.joblib b/tests/predictors/circle__pipeline_standardscaler_randomforestregressor.joblib
diff --git a/tests/predictors/circle__randomforestregressor.joblib b/tests/predictors/circle__randomforestregressor.joblib
diff --git a/tests/predictors/circle_sklearn_version b/tests/predictors/circle_sklearn_version
@@ -1 +1 @@
-1.5.0
+1.5.1
diff --git a/tests/predictors/diabetes__decisiontreeregressor.joblib b/tests/predictors/diabetes__decisiontreeregressor.joblib
diff --git a/tests/predictors/diabetes__gradientboostingregressor.joblib b/tests/predictors/diabetes__gradientboostingregressor.joblib
diff --git a/tests/predictors/diabetes__lasso.joblib b/tests/predictors/diabetes__lasso.joblib
diff --git a/tests/predictors/diabetes__linearregression.joblib b/tests/predictors/diabetes__linearregression.joblib
diff --git a/tests/predictors/diabetes__mlpregressor_20x20.joblib b/tests/predictors/diabetes__mlpregressor_20x20.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_decisiontreeregressor.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_decisiontreeregressor.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_gradientboostingregressor.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_gradientboostingregressor.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_lasso.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_lasso.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_linearregression.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_linearregression.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_mlpregressor_20x20.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_mlpregressor_20x20.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_plscanonical.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_plscanonical.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_plsregression.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_plsregression.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_randomforestregressor.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_randomforestregressor.joblib
diff --git a/tests/predictors/diabetes__pipeline_polynomialfeatures_ridge.joblib b/tests/predictors/diabetes__pipeline_polynomialfeatures_ridge.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_decisiontreeregressor.joblib b/tests/predictors/diabetes__pipeline_standardscaler_decisiontreeregressor.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_gradientboostingregressor.joblib b/tests/predictors/diabetes__pipeline_standardscaler_gradientboostingregressor.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_lasso.joblib b/tests/predictors/diabetes__pipeline_standardscaler_lasso.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_linearregression.joblib b/tests/predictors/diabetes__pipeline_standardscaler_linearregression.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_mlpregressor_20x20.joblib b/tests/predictors/diabetes__pipeline_standardscaler_mlpregressor_20x20.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_plscanonical.joblib b/tests/predictors/diabetes__pipeline_standardscaler_plscanonical.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_plsregression.joblib b/tests/predictors/diabetes__pipeline_standardscaler_plsregression.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_randomforestregressor.joblib b/tests/predictors/diabetes__pipeline_standardscaler_randomforestregressor.joblib
diff --git a/tests/predictors/diabetes__pipeline_standardscaler_ridge.joblib b/tests/predictors/diabetes__pipeline_standardscaler_ridge.joblib
diff --git a/tests/predictors/diabetes__plscanonical.joblib b/tests/predictors/diabetes__plscanonical.joblib
diff --git a/tests/predictors/diabetes__plsregression.joblib b/tests/predictors/diabetes__plsregression.joblib
diff --git a/tests/predictors/diabetes__pytorch.pt b/tests/predictors/diabetes__pytorch.pt
diff --git a/tests/predictors/diabetes__randomforestregressor.joblib b/tests/predictors/diabetes__randomforestregressor.joblib
diff --git a/tests/predictors/diabetes__ridge.joblib b/tests/predictors/diabetes__ridge.joblib
diff --git a/tests/predictors/diabetes_pandas__decisiontreeregressor.joblib b/tests/predictors/diabetes_pandas__decisiontreeregressor.joblib
diff --git a/tests/predictors/diabetes_pandas__gradientboostingregressor.joblib b/tests/predictors/diabetes_pandas__gradientboostingregressor.joblib
diff --git a/tests/predictors/diabetes_pandas__lasso.joblib b/tests/predictors/diabetes_pandas__lasso.joblib
diff --git a/tests/predictors/diabetes_pandas__linearregression.joblib b/tests/predictors/diabetes_pandas__linearregression.joblib
diff --git a/tests/predictors/diabetes_pandas__mlpregressor_20x20.joblib b/tests/predictors/diabetes_pandas__mlpregressor_20x20.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_decisiontreeregressor.joblib b/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_decisiontreeregressor.joblib
diff --git a/.../predictors/diabetes_pandas__pipeline_polynomialfeatures_gradientboostingregressor.joblib b/.../predictors/diabetes_pandas__pipeline_polynomialfeatures_gradientboostingregressor.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_lasso.joblib b/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_lasso.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_linearregression.joblib b/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_linearregression.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_mlpregressor_20x20.joblib b/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_mlpregressor_20x20.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_plscanonical.joblib b/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_plscanonical.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_plsregression.joblib b/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_plsregression.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_randomforestregressor.joblib b/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_randomforestregressor.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_ridge.joblib b/tests/predictors/diabetes_pandas__pipeline_polynomialfeatures_ridge.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_decisiontreeregressor.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_decisiontreeregressor.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_gradientboostingregressor.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_gradientboostingregressor.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_lasso.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_lasso.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_linearregression.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_linearregression.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_mlpregressor_20x20.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_mlpregressor_20x20.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_plscanonical.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_plscanonical.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_plsregression.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_plsregression.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_randomforestregressor.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_randomforestregressor.joblib
diff --git a/tests/predictors/diabetes_pandas__pipeline_standardscaler_ridge.joblib b/tests/predictors/diabetes_pandas__pipeline_standardscaler_ridge.joblib
diff --git a/tests/predictors/diabetes_pandas__plscanonical.joblib b/tests/predictors/diabetes_pandas__plscanonical.joblib
diff --git a/tests/predictors/diabetes_pandas__plsregression.joblib b/tests/predictors/diabetes_pandas__plsregression.joblib
diff --git a/tests/predictors/diabetes_pandas__randomforestregressor.joblib b/tests/predictors/diabetes_pandas__randomforestregressor.joblib
diff --git a/tests/predictors/diabetes_pandas__ridge.joblib b/tests/predictors/diabetes_pandas__ridge.joblib
diff --git a/tests/predictors/diabetes_pandas_sklearn_version b/tests/predictors/diabetes_pandas_sklearn_version
@@ -1 +1 @@
-1.5.0
+1.5.1
diff --git a/tests/predictors/diabetes_sklearn_version b/tests/predictors/diabetes_sklearn_version
@@ -1 +1 @@
-1.5.0
+1.5.1
diff --git a/tests/predictors/iris__logisticregression.joblib b/tests/predictors/iris__logisticregression.joblib
diff --git a/tests/predictors/iris__pipeline_polynomialfeatures_logisticregression.joblib b/tests/predictors/iris__pipeline_polynomialfeatures_logisticregression.joblib
diff --git a/tests/predictors/iris__pipeline_standardscaler_logisticregression.joblib b/tests/predictors/iris__pipeline_standardscaler_logisticregression.joblib
diff --git a/tests/predictors/iris_sklearn_version b/tests/predictors/iris_sklearn_version
@@ -1 +1 @@
-1.5.0
+1.5.1
diff --git a/tests/predictors/mnist__mlpclassifier.joblib b/tests/predictors/mnist__mlpclassifier.joblib
diff --git a/tests/predictors/mnist__pipeline_mlpclassifier.joblib b/tests/predictors/mnist__pipeline_mlpclassifier.joblib
diff --git a/tests/predictors/mnist_sklearn_version b/tests/predictors/mnist_sklearn_version
@@ -1 +1 @@
-1.5.0
+1.5.1
diff --git a/.../wages__pipeline_columntransformer_onehotencoder_passthrough_decisiontreeregressor.joblib b/.../wages__pipeline_columntransformer_onehotencoder_passthrough_decisiontreeregressor.joblib
diff --git a/...es__pipeline_columntransformer_onehotencoder_passthrough_gradientboostingregressor.joblib b/...es__pipeline_columntransformer_onehotencoder_passthrough_gradientboostingregressor.joblib
diff --git a/tests/predictors/wages__pipeline_columntransformer_onehotencoder_passthrough_lasso.joblib b/tests/predictors/wages__pipeline_columntransformer_onehotencoder_passthrough_lasso.joblib
diff --git a/...ctors/wages__pipeline_columntransformer_onehotencoder_passthrough_linearregression.joblib b/...ctors/wages__pipeline_columntransformer_onehotencoder_passthrough_linearregression.joblib
diff --git a/...ors/wages__pipeline_columntransformer_onehotencoder_passthrough_mlpregressor_20x20.joblib b/...ors/wages__pipeline_columntransformer_onehotencoder_passthrough_mlpregressor_20x20.joblib
diff --git a/...redictors/wages__pipeline_columntransformer_onehotencoder_passthrough_plscanonical.joblib b/...redictors/wages__pipeline_columntransformer_onehotencoder_passthrough_plscanonical.joblib
diff --git a/...edictors/wages__pipeline_columntransformer_onehotencoder_passthrough_plsregression.joblib b/...edictors/wages__pipeline_columntransformer_onehotencoder_passthrough_plsregression.joblib
diff --git a/.../wages__pipeline_columntransformer_onehotencoder_passthrough_randomforestregressor.joblib b/.../wages__pipeline_columntransformer_onehotencoder_passthrough_randomforestregressor.joblib
diff --git a/tests/predictors/wages__pipeline_columntransformer_onehotencoder_passthrough_ridge.joblib b/tests/predictors/wages__pipeline_columntransformer_onehotencoder_passthrough_ridge.joblib
diff --git a/...ges__pipeline_columntransformer_onehotencoder_standardscaler_decisiontreeregressor.joblib b/...ges__pipeline_columntransformer_onehotencoder_standardscaler_decisiontreeregressor.joblib
diff --git a/..._pipeline_columntransformer_onehotencoder_standardscaler_gradientboostingregressor.joblib b/..._pipeline_columntransformer_onehotencoder_standardscaler_gradientboostingregressor.joblib
diff --git a/tests/predictors/wages__pipeline_columntransformer_onehotencoder_standardscaler_lasso.joblib b/tests/predictors/wages__pipeline_columntransformer_onehotencoder_standardscaler_lasso.joblib
diff --git a/...rs/wages__pipeline_columntransformer_onehotencoder_standardscaler_linearregression.joblib b/...rs/wages__pipeline_columntransformer_onehotencoder_standardscaler_linearregression.joblib
diff --git a/.../wages__pipeline_columntransformer_onehotencoder_standardscaler_mlpregressor_20x20.joblib b/.../wages__pipeline_columntransformer_onehotencoder_standardscaler_mlpregressor_20x20.joblib
diff --git a/...ictors/wages__pipeline_columntransformer_onehotencoder_standardscaler_plscanonical.joblib b/...ictors/wages__pipeline_columntransformer_onehotencoder_standardscaler_plscanonical.joblib
diff --git a/...ctors/wages__pipeline_columntransformer_onehotencoder_standardscaler_plsregression.joblib b/...ctors/wages__pipeline_columntransformer_onehotencoder_standardscaler_plsregression.joblib
diff --git a/...ges__pipeline_columntransformer_onehotencoder_standardscaler_randomforestregressor.joblib b/...ges__pipeline_columntransformer_onehotencoder_standardscaler_randomforestregressor.joblib
diff --git a/tests/predictors/wages__pipeline_columntransformer_onehotencoder_standardscaler_ridge.joblib b/tests/predictors/wages__pipeline_columntransformer_onehotencoder_standardscaler_ridge.joblib
diff --git a/tests/predictors/wages_sklearn_version b/tests/predictors/wages_sklearn_version
@@ -1 +1 @@
-1.5.0
+1.5.1
diff --git a/toxfile.py b/toxfile.py
@@ -0,0 +1,10 @@
+import shutil
+
+from tox.plugin import impl
+from tox.tox_env.api import ToxEnv
+
+
+@impl
+def tox_env_teardown(tox_env: ToxEnv):
+    print(f"removing env dir: {tox_env}")
+    shutil.rmtree(tox_env.env_dir)