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

scipopt · Apr 3, 2024 · e4d2ae5 · e4d2ae5
2 parents 1870863 + 3dc181b
commit e4d2ae5
Show file tree

Hide file tree

Showing 48 changed files with 82 additions and 75 deletions.
diff --git a/.gitlab/merge_request_templates/Code_Review.md b/.gitlab/merge_request_templates/Code_Review.md
@@ -24,6 +24,7 @@
 * [ ] The performance impact on MILP has been checked (type some of `jenkins performance {mip,mip quick,mip continue}`), **or** the changed code will not be executed for MILP instances, **or** the changed code will not be executed by default.
 * [ ] The performance impact on MINLP has been checked (type some of `jenkins performance {minlp,minlplib,minlp quick,minlp continue}`) **or** the changed code will not be executed by default.
 * [ ] The new code is sufficiently covered by tests (perhaps, new coverage settings or new unit tests have been added).
+* Consider a debug run (type some of `jenkins debug {short,minlp,mip}` (for `mip` monitor rubberband since the notification in the MR may fail)).
 
 ### Does this merge request introduce an API change? :warning:
 

diff --git a/CHANGELOG b/CHANGELOG
@@ -148,7 +148,11 @@ Build system
 
 - A file cmake.log containing the changed options is written to the cmake build directory.
 - removed replacement of the settings of RelWithDebInfo
+- add compile option -ffp-contract=off or /fp:precise to enhance reproducibility across different systems
 
