Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

CHANGELOG

@@ -289,6 +289,7 @@ Build system
 - changed the default for TPI to tny
 - added build flag CHECKSTAGE=auto to control stage checks in API function calls
 - removed LPS options spx1 and spx2, only LPS=spx is available to select SoPlex now
+- removed previously deprecated PARASCIP option, use instead THREADSAFE=false to disable thread-safety
 
 ### Makefile
 
@@ -305,6 +306,8 @@ Build system
 - link-time-optimization can be enabled on Linux and macOS with gcc and clang by setting LTO=true, default is false
 - added build flag CONOPT (default: false) to link to the CONOPT NLP solver
 - LPS=spx is no longer mapped to LPS=spx2, which changes the name of the generated LPI libraries and binaries when using SoPlex
+- default settings for makefile variables in make.project are now only used if variable hasn't been set already
+- removed OPENSOURCE flag
 
 ### Cmake
 

CMakeLists.txt

@@ -88,8 +88,6 @@ option(IPOPT "should ipopt be linked" ON)
 option(LAPACK "should lapack be linked" OFF)
 option(WORHP "should worhp be linked" OFF)
 option(CONOPT "should conopt be linked" OFF)
-# for backward compatibility
-option(PARASCIP "should scip be compiled thread safe (deprecated, use THREADSAFE)" OFF)
 option(THREADSAFE "should scip be compiled thread safe" ON)
 option(LPSCHECK "double check SoPlex results with CPLEX" OFF)
 option(NOBLKBUFMEM "should block and buffer memory be disabled" OFF)
@@ -356,11 +354,6 @@ else()
     message(FATAL_ERROR "TPI option has wrong value")
 endif()
 
-# PARASCIP is deprecated, use THREADSAFE
-if(PARASCIP)
-  set(THREADSAFE ON FORCE)
-endif()
-
 #set SCIP_THREADSAFE define
 if(THREADSAFE)
     set(SCIP_THREADSAFE on)
@@ -1119,9 +1112,6 @@ if(WORHP)
     file(APPEND ${CMAKE_BINARY_DIR}/cmake.log " -DWORHP_DIR=${WORHP_DIR}")
   endif()
 endif()
-if(PARASCIP)
-  file(APPEND ${CMAKE_BINARY_DIR}/cmake.log " -DPARASCIP=on")
-endif()
 if(NOT THREADSAFE)
   file(APPEND ${CMAKE_BINARY_DIR}/cmake.log " -DTHREADSAFE=off")
 endif()

Makefile

@@ -41,31 +41,9 @@ INSTALLDIR	=
 # include make.project file
 #-----------------------------------------------------------------------------
 
-# do not use other open source projects; needs to be set before including make.project
-ifeq ($(OPENSOURCE),false)
-	override EXPRINT	=	none
-	override GMP		=	false
-	override BOOST		=	false
-	override MPFR		=	false
-	override READLINE	=	false
-	override ZLIB		=	false
-	override ZIMPL		=	false
-	override IPOPT		=	false
-	override AMPL		=	false
-endif
-
 # mark that this is a SCIP internal makefile
 SCIPINTERNAL	=	true
 
-# use THREADSAFE=true if compiled with TPI not equal to none
-ifeq ($(TPI),omp)
-	override THREADSAFE      =       true
-endif
-ifeq ($(TPI),tny)
-        override THREADSAFE      =       true
-endif
-
-
 # load default settings and detect host architecture
 include $(SCIPDIR)/make/make.project
 
@@ -82,42 +60,43 @@ MAKESOFTLINKS	=	true
 # define build flags
 #-----------------------------------------------------------------------------
 BUILDFLAGS =	" ARCH=$(ARCH)\\n\
-		CHECKSTAGE=$(CHECKSTAGE)\\n\
 		COMP=$(COMP)\\n\
+		OSTYPE=$(OSTYPE)\\n\
+		OPT=$(OPT)\\n\
+		LTO=$(LTO)\\n\
+		SANITIZE=$(SANITIZE)\\n\
+		SHARED=$(SHARED)\\n\
+		CHECKSTAGE=$(CHECKSTAGE)\\n\
 		DEBUGSOL=$(DEBUGSOL)\\n\
-		EXPRINT=$(EXPRINT)\\n\
-		GMP=$(GMP)\\n\
-		BOOST=$(BOOST)\\n\
-		MPFR=$(MPFR)\\n\
 		EXACTSOLVE=$(EXACTSOLVE)\\n\
-		IPOPTOPT=$(IPOPTOPT)\\n\
-		LAPACK=$(LAPACK)\\n\
-		LPSCHECK=$(LPSCHECK)\\n\
-		LPSOPT=$(LPSOPT)\\n\
 		NOBLKBUFMEM=$(NOBLKBUFMEM)\\n\
 		NOBLKMEM=$(NOBLKMEM)\\n\
 		NOBUFMEM=$(NOBUFMEM)\\n\
-		OPT=$(OPT)\\n\
-		LTO=$(LTO)\\n\
-		OSTYPE=$(OSTYPE)\\n\
 		THREADSAFE=$(THREADSAFE)\\n\
-		PAPILO=$(PAPILO)\\n\
-		READLINE=$(READLINE)\\n\
-		SANITIZE=$(SANITIZE)\\n\
-		SHARED=$(SHARED)\\n\
-		SYM=$(SYM)\\n\
 		USRARFLAGS=$(USRARFLAGS)\\n\
 		USRCFLAGS=$(USRCFLAGS)\\n\
 		USRCXXFLAGS=$(USRCXXFLAGS)\\n\
 		USRFLAGS=$(USRFLAGS)\\n\
 		USRLDFLAGS=$(USRLDFLAGS)\\n\
 		USROFLAGS=$(USROFLAGS)\\n\
 		VERSION=$(VERSION)\\n\
+		AMPL=$(AMPL)\\n\
+		BOOST=$(BOOST)\\n\
+		CONOPT=$(CONOPT)\\n\
+		EXPRINT=$(EXPRINT)\\n\
+		IPOPTOPT=$(IPOPTOPT)\\n\
+		GMP=$(GMP)\\n\
+		LAPACK=$(LAPACK)\\n\
+		LPSCHECK=$(LPSCHECK)\\n\
+		LPSOPT=$(LPSOPT)\\n\
+		MPFR=$(MPFR)\\n\
+		PAPILO=$(PAPILO)\\n\
+		READLINE=$(READLINE)\\n\
+		SYM=$(SYM)\\n\
 		WORHP=$(WORHP)\\n\
 		WORHPOPT=$(WORHPOPT)\\n\
 		ZIMPL=$(ZIMPL)\\n\
 		ZIMPLOPT=$(ZIMPLOPT)\\n\
-		AMPL=$(AMPL)\\n\
 		ZLIB=$(ZLIB)"
 
 #-----------------------------------------------------------------------------
@@ -1993,7 +1972,6 @@ help:
 		@echo "  - EXPRINT=<cppad|none>: Use CppAD as expressions interpreter (default) or no expressions interpreter."
 		@echo "  - SANITIZE=<false|true|thread|address|memory>: To choose type of sanitizer."
 		@echo "  - SYM=<none|bliss|nauty|sbliss|snauty|dejavu>: To choose type of symmetry handling."
-		@echo "  - PARASCIP=<true|false>: Build for ParaSCIP (deprecated, use THREADSAFE)."
 		@echo "  - THREADSAFE=<true|false>: Build thread safe."
 		@echo "  - NOBLKMEM=<true|false>: Turn off block memory or on (default)."
 		@echo "  - NOBUFMEM=<true|false>>: Turn off buffer memory or on (default)."

examples/Sudoku/Makefile

@@ -55,7 +55,6 @@ override LPSOPT 		:=$(shell echo "$(SCIPVERSION)" | sed -e 's/.* LPSOPT=\([^@]*\
 override NOBLKBUFMEM	:=$(shell echo "$(SCIPVERSION)" | sed -e 's/.* NOBLKBUFMEM=\([^@]*\).*/\1/')
 override NOBLKMEM		:=$(shell echo "$(SCIPVERSION)" | sed -e 's/.* NOBLKMEM=\([^@]*\).*/\1/')
 override NOBUFMEM		:=$(shell echo "$(SCIPVERSION)" | sed -e 's/.* NOBUFMEM=\([^@]*\).*/\1/')
-override PARASCIP		:=$(shell echo "$(SCIPVERSION)" | sed -e 's/.* PARASCIP=\([^@]*\).*/\1/')
 override READLINE		:=$(shell echo "$(SCIPVERSION)" | sed -e 's/.* READLINE=\([^@]*\).*/\1/')
 override SANITIZE		:=$(shell echo "$(SCIPVERSION)" | sed -e 's/.* SANITIZE=\([^@]*\).*/\1/')
 override ZIMPL			:=$(shell echo "$(SCIPVERSION)" | sed -e 's/.* ZIMPL=\([^@]*\).*/\1/')