change scip to scipmp (#206)

* init scip solver driver * minimal driver * add basic functionalities * fix primal solution * change getPROBDATA to cons * change getPROBDATA v2 * fix test * add indicator constraint LinLE * add indicator constraint LinGE * add indicator constraint LinEQ * change indicator constraint to recommended * add or, and constraint * handle char and bool param * add more options * improve readme and changes * disable sepa of indicator cons * improve memory handling * add linearHelper method * add indicator helper method * add quadratic helper method * add pool solution * add abs, sin and cosfunctions * add exp and log function * add pow function * add more options and concurrent mode * improve tests * add more options * add last options * adapt mipstart header * Update CHANGES.scip.md * add option to x-multimip1 * change cmake * add variable names * change scip to scipmp * change cmake * add docu * add scipmp test * delete scip
ampl · May 3, 2023 · 52500d3 · 52500d3
1 parent 307075e
commit 52500d3
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 12 deletions.
diff --git a/doc/rst/intro.rst b/doc/rst/intro.rst
@@ -113,6 +113,18 @@ does not have automatic dependency detection), you can use the following::
            -DCOPT_LIBS=d:/copt/libs/win64/copt.lib
            -DCOPT_INCLUDE_DIRS=d:/copt/include
 
+To build the solver *scipmp* statically (on Linux or MacOS), you need to make sure
+to add all its dependencies. The following cmake command builds *scipmp* assuming 
+that it is installed with the LP solver SoPlex, the arithmetic library GMP and 
+the library bliss for symmetry detection (*SCIP* and its dependencies are all 
+installed in the standard location)::
+
+  cmake .. -DBUILD=scipmp
+           -DSCIP_LIBS="/usr/local/lib/libscip.a;/usr/local/lib/libsoplex.a;/usr/local/lib/libgmp.a;/usr/local/lib/libbliss.a"
+           -DSCIP_INCLUDE_DIRS=/usr/local/include
+
+Note: Any other dependency can be used in the same way.
+
 Similarly, for *ortoolsmp* (on MacOS) assuming *ortools* is installed in
 the standard location::
 

diff --git a/solvers/CMakeLists.txt b/solvers/CMakeLists.txt
@@ -246,7 +246,7 @@ add_ampl_backend(cbcmp DLL_RUNTIME SHARED_LIB MODULE CBC
   LIBRARIES ${CBC_LIBS} ${CMAKE_DL_LIBS})
 
 
-add_ampl_backend(scip DLL_RUNTIME SHARED_LIB MODULE SCIP 
+add_ampl_backend(scipmp DLL_RUNTIME SHARED_LIB MODULE SCIP 
   LIBRARIES ${SCIP_LIBS} ${CMAKE_DL_LIBS})
 
 add_ampl_backend(highsmp DLL_RUNTIME SHARED_LIB MODULE HIGHS 

diff --git a/solvers/scip/CHANGES.scip.md → solvers/scipmp/CHANGES.scipmp.md b/solvers/scip/CHANGES.scip.md → solvers/scipmp/CHANGES.scipmp.md
diff --git a/solvers/scip/README.scip.txt → solvers/scipmp/README.scipmp.txt b/solvers/scip/README.scip.txt → solvers/scipmp/README.scipmp.txt
diff --git a/solvers/scip/main.cc → solvers/scipmp/main.cc b/solvers/scip/main.cc → solvers/scipmp/main.cc
@@ -3,7 +3,7 @@
 /// Declare a backend factory
 std::unique_ptr<mp::BasicBackend> CreateScipBackend();
 
-extern "C" int main1(int, char **argv) {
+int main(int, char **argv) {
   return
       mp::RunBackendApp(argv, CreateScipBackend);
 }
diff --git a/solvers/scip/model-mgr-with-std-pb.cc → solvers/scipmp/model-mgr-with-std-pb.cc b/solvers/scip/model-mgr-with-std-pb.cc → solvers/scipmp/model-mgr-with-std-pb.cc
diff --git a/solvers/scip/scip-ampls-c-api.h → solvers/scipmp/scipmp-ampls-c-api.h b/solvers/scip/scip-ampls-c-api.h → solvers/scipmp/scipmp-ampls-c-api.h
diff --git a/solvers/scip/scip-lib.c → solvers/scipmp/scipmp-lib.c b/solvers/scip/scip-lib.c → solvers/scipmp/scipmp-lib.c
@@ -1,4 +1,4 @@
-#include "scip/scip-ampls-c-api.h"
+#include "scipmp/scipmp-ampls-c-api.h"
 
 #ifdef _WIN32
 #define APIEXPORT __declspec(dllexport)

diff --git a/solvers/scip/scip-modelapi-connect.cc → solvers/scipmp/scipmp-modelapi-connect.cc b/solvers/scip/scip-modelapi-connect.cc → solvers/scipmp/scipmp-modelapi-connect.cc
@@ -1,7 +1,7 @@
 #include "mp/flat/redef/MIP/converter_mip.h"
 #include "mp/flat/model_api_connect.h"
 
-#include "scipmodelapi.h"
+#include "scipmpmodelapi.h"
 
 
 namespace mp {

diff --git a/solvers/scip/scipbackend.cc → solvers/scipmp/scipmpbackend.cc b/solvers/scip/scipbackend.cc → solvers/scipmp/scipmpbackend.cc
@@ -4,10 +4,10 @@
 
 #include "mp/env.h"
 #include "mp/flat/model_api_base.h"
-#include "scipbackend.h"
+#include "scipmpbackend.h"
 
 extern "C" {
-  #include "scip-ampls-c-api.h"    // Scip AMPLS C API
+  #include "scipmp-ampls-c-api.h"    // Scip AMPLS C API
 }
 #include "mp/ampls-cpp-api.h"
 

diff --git a/solvers/scip/scipbackend.h → solvers/scipmp/scipmpbackend.h b/solvers/scip/scipbackend.h → solvers/scipmp/scipmpbackend.h
@@ -5,7 +5,7 @@
 
 #include "mp/backend-mip.h"
 #include "mp/flat/backend_flat.h"
-#include "scipcommon.h"
+#include "scipmpcommon.h"
 
 namespace mp {
 

diff --git a/solvers/scip/scipcommon.cc → solvers/scipmp/scipmpcommon.cc b/solvers/scip/scipcommon.cc → solvers/scipmp/scipmpcommon.cc
@@ -1,5 +1,5 @@
 #include "mp/format.h"
-#include "scipcommon.h"
+#include "scipmpcommon.h"
 
 static
 SCIP_DECL_PROBDELORIG(probdataDelOrigNl)

diff --git a/solvers/scip/scipcommon.h → solvers/scipmp/scipmpcommon.h b/solvers/scip/scipcommon.h → solvers/scipmp/scipmpcommon.h
diff --git a/solvers/scip/scipmodelapi.cc → solvers/scipmp/scipmpmodelapi.cc b/solvers/scip/scipmodelapi.cc → solvers/scipmp/scipmpmodelapi.cc
@@ -1,4 +1,4 @@
-#include "scipmodelapi.h"
+#include "scipmpmodelapi.h"
 
 namespace mp {
 
@@ -28,8 +28,10 @@ void ScipModelAPI::AddVariables(const VarArrayDef& v) {
       vartype = SCIP_VARTYPE_INTEGER;
     else
       vartype = SCIP_VARTYPE_CONTINUOUS;
-    //const char* name = v.pnames()[i];
-    SCIP_CCALL( SCIPcreateVarBasic(getSCIP(), &var, NULL, lb, ub, objcoef, vartype) );
+    const char* name = NULL;
+    if (v.pnames() != NULL)
+      const char* name = v.pnames()[i];
+    SCIP_CCALL( SCIPcreateVarBasic(getSCIP(), &var, name, lb, ub, objcoef, vartype) );
     SCIP_CCALL( SCIPaddVar(getSCIP(), var) );
     getPROBDATA()->vars[i] = var;
   }

diff --git a/solvers/scip/scipmodelapi.h → solvers/scipmp/scipmpmodelapi.h b/solvers/scip/scipmodelapi.h → solvers/scipmp/scipmpmodelapi.h
@@ -4,7 +4,7 @@
 #include <memory>
 
 #include "mp/env.h"
-#include "scipcommon.h"
+#include "scipmpcommon.h"
 #include "mp/flat/model_api_base.h"
 #include "mp/flat/constr_std.h"
 

diff --git a/test/end2end/scripts/python/SolverCollection.py b/test/end2end/scripts/python/SolverCollection.py
@@ -42,6 +42,7 @@ def addStdSolvers(solvers: SolverCollection, binPath=""):
     solvers.addSolver(Solver.MosekSolver(path.join(binPath,"mosek")))
     solvers.addSolver(Solver.CbcMPSolver(path.join(binPath, "cbc")))
     solvers.addSolver(Solver.SCIPSolver(path.join(binPath, "scip")))
+    solvers.addSolver(Solver.SCIPSolver(path.join(binPath, "scipmp")))
     solvers.addSolver(Solver.CPLEXODHSolver(path.join(binPath, "cplexodh")))
     solvers.addSolver(Solver.GUROBIODHSolver(path.join(binPath, "gurobiodh")))