+### Makefile
+
+- add flags -ffp-contract=off and /fp:precise to enhance reproducibility across different systems
 
 @section RN900 SCIP 9.0.0
 *************************

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -256,29 +256,28 @@ set(ADD_C_AND_CXX_FLAGS -pedantic -Wall -W -Wpointer-arith -Wcast-align -Wwrite-
 set(ADD_C_FLAGS -Wsign-compare -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -Wno-override-init -Wno-uninitialized -Wno-maybe-uninitialized)
 set(ADD_CXX_FLAGS -Wnon-virtual-dtor -Wreorder -Woverloaded-virtual -Wsign-promo -Wsynth -Wcast-qual -Wno-strict-overflow -Wno-psabi)
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-# clang specific suppressions
-set(ADD_C_AND_CXX_FLAGS ${ADD_C_AND_CXX_FLAGS} -Wno-unknown-warning-option)
-set(ADD_C_FLAGS ${ADD_C_FLAGS} -Wno-initializer-overrides)
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-   # for intel compilers we need to set the fp-model precise flag to disable incorrect floating point optimizations
-   add_compile_options(-fp-model precise)
-   # to prevent symbols from svml exported twice we use the -shared-intel flag, see https://git.zib.de/integer/scip/issues/2872
-   # this happens with the cplex static lib
-   if(LPS MATCHES "cpx")
-       add_compile_options(-shared-intel) # for c and cxx
-   endif()
+# disable fused floating point contraction to enhance reproducibility across compilers and architectures
+if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    add_compile_options(/fp:precise)
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+    add_compile_options(-fp-model=precise)
+    # to prevent symbols from svml exported twice we use the -shared-intel flag, see https://git.zib.de/integer/scip/issues/2872
+    # this happens with the cplex static lib
+    if(LPS MATCHES "cpx")
+        add_compile_options(-shared-intel) # for c and cxx
+    endif()
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     # require at least gcc 4.8
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
         message(WARNING "GCC version not supported, should be at least 4.8!")
     endif()
-    add_compile_options(${ADD_C_AND_CXX_FLAGS})
+    add_compile_options(-ffp-contract=off ${ADD_C_AND_CXX_FLAGS})
     add_compile_options("$<$<COMPILE_LANGUAGE:C>:${ADD_C_FLAGS}>$<$<COMPILE_LANGUAGE:CXX>:${ADD_CXX_FLAGS}>")
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options(${ADD_C_AND_CXX_FLAGS})
+    # clang specific suppressions
+    set(ADD_C_AND_CXX_FLAGS ${ADD_C_AND_CXX_FLAGS} -Wno-unknown-warning-option)
+    set(ADD_C_FLAGS ${ADD_C_FLAGS} -Wno-initializer-overrides)
+    add_compile_options(-ffp-contract=off ${ADD_C_AND_CXX_FLAGS})
     add_compile_options("$<$<COMPILE_LANGUAGE:C>:${ADD_C_FLAGS}>$<$<COMPILE_LANGUAGE:CXX>:${ADD_CXX_FLAGS}>")
 endif()
 

diff --git a/make/make.cygwin.x86.gnu.dbg b/make/make.cygwin.x86.gnu.dbg
@@ -1,5 +1,5 @@
 FLAGS		+=      #-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g
+OFLAGS		+=	-O0 -ffp-contract=off -g
 CFLAGS		+=	$(GCCWARN)
 CXXFLAGS	+=	$(GXXWARN)
 ARFLAGS		=	crs

diff --git a/make/make.cygwin.x86.gnu.opt b/make/make.cygwin.x86.gnu.opt
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG #-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -mtune=native -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -mtune=native -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes -Wno-char-subscripts
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.cygwin.x86.gnu.opt-gccold b/make/make.cygwin.x86.gnu.opt-gccold
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG #-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.cygwin.x86_64.gnu.dbg b/make/make.cygwin.x86_64.gnu.dbg
@@ -1,5 +1,5 @@
 FLAGS		+=      #-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g
+OFLAGS		+=	-O0 -ffp-contract=off -g
 CFLAGS		+=	$(GCCWARN) -m64
 CXXFLAGS	+=	$(GXXWARN) -m64
 ARFLAGS		=	crs

diff --git a/make/make.cygwin.x86_64.gnu.opt b/make/make.cygwin.x86_64.gnu.opt
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG #-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -mtune=native -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -mtune=native -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -m64 -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes -Wno-char-subscripts
 CXXFLAGS	+=	$(GXXWARN) -m64 -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.cygwin.x86_64.gnu.opt-gccold b/make/make.cygwin.x86_64.gnu.opt-gccold
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG #-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -m64 -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -m64 -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.darwin.clang b/make/make.darwin.clang
@@ -9,7 +9,8 @@ GMP_FLAGS	=
 GMP_LDFLAGS 	=	-lgmp
 READLINE_FLAGS	=
 READLINE_LDFLAGS=	-lreadline -lncurses
-CFLAGS		=	-std=c99 -D_XOPEN_SOURCE=600
+CFLAGS		=	-ffp-contract=off -std=c99 -D_XOPEN_SOURCE=600
+CXXFLAGS	=	-ffp-contract=off
 
 # GCC and CLANG warning flags are not all equal; so disable warnings about unknown warnings
 GCCWARN += -Wno-unknown-warning-option

diff --git a/make/make.darwin.gnu b/make/make.darwin.gnu
@@ -17,8 +17,8 @@ FLAGS		+=	-fPIC
 endif
 LINK_shared		=	-shared
 
-CXXFLAGS	=	-fno-stack-check
-CFLAGS		=	-std=c99 -fno-stack-check -D_XOPEN_SOURCE=600
+CXXFLAGS	=	-ffp-contract=off -fno-stack-check
+CFLAGS		=	-ffp-contract=off -std=c99 -fno-stack-check -D_XOPEN_SOURCE=600
 
 FORTRANLIBS	=	-lgfortran
 FORTRAN_NAMING_CONVENTION = LCASE_DECOR
diff --git a/make/make.darwin.x86.intel.dbg b/make/make.darwin.x86.intel.dbg
@@ -3,7 +3,7 @@ CXX		=	icc -Kc++
 LINKCC		=	icc
 LINKCXX		=	icc -Kc++
 FLAGS		+=	-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g -fp-model precise -w1 -fp-stack-check -wd279,383,444,810,981
+OFLAGS		+=	-O0 -fp-model=precise -g -w1 -fp-stack-check -wd279,383,444,810,981
 CFLAGS		+=	-std=c99 -D_XOPEN_SOURCE=600
 ARFLAGS		=	crs
 LDFLAGS		+=	-lirc -lpthread -lm -lstdc++ -Bstatic

diff --git a/make/make.darwin.x86.intel.opt b/make/make.darwin.x86.intel.opt
@@ -3,7 +3,7 @@ CXX		=	icc -Kc++
 LINKCC		=	icc
 LINKCXX		=	icc -Kc++
 FLAGS		+=	-DNDEBUG -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O2 -fp-model precise -mtune=native -w1 -ip
+OFLAGS		+=	-O2 -fp-model=precise -mtune=native -w1 -ip
 CFLAGS		+=	-std=c99 -D_XOPEN_SOURCE=600
 ARFLAGS		=	crs
 LDFLAGS		+=	-lirc -lpthread -lm -lstdc++ -Bstatic

diff --git a/make/make.darwin.x86_64.intel.dbg b/make/make.darwin.x86_64.intel.dbg
@@ -3,7 +3,7 @@ CXX		=	icc -Kc++
 LINKCC		=	icc
 LINKCXX		=	icc -Kc++
 FLAGS		+=	-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -fp-model precise -g -w1 -fp-stack-check -wd279,383,444,810,981
+OFLAGS		+=	-O0 -fp-model=precise -g -w1 -fp-stack-check -wd279,383,444,810,981
 CFLAGS		+=	-std=c99 -D_XOPEN_SOURCE=600
 ARFLAGS		=	crs
 LDFLAGS		+=	-lirc -lm -lstdc++ -Bstatic

diff --git a/make/make.darwin.x86_64.intel.opt b/make/make.darwin.x86_64.intel.opt
@@ -3,7 +3,7 @@ CXX		=	icc -Kc++
 LINKCC		=	icc
 LINKCXX		=	icc -Kc++
 FLAGS		+=	-DNDEBUG -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O2 -fp-model precise -mtune=native -w1 -ip
+OFLAGS		+=	-O2 -fp-model=precise -mtune=native -w1 -ip
 CFLAGS		+=	-std=c99 -D_XOPEN_SOURCE=600
 ARFLAGS		=	crs
 LDFLAGS		+=	-lirc -lpthread -lm -lstdc++ -Bstatic

diff --git a/make/make.freebsd.x86.gnu.opt b/make/make.freebsd.x86.gnu.opt
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG -DSCIP_ROUNDING_FE
-OFLAGS		+=	-I/usr/local/include -O3 -mtune=native -fomit-frame-pointer
+OFLAGS		+=	-I/usr/local/include -O3 -ffp-contract=off -mtune=native -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.freebsd.x86.gnu.opt-gccold b/make/make.freebsd.x86.gnu.opt-gccold
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG -DSCIP_ROUNDING_FE
-OFLAGS		+=	-I/usr/local/include -O3 -fomit-frame-pointer
+OFLAGS		+=	-I/usr/local/include -O3 -ffp-contract=off -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.freebsd.x86_64.gnu.opt b/make/make.freebsd.x86_64.gnu.opt
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG -DSCIP_ROUNDING_FE
-OFLAGS		+=	-I/usr/local/include -O3 -mtune=native -fomit-frame-pointer
+OFLAGS		+=	-I/usr/local/include -O3 -ffp-contract=off -mtune=native -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.freebsd.x86_64.gnu.opt-gccold b/make/make.freebsd.x86_64.gnu.opt-gccold
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG
-OFLAGS		+=	-I/usr/local/include -O3 -fomit-frame-pointer
+OFLAGS		+=	-I/usr/local/include -O3 -ffp-contract=off -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.linux.clang b/make/make.linux.clang
@@ -9,7 +9,8 @@ GMP_FLAGS	=
 GMP_LDFLAGS 	=	-lgmp
 READLINE_FLAGS	=
 READLINE_LDFLAGS=	-lreadline -lncurses
-CFLAGS		=	-std=c99 -D_XOPEN_SOURCE=600
+CFLAGS		=	-ffp-contract=off -std=c99 -D_XOPEN_SOURCE=600
+CXXFLAGS	=	-ffp-contract=off
 
 # GCC and CLANG warning flags are not all equal; so disable warnings about unknown warnings
 GCCWARN += -Wno-unknown-warning-option

diff --git a/make/make.linux.gnu b/make/make.linux.gnu
@@ -8,7 +8,8 @@ GMP_FLAGS	=
 GMP_LDFLAGS 	=	-lgmp
 READLINE_FLAGS	=
 READLINE_LDFLAGS=	-lreadline -lncurses
-CFLAGS		=	-std=c99 -D_XOPEN_SOURCE=600
+CFLAGS		=	-ffp-contract=off -std=c99 -D_XOPEN_SOURCE=600
+CXXFLAGS	=	-ffp-contract=off
 FORTRANLIBS	=	-lgfortran
 FORTRAN_NAMING_CONVENTION = LCASE_DECOR
 ifeq ($(SHARED),true)

diff --git a/make/make.linux.x86.intel.dbg b/make/make.linux.x86.intel.dbg
@@ -3,7 +3,7 @@ CXX		=	icpc
 LINKCC		=	icc
 LINKCXX		=	icpc
 FLAGS		+=	-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g -fp-model precise -w1 -fp_port -fp-stack-check -wd279,383,444,810,981
+OFLAGS		+=	-O0 -fp-model=precise -g -w1 -fp_port -fp-stack-check -wd279,383,444,810,981
 CFLAGS		+=	-std=c99 -D_XOPEN_SOURCE=600
 ARFLAGS		=	crs
 LDFLAGS		+=	-lirc -lm -lstdc++ -shared-intel

diff --git a/make/make.linux.x86.intel.opt b/make/make.linux.x86.intel.opt
@@ -3,7 +3,7 @@ CXX		=	icpc
 LINKCC		=	icc
 LINKCXX		=	icpc
 FLAGS		+=	-DNDEBUG -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O2 -fp-model precise -w1 -ip -mtune=native
+OFLAGS		+=	-O2 -fp-model=precise -w1 -ip -mtune=native
 CFLAGS		+=	-std=c99 -D_XOPEN_SOURCE=600
 ARFLAGS		=	crs
 LDFLAGS		+=	-lirc -lpthread -lm -lstdc++ -shared-intel

diff --git a/make/make.linux.x86_64.intel.dbg b/make/make.linux.x86_64.intel.dbg
@@ -3,7 +3,7 @@ CXX		=	icpc
 LINKCC		=	icc
 LINKCXX		=	icpc
 FLAGS		+=	-DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g -fp-model precise -w1 -wd279,383,444,810,981
+OFLAGS		+=	-O0 -fp-model=precise -g -w1 -wd279,383,444,810,981
 CFLAGS		+=	-std=c99 -D_XOPEN_SOURCE=600
 ARFLAGS		=	crs
 LDFLAGS		+=	-lirc -lpthread -lm -lstdc++ -shared-intel

diff --git a/make/make.linux.x86_64.intel.opt b/make/make.linux.x86_64.intel.opt
@@ -3,7 +3,7 @@ CXX		=	icpc
 LINKCC		=	icc
 LINKCXX		=	icpc
 FLAGS		+=	-DNDEBUG -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O2 -fp-model precise -w1 -ip -mtune=native
+OFLAGS		+=	-O2 -fp-model=precise -w1 -ip -mtune=native
 CFLAGS		+=	-std=c99 -D_XOPEN_SOURCE=600
 ARFLAGS		=	crs
 LDFLAGS		+=	-lirc -lpthread -lm -lstdc++ -shared-intel

diff --git a/make/make.mingw.x86.gnu.dbg b/make/make.mingw.x86.gnu.dbg
@@ -1,5 +1,5 @@
 FLAGS		+=	-DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNO_STRERROR_R -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g
+OFLAGS		+=	-O0 -ffp-contract=off -g
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.mingw.x86.gnu.opt b/make/make.mingw.x86.gnu.opt
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG -DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNO_STRERROR_R -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -mtune=native -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -mtune=native -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.mingw.x86.gnu.opt-gccold b/make/make.mingw.x86.gnu.opt-gccold
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG -DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNO_STRERROR_R -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.mingw.x86.intel.dbg b/make/make.mingw.x86.intel.dbg
@@ -12,7 +12,7 @@ LINKCXX_l	=	lib
 LINKCXX_o	=	-out:
 LINK_shared		=	-dll
 FLAGS		+=	-DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNO_STRERROR_R -DSCIP_ROUNDING_MS -D_CRT_SECURE_NO_WARNINGS
-OFLAGS		+=
+OFLAGS		+=	-fp:precise
 CFLAGS		+=	-Zi
 CXX11FLAG	=	-Qstd=c++0x
 CXX14FLAG	=	-Qstd=c++14

diff --git a/make/make.mingw.x86.intel.opt b/make/make.mingw.x86.intel.opt
@@ -12,12 +12,12 @@ LINKCXX_l	=	lib
 LINKCXX_o	=	-out:
 LINK_shared		=	-dll
 FLAGS	+=	-DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNDEBUG -DNO_STRERROR_R -DSCIP_ROUNDING_MS -D_CRT_SECURE_NO_WARNINGS
-OFLAGS	+=	
-CFLAGS	+=	-O2 -fp:extended
+OFLAGS		+=	-O2 -fp:precise
+CFLAGS		+=
 CXX11FLAG	=	-Qstd=c++0x
 CXX14FLAG	=	-Qstd=c++14
 CXX17FLAG	=	-Qstd=c++17
-CXXFLAGS	+=	-O2 -fp:extended -EHsc -GR
+CXXFLAGS	+=	-EHsc -GR
 DFLAGS =
 LDFLAGS		+=
 LINKRPATH =

diff --git a/make/make.mingw.x86.msvc.dbg b/make/make.mingw.x86.msvc.dbg
@@ -12,7 +12,7 @@ LINKCXX_l	=	lib
 LINKCXX_o	=	-out:
 LINK_shared		=	-dll
 FLAGS		+=	-DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNO_STRERROR_R -DSCIP_ROUNDING_MS -D_CRT_SECURE_NO_WARNINGS -wd4274
-OFLAGS		+=
+OFLAGS		+=	-fp:precise
 CFLAGS		+=	-Zi
 CXXFLAGS	+=	-Zi -EHsc -GR
 CXX11FLAG	=

diff --git a/make/make.mingw.x86.msvc.opt b/make/make.mingw.x86.msvc.opt
@@ -12,9 +12,9 @@ LINKCXX_l	=	lib
 LINKCXX_o	=	-out:
 LINK_shared		=	-dll
 FLAGS	+=	-DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNDEBUG -DNO_STRERROR_R -DSCIP_ROUNDING_MS -D_CRT_SECURE_NO_WARNINGS -wd4274
-OFLAGS	+=	
-CFLAGS	+=	-Ox -Oi -fp:precise
-CXXFLAGS	+=	-Ox -Oi -fp:precise -EHsc -GR
+OFLAGS		+=	-Ox -Oi -fp:precise
+CFLAGS		+=
+CXXFLAGS	+=	-EHsc -GR
 CXX11FLAG	=
 CXX14FLAG	=	-std:c++14
 # C++-17 may not be available:

diff --git a/make/make.mingw.x86_64.msvc.dbg b/make/make.mingw.x86_64.msvc.dbg
@@ -12,9 +12,9 @@ LINKCXX_l	=	lib
 LINKCXX_o	=	-out:
 LINK_shared		=	-dll
 FLAGS	+=	-DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNDEBUG -DNO_STRERROR_R -DSCIP_ROUNDING_MS -D_CRT_SECURE_NO_WARNINGS -wd4274 -D_WIN64
-OFLAGS	+=	
-CFLAGS	+=	-Zi -Od -fp:precise
-CXXFLAGS	+=	-Zi -Od -fp:precise -EHsc -GR
+OFLAGS		+=	-Od -fp:precise
+CFLAGS		+=	-Zi
+CXXFLAGS	+=	-Zi -EHsc -GR
 CXX11FLAG	=
 CXX14FLAG	=	-std:c++14
 # C++-17 may not be available:

diff --git a/make/make.mingw.x86_64.msvc.opt b/make/make.mingw.x86_64.msvc.opt
@@ -12,9 +12,9 @@ LINKCXX_l	=	lib
 LINKCXX_o	=	-out:
 LINK_shared		=	-dll
 FLAGS	+=	-DSCIP_NO_SIGACTION -DNO_RAND_R -DSCIP_NO_STRTOK_R -DNDEBUG -DNO_STRERROR_R -DSCIP_ROUNDING_MS -D_CRT_SECURE_NO_WARNINGS -wd4274 -D_WIN64
-OFLAGS	+=	
-CFLAGS	+=	-Ox -Oi -fp:precise
-CXXFLAGS	+=	-Ox -Oi -fp:precise -EHsc -GR
+OFLAGS		+=	-Ox -Oi -fp:precise
+CFLAGS		+=
+CXXFLAGS	+=	-EHsc -GR
 CXX11FLAG	=
 CXX14FLAG	=	-std:c++14
 # C++-17 may not be available:

diff --git a/make/make.project b/make/make.project
@@ -739,9 +739,9 @@ OBJSCIPLIBSHORTLINK=	$(SCIPREALPATH)/lib/$(LIBTYPE)/lib$(OBJSCIPLIBNAME).$(LIBEX
 # link SCIP for C projects
 LINKCXXSCIPALL	=	$(LINKCXX_L)$(SCIPREALPATH)/lib/$(LIBTYPE) $(LINKCXX_l)$(SCIPLIBBASE)$(LINKLIBSUFFIX) \
 			$(LINKCXX_l)$(OBJSCIPLIB)$(LINKLIBSUFFIX) $(LINKCXX_l)$(LPILIB)$(LINKLIBSUFFIX) \
-			$(LINKCC_l)$(TPILIB)$(LINKLIBSUFFIX) $(OFLAGS) $(LPSLDFLAGS) $(TPILDFLAGS) $(LDFLAGS)
+			$(LINKCC_l)$(TPILIB)$(LINKLIBSUFFIX) $(LPSLDFLAGS) $(TPILDFLAGS) $(LDFLAGS)
 
 # link SCIP for C++ projects (including libobjscip)
 LINKCCSCIPALL	=	$(LINKCC_L)$(SCIPREALPATH)/lib/$(LIBTYPE) $(LINKCC_l)$(SCIPLIBBASE)$(LINKLIBSUFFIX) \
 			$(LINKCC_l)$(OBJSCIPLIB)$(LINKLIBSUFFIX) $(LINKCC_l)$(LPILIB)$(LINKLIBSUFFIX) \
-			$(LINKCC_l)$(TPILIB)$(LINKLIBSUFFIX) $(OFLAGS) $(LPSLDFLAGS) $(TPILDFLAGS) $(LDFLAGS)
+			$(LINKCC_l)$(TPILIB)$(LINKLIBSUFFIX) $(LPSLDFLAGS) $(TPILDFLAGS) $(LDFLAGS)
diff --git a/make/make.sunos.sparc.gnu.dbg b/make/make.sunos.sparc.gnu.dbg
@@ -1,5 +1,5 @@
 FLAGS		+=      -DNO_STRERROR_R -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g
+OFLAGS		+=	-O0 -ffp-contract=off -g
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.sunos.sparc.gnu.opt b/make/make.sunos.sparc.gnu.opt
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNO_STRERROR_R -DNDEBUG -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -mcpu=ultrasparc -mtune=ultrasparc -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -mcpu=ultrasparc -mtune=ultrasparc -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.sunos.x86.gnu.dbg b/make/make.sunos.x86.gnu.dbg
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNO_STRERROR_R -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g
+OFLAGS		+=	-O0 -ffp-contract=off -g
 CFLAGS		+=	$(GCCWARN) -funit-at-a-time
 CXXFLAGS	+=	$(GXXWARN) -funit-at-a-time
 ARFLAGS		=	crs

diff --git a/make/make.sunos.x86.gnu.opt b/make/make.sunos.x86.gnu.opt
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG -DNO_STRERROR_R -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -mtune=native -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -mtune=native -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.sunos.x86.gnu.opt-gccold b/make/make.sunos.x86.gnu.opt-gccold
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNDEBUG -DNO_STRERROR_R -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O3 -fomit-frame-pointer
+OFLAGS		+=	-O3 -ffp-contract=off -fomit-frame-pointer
 CFLAGS		+=	$(GCCWARN) -Wno-strict-aliasing -Wno-missing-declarations -Wno-missing-prototypes
 CXXFLAGS	+=	$(GXXWARN) -Wno-strict-aliasing
 ARFLAGS		=	crs

diff --git a/make/make.sunos.x86_64.gnu.dbg b/make/make.sunos.x86_64.gnu.dbg
@@ -1,5 +1,5 @@
 FLAGS		+=	-DNO_STRERROR_R -DSCIP_ROUNDING_FE
-OFLAGS		+=	-O0 -g -m64
+OFLAGS		+=	-m64 -O0 -ffp-contract=off -g
 CFLAGS		+=	$(GCCWARN) -funit-at-a-time
 CXXFLAGS	+=	$(GXXWARN) -funit-at-a-time
 ARFLAGS		=	crs