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

Author: scip-ci

CHANGELOG

@@ -134,6 +134,7 @@ Fixed bugs
 - fix possible segmentation fault when resetting local and global bounds of original variables after abnormal termination
 - 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
 
 Performance improvements
 ------------------------

check/run.sh

@@ -75,7 +75,13 @@ OPTHOST=$(uname -n | sed 's/.zib.de//g' | sed 's/portal//g' | tr -cd '[:alpha:]'
 
 # file on optimi to check for
 case "$OPTHOST" in
-  opt | optc ) OPTIMIFILE=/nfs/optimi/QUOTAS ;;
+  opt | optc )
+    . /etc/os-release
+    case "$ID" in
+      debian ) OPTIMIFILE=/data/optimi/optimi/QUOTAS ;;
+      ubuntu ) OPTIMIFILE=/nfs/optimi/QUOTAS ;;
+    esac
+    ;;
   htccmp     ) OPTIMIFILE=/data/optimi/optimi/QUOTAS ;;
 esac
 

check/run_fscip.sh

@@ -89,8 +89,20 @@ OPTHOST=$(uname -n | sed 's/.zib.de//g' | sed 's/portal//g' | tr -cd '[:alpha:]'
 # check if the scripts runs a *.zib.de host
 if $(hostname -f | grep -q zib.de) && $([[ "${OPTHOST}" == "opt" ]] || [[ "${OPTHOST}" == "optc" ]]);
 then
+    # file on optimi to check for
+    case "$OPTHOST" in
+      opt | optc )
+        . /etc/os-release
+        case "$ID" in
+          debian ) OPTIMIFILE=/data/optimi/optimi/QUOTAS ;;
+          ubuntu ) OPTIMIFILE=/nfs/optimi/QUOTAS ;;
+        esac
+        ;;
+      htccmp     ) OPTIMIFILE=/data/optimi/optimi/QUOTAS ;;
+    esac
+
     # access /optimi once to force a mount
-    ls /nfs/optimi/QUOTAS >/dev/null 2>&1
+    ls $OPTIMIFILE >/dev/null 2>&1
 
     # check if /optimi is mounted
     MOUNTED=0
@@ -106,7 +118,7 @@ then
             exit 1
         fi
 
-        if [ -f /nfs/optimi/QUOTAS ]
+        if [ -f $OPTIMIFILE ]
         then
             MOUNTED=1
         else

doc/inc/faq/faqtext.txt

@@ -216,8 +216,8 @@ SECTION: General Questions about SCIP
         SCIP supports nonlinear constraints of the form lhs ≤ f(x) ≤ rhs, where the function f(x) is an algebraic
         expression that can be represented as expression tree. Such an expression tree has constants and variables as terminal
         nodes and operands as non-terminal nodes.
-        Expression operands supported by SCIP include addition, subtraction, multiplication, division, exponentiation and
-        logarithm. Trigonometric functions are not yet supported by SCIP.
+        Expression operands supported by SCIP include addition, subtraction, multiplication, division, exponentiation,
+        logarithm, sine and cosine.
     </p>
     <p>
         Nonlinear objective functions are not supported by SCIP and must be modeled as constraint function.

make/local/make.opt

@@ -26,7 +26,6 @@
 QUEUETYPE	=	srun
 QUEUE		= mip-dbg
 PPN 		=	-1
-CLIENTTMPDIR	=	/local/tmp
 NOWAITCLUSTER   =       1
 EXCLUSIVE	=	false
 

make/local/make.opttest

@@ -26,7 +26,6 @@
 QUEUETYPE	=	srun
 QUEUE		=	M620v2
 PPN 		=	-1
-CLIENTTMPDIR	=	/local/tmp
 NOWAITCLUSTER   =       1
 EXCLUSIVE	=	false
 

make/make.darwin.clang

@@ -23,3 +23,6 @@ ifeq ($(SHARED),true)
 FLAGS		+=	-fPIC
 endif
 LINK_shared		=	-shared
+
+FORTRANLIBS	=	-lgfortran
+FORTRAN_NAMING_CONVENTION = LCASE_DECOR

make/make.linux.clang

@@ -9,6 +9,8 @@ GMP_FLAGS	=
 GMP_LDFLAGS 	=	-lgmp
 READLINE_FLAGS	=
 READLINE_LDFLAGS=	-lreadline -lncurses
+FORTRANLIBS	=	-lgfortran
+FORTRAN_NAMING_CONVENTION = LCASE_DECOR
 CFLAGS		=	-ffp-contract=off -std=c99 -D_XOPEN_SOURCE=600
 CXXFLAGS	=	-ffp-contract=off
 

src/tpi/tpi_tnycthrd.c

@@ -574,7 +574,7 @@ int SCIPtpiGetNumThreads(
    void
    )
 {
-   return _threadpool->nthreads;
+   return _threadpool != NULL ? _threadpool->nthreads : 0;
 }
 
 /** initializes tpi */