Update SR version to 9bcb74d31 (2023-11-07 15:13:41 +0000))

etc/savilerow/savilerow

@@ -1,68 +1,13 @@
 #!/bin/bash
 
-
 # get savilerow installation directory
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 
-if [ -f "$DIR/bin/minion" ]; then
-    MINION_ARG="-minion-bin $DIR/bin/minion"
-else
-    MINION_ARG=""
-fi
-
-if [ -f "$DIR/bin/fzn-chuffed" ]; then
-    CHUFFED_ARG="-chuffed-bin $DIR/bin/fzn-chuffed"
-else
-    CHUFFED_ARG=""
-fi
-
-if [ -f "$DIR/bin/fzn-gecode" ]; then
-    GECODE_ARG="-gecode-bin $DIR/bin/fzn-gecode"
-else
-    GECODE_ARG=""
-fi
-
-if [ -f "$DIR/bin/fzn-ortools" ]; then
-    ORTOOLS_ARG="-or-tools-bin $DIR/bin/fzn-ortools"
-else
-    ORTOOLS_ARG=""
-fi
-
-if [ -f "$DIR/bin/cadical" ]; then
-    CADICAL_ARG="-cadical-bin $DIR/bin/cadical"
-else
-    CADICAL_ARG=""
-fi
-
-if [ -f "$DIR/bin/yices-smt2" ]; then
-    YICES_ARG="-yices2-bin $DIR/bin/yices-smt2"
-else
-    YICES_ARG=""
-fi
-
-if [ -f "$DIR/bin/boolector" ]; then
-    BOOLECTOR_ARG="-boolector-bin $DIR/bin/boolector"
-else
-    BOOLECTOR_ARG=""
-fi
-
-if [ -f "$DIR/bin/z3" ]; then
-    Z3_ARG="-z3-bin $DIR/bin/z3"
-else
-    Z3_ARG=""
-fi
-
-if [ -f "$DIR/bin/symmetry_detect" ]; then
-    SYMDETECT_ARG="-symdetect-bin $DIR/bin/symmetry_detect"
-else
-    SYMDETECT_ARG=""
-fi
-
 case "$@" in
     *"-cgroups"*)
         if [ $(uname) = "Darwin" ]; then
             echo "Ignoring -cgroups on macOS"
-            java -ea -XX:ParallelGCThreads=1 -Djava.library.path=$DIR/lib/ -Xmx8G -jar "$DIR/savilerow.jar" ${MINION_ARG} ${CHUFFED_ARG} ${GECODE_ARG} ${ORTOOLS_ARG} ${SYMDETECT_ARG} ${GLUCOSE_ARG} ${CADICAL_ARG} ${YICES_ARG} ${BOOLECTOR_ARG} ${Z3_ARG} "$@"
+            java -ea -XX:ParallelGCThreads=1 -Djava.library.path=$DIR/lib/ -Xmx8G -jar "$DIR/savilerow.jar" "$@"
         else
             TIMESTAMP=$(date +%s)
             GROUP_NAME="savilerow_${TIMESTAMP}_$$"
@@ -72,11 +17,11 @@ case "$@" in
             cgcreate -g cpu:/$GROUP_NAME
             cgset -r cpu.cfs_quota_us=1000000 $GROUP_NAME
             cgset -r cpu.cfs_period_us=1000000 $GROUP_NAME
-            cgexec -g cpu:$GROUP_NAME java -ea -XX:ParallelGCThreads=1 -Djava.library.path=$DIR/lib/ -Xmx8G -jar "$DIR/savilerow.jar" ${MINION_ARG} ${CHUFFED_ARG} ${GECODE_ARG} ${ORTOOLS_ARG} ${SYMDETECT_ARG} ${GLUCOSE_ARG} ${CADICAL_ARG} ${YICES_ARG} ${BOOLECTOR_ARG} ${Z3_ARG} "$@"
+            cgexec -g cpu:$GROUP_NAME java -ea -XX:ParallelGCThreads=1 -Djava.library.path=$DIR/lib/ -Xmx8G -jar "$DIR/savilerow.jar" "$@"
             cgdelete -g cpu:/$GROUP_NAME
         fi
     ;;
     *)
-        java -ea -XX:ParallelGCThreads=1 -Djava.library.path=$DIR/lib/ -Xmx8G -jar "$DIR/savilerow.jar" ${MINION_ARG} ${CHUFFED_ARG} ${GECODE_ARG} ${ORTOOLS_ARG} ${SYMDETECT_ARG} ${GLUCOSE_ARG} ${CADICAL_ARG} ${YICES_ARG} ${BOOLECTOR_ARG} ${Z3_ARG} "$@"
+        java -ea -XX:ParallelGCThreads=1 -Djava.library.path=$DIR/lib/ -Xmx8G -jar "$DIR/savilerow.jar" "$@"
     ;;
 esac