Merge branch 'master' into fix/1061

Author: Zeroto521

CHANGELOG.md

@@ -25,6 +25,7 @@
 ### Fixed
 - Raised an error when an expression is used when a variable is required
 - Fixed some compile warnings
+- Fixed the type of @ matrix operation result from MatrixVariable to MatrixExpr.
 ### Changed
 - MatrixExpr.sum() now supports axis arguments and can return either a scalar or MatrixExpr, depending on the result dimensions.
 - AddMatrixCons() also accepts ExprCons.

pyproject.toml

@@ -39,16 +39,25 @@ version = {attr = "pyscipopt._version.__version__"}
 [tool.cibuildwheel]
 skip="pp*" # currently doesn't work with PyPy
 manylinux-x86_64-image = "manylinux_2_28"
+manylinux-aarch64-image = "manylinux_2_28"
 
 
 [tool.cibuildwheel.linux]
 skip="pp* cp36* cp37* *musllinux*"
-before-all = [
-    "(apt-get update && apt-get install --yes wget) || yum install -y wget zlib libgfortran || brew install wget",
-    "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-linux.zip -O scip.zip",
-    "unzip scip.zip",
-    "mv scip_install scip"
-    ]
+before-all = '''
+#!/bin/bash
+(apt-get update && apt-get install --yes wget) || yum install -y wget zlib libgfortran || brew install wget
+AARCH=$(uname -m)
+echo "------"
+echo $AARCH
+if [[ $AARCH == "aarch64" ]]; then
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux-arm.zip -O scip.zip
+else
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux.zip -O scip.zip
+fi
+unzip scip.zip
+mv scip_install scip
+'''
 environment = { SCIPOPTDIR="$(pwd)/scip", LD_LIBRARY_PATH="$(pwd)/scip/lib:$LD_LIBRARY_PATH", DYLD_LIBRARY_PATH="$(pwd)/scip/lib:$DYLD_LIBRARY_PATH", PATH="$(pwd)/scip/bin:$PATH", PKG_CONFIG_PATH="$(pwd)/scip/lib/pkgconfig:$PKG_CONFIG_PATH", RELEASE="true"}
 
 
@@ -58,10 +67,10 @@ before-all = '''
 #!/bin/bash
 brew install wget zlib gcc
 if [[ $CIBW_ARCHS == *"arm"* ]]; then
-    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-macos-arm.zip -O scip.zip
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-macos-arm.zip -O scip.zip
     export MACOSX_DEPLOYMENT_TARGET=14.0
 else
-    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-macos-intel.zip -O scip.zip
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-macos-intel.zip -O scip.zip
     export MACOSX_DEPLOYMENT_TARGET=13.0
 fi
 unzip scip.zip
@@ -87,7 +96,7 @@ repair-wheel-command = '''
 skip="pp* cp36* cp37*"
 before-all = [
     "choco install 7zip wget",
-    "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.7.0/libscip-windows.zip -O scip.zip",
+    "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-windows.zip -O scip.zip",
     "\"C:\\Program Files\\7-Zip\\7z.exe\" x \"scip.zip\" -o\"scip-test\"",
     "mv .\\scip-test\\scip_install .\\test",
     "mv .\\test .\\scip"

setup.py

@@ -62,8 +62,9 @@
     extra_link_args.append(f"-Wl,-rpath,{libdir}")
 
 # enable debug mode if requested
-if os.environ.get("PYSCIPOPT_DEBUG")=="True":
+if "--debug" in sys.argv:
     extra_compile_args.append("-UNDEBUG")
+    sys.argv.remove("--debug")
 
 use_cython = True
 
@@ -109,7 +110,7 @@
 
 setup(
     name="PySCIPOpt",
-    version="5.5.0",
+    version="5.6.0",
     description="Python interface and modeling environment for SCIP",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/pyscipopt/__init__.py

@@ -7,38 +7,38 @@
         os.add_dll_directory(os.path.join(os.getenv('SCIPOPTDIR').strip('"'), 'bin'))
 
 # export user-relevant objects:
-from pyscipopt.Multidict import multidict
-from pyscipopt.scip      import Model
-from pyscipopt.scip      import Variable
-from pyscipopt.scip      import MatrixVariable
-from pyscipopt.scip      import Constraint
-from pyscipopt.scip      import MatrixConstraint
-from pyscipopt.scip      import Benders
-from pyscipopt.scip      import Benderscut
-from pyscipopt.scip      import Branchrule
-from pyscipopt.scip      import Nodesel
-from pyscipopt.scip      import Conshdlr
-from pyscipopt.scip      import Eventhdlr
-from pyscipopt.scip      import Heur
-from pyscipopt.scip      import Presol
-from pyscipopt.scip      import Pricer
-from pyscipopt.scip      import Prop
-from pyscipopt.scip      import Reader
-from pyscipopt.scip      import Sepa
-from pyscipopt.scip      import LP
+from pyscipopt.Multidict import multidict as multidict
+from pyscipopt.scip      import Model as Model
+from pyscipopt.scip      import Variable as Variable
+from pyscipopt.scip      import MatrixVariable as MatrixVariable
+from pyscipopt.scip      import Constraint as Constraint
+from pyscipopt.scip      import MatrixConstraint as MatrixConstraint
+from pyscipopt.scip      import Benders as Benders
+from pyscipopt.scip      import Benderscut as Benderscut
+from pyscipopt.scip      import Branchrule as Branchrule
+from pyscipopt.scip      import Nodesel as Nodesel
+from pyscipopt.scip      import Conshdlr as Conshdlr
+from pyscipopt.scip      import Eventhdlr as Eventhdlr
+from pyscipopt.scip      import Heur as Heur
+from pyscipopt.scip      import Presol as Presol
+from pyscipopt.scip      import Pricer as Pricer
+from pyscipopt.scip      import Prop as Prop
+from pyscipopt.scip      import Reader as Reader
+from pyscipopt.scip      import Sepa as Sepa
+from pyscipopt.scip      import LP as LP
 from pyscipopt.scip      import PY_SCIP_LPPARAM as SCIP_LPPARAM
-from pyscipopt.scip      import readStatistics
-from pyscipopt.scip      import Expr
-from pyscipopt.scip      import MatrixExpr
-from pyscipopt.scip      import MatrixExprCons
-from pyscipopt.scip      import ExprCons
-from pyscipopt.scip      import quicksum
-from pyscipopt.scip      import quickprod
-from pyscipopt.scip      import exp
-from pyscipopt.scip      import log
-from pyscipopt.scip      import sqrt
-from pyscipopt.scip      import sin
-from pyscipopt.scip      import cos
+from pyscipopt.scip      import readStatistics as readStatistics
+from pyscipopt.scip      import Expr as Expr
+from pyscipopt.scip      import MatrixExpr as MatrixExpr
+from pyscipopt.scip      import MatrixExprCons as MatrixExprCons
+from pyscipopt.scip      import ExprCons as ExprCons
+from pyscipopt.scip      import quicksum as quicksum
+from pyscipopt.scip      import quickprod as quickprod
+from pyscipopt.scip      import exp as exp
+from pyscipopt.scip      import log as log
+from pyscipopt.scip      import sqrt as sqrt
+from pyscipopt.scip      import sin as sin
+from pyscipopt.scip      import cos as cos
 from pyscipopt.scip      import PY_SCIP_RESULT       as SCIP_RESULT
 from pyscipopt.scip      import PY_SCIP_PARAMSETTING as SCIP_PARAMSETTING
 from pyscipopt.scip      import PY_SCIP_PARAMEMPHASIS as SCIP_PARAMEMPHASIS

src/pyscipopt/_version.py

@@ -1 +1 @@
-__version__ = '5.5.0'
+__version__: str = '5.6.0'

src/pyscipopt/matrix.pxi

@@ -90,7 +90,10 @@ class MatrixExpr(np.ndarray):
 
     def __rsub__(self, other):
         return super().__rsub__(other).view(MatrixExpr)
-    
+
+    def __matmul__(self, other):
+        return super().__matmul__(other).view(MatrixExpr)
+
 class MatrixGenExpr(MatrixExpr):
     pass
 

src/pyscipopt/py.typed

@@ -1,7 +1,7 @@
 from pyscipopt import Model, quicksum
 
 
-def get_infeasible_constraints(orig_model: Model, verbose=False):
+def get_infeasible_constraints(orig_model: Model, verbose: bool = False):
     """
     Given a model, adds slack variables to all the constraints and minimizes a binary variable that indicates if they're positive.
     Positive slack variables correspond to infeasible constraints.

src/pyscipopt/recipes/infeasibilities.py

@@ -1,6 +1,6 @@
 from pyscipopt import Model
 
-def set_nonlinear_objective(model: Model, expr, sense="minimize"):
+def set_nonlinear_objective(model: Model, expr, sense: str = "minimize"):
     """
     Takes a nonlinear expression and performs an epigraph reformulation.
     """

src/pyscipopt/recipes/nonlinear.py

@@ -2509,8 +2509,8 @@ cdef class _VarArray:
         else:
             raise TypeError(f"Expected Variable or list of Variable, got {type(vars)}.")
 
-        if vars:
-            self.size = len(vars)
+        self.size = len(vars)
+        if self.size:
             self.ptr = <SCIP_VAR**> malloc(self.size * sizeof(SCIP_VAR*))
             for i, var in enumerate(vars):
                 if not isinstance(var, Variable):
@@ -11870,6 +11870,9 @@ def readStatistics(filename):
 
         seen_cons = 0
         for i, line in enumerate(data):
+            if line == "\n":
+                continue
+
             split_line = line.split(":")
             split_line[1] = split_line[1][:-1] # removing \n
             stat_name = split_line[0].strip()