Merge remote-tracking branch 'origin/v91-bugfix' into v9-minor

CHANGELOG

@@ -56,6 +56,7 @@ Fixed bugs
 - compare coefficient scales to detect parallelism to avoid integral relaxations in detectRedundantConstraints() of cons_linear.c
 - remove coefficient information from linear constraint hashes in order to compare keys with tolerances
 - fixed NULL pointer dereference in SCIPtpiGetNumThreads() of TinyCThread interface if called before SCIPtpiInit(); now returns 0 in this case
+- calling SCIPsolveConcurrent() when SCIP was compiled without a TPI now results in a plugin-not-found error
 
 Performance improvements
 ------------------------
@@ -3102,7 +3103,6 @@ Interface changes
 
 - Misc:
   - changed return type of SCIPcliqueGetId() from `int` to `unsigned int`
-  - SCIPsolveParallel() is deprecated; use SCIPsolveConcurrent() instead
   - removed SCIPvarGetCliqueComponentIdx(); the connectedness information of the clique table is now stored as a
     `SCIP_DISJOINTSET` member of the clique table and cannot be publicly accessed
   - added parameter `copytables` to SCIPcopyPlugins()

make/make.project

@@ -518,8 +518,10 @@ TPILDFLAGS  	=	-openmp$(LINKLIBSUFFIX)
 endif
 else ifeq ($(TPI),tny)
 TPICFLAGS	=
+ifneq ($(COMP),msvc)
 TPILDFLAGS  	=	-lpthread
 endif
+endif
 
 TPILIB		=	$(TPILIBNAME).$(BASE)
 TPILIBFILE	=	$(SCIPREALPATH)/lib/$(LIBTYPE)/lib$(TPILIB).$(LIBEXT)

src/scip/dialog_default.c

@@ -2147,7 +2147,7 @@ SCIP_DECL_DIALOGEXEC(SCIPdialogExecConcurrentOpt)
    case SCIP_STAGE_PRESOLVING:
    case SCIP_STAGE_PRESOLVED:
    case SCIP_STAGE_SOLVING:
-      SCIP_CALL( SCIPsolveParallel(scip) );
+      SCIP_CALL( SCIPsolveConcurrent(scip) );
       break;
 
    case SCIP_STAGE_SOLVED:

src/scip/scip_solve.c

@@ -2862,8 +2862,8 @@ SCIP_RETCODE SCIPsolveConcurrent(
    )
 {
 #ifdef TPI_NONE
-   SCIPinfoMessage(scip, NULL, "SCIP was compiled without task processing interface. Parallel solve not possible\n");
-   return SCIP_OKAY;
+   SCIPerrorMessage("SCIP was compiled without task processing interface. Concurrent solve not possible\n");
+   return SCIP_PLUGINNOTFOUND;
 #else
    SCIP_RETCODE     retcode;
    int              i;

src/scip/scip_solve.h

@@ -161,6 +161,7 @@ SCIP_RETCODE SCIPsolve(
  *
  *  @deprecated Please use SCIPsolveConcurrent() instead.
  */
+SCIP_DEPRECATED
 SCIP_EXPORT
 SCIP_RETCODE SCIPsolveParallel(
    SCIP*                 scip                /**< SCIP data structure */