From c7fc4e9b7cc202d113194ebe344694e530b2c7c8 Mon Sep 17 00:00:00 2001
From: "Pierre F. Aubert" <pierre@spinorama.org>
Date: Tue, 10 Dec 2024 18:54:57 +0100
Subject: [PATCH] fix: running on linux with new version of Ray

---
 generate_peqs.py         |  1 +
 scripts/update_one_eq.sh | 60 ++++++++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/generate_peqs.py b/generate_peqs.py
index 0d964bc2c..2380e1588 100755
--- a/generate_peqs.py
+++ b/generate_peqs.py
@@ -492,6 +492,7 @@ def main():
         window_size = int(args["--smooth-measurements"])
         current_optim_config["smooth_measurements"] = True
         current_optim_config["smooth_window_size"] = window_size
+        current_optim_config["smooth_window_order"] = 3
         if window_size < 2:
             print("ERROR: window size is {} which is below 2".format(window_size))
             parameter_error = True
diff --git a/scripts/update_one_eq.sh b/scripts/update_one_eq.sh
index 56068e1c5..047082944 100755
--- a/scripts/update_one_eq.sh
+++ b/scripts/update_one_eq.sh
@@ -16,21 +16,35 @@ elif test "$OS" = "Darwin"; then
     IP=$(/sbin/ifconfig| grep 'inet ' | grep broadcast | cut -d ' ' -f 2 | head -1)
 fi
 
-PORT=9999
+PORT=8379
 
 start_ray()
 {
     #                                                                        prometheus exporter
     TEMP_DIR=$(pwd)/build/ray
     mkdir -p ./build/ray
+    rm -fr /tmp/ray/
+    ln -s ${TEMP_DIR} /tmp
     echo "Starting Ray with ${IP} at ${PORT} with tmp set to ${TEMP_DIR}"
-    ray start --node-ip-address=${IP} --port ${PORT} --head --dashboard-host=$IP --metrics-export-port=9101 --disable-usage-stats --temp-dir=$TEMP_DIR
+    ray start --node-ip-address=${IP} --port ${PORT} --head --dashboard-host=${IP} --metrics-export-port=9101 --disable-usage-stats
 }
 
 compute_eq()
 {
-    target_dir="$(pwd)/build/eqs/$3/$2-$1"
+    EXTRA=""
+    smooth="asis"
+    if [ "$4" != "" ]; then
+	smooth="smooth"
+	EXTRA="${EXTRA} $4"
+    fi
+    full="pk"
+    if [ "$5" != "" ]; then
+	full="all"
+	EXTRA="${EXTRA} $5"
+    fi
+    target_dir="$(pwd)/build/eqs/$3/$2-$1-$smooth-$full"
     mkdir -p "$target_dir"
+    echo  ./generate_peqs.py --verbose --force --optimisation=global --max-iter=15000 --speaker="$3" --max-peq=$1 --fitness=$2 --ray-cluster=$IP:$PORT ${EXTRA}  --output-dir="$target_dir"
     { ./generate_peqs.py \
 	  --verbose \
 	  --force \
@@ -40,8 +54,9 @@ compute_eq()
 	  --max-peq=$1 \
           --fitness=$2 \
 	  --ray-cluster=$IP:$PORT \
+	  ${EXTRA} \
 	  --output-dir="$target_dir" > "$target_dir.log"; \
-	} 2>&1 &
+    } 2>&1 &
 }
 
 start_ray
@@ -50,19 +65,30 @@ FAIL=0
 
 for spk in "$@"
 do
-    compute_eq 1 "Flat" "$spk"
-    compute_eq 2 "Flat" "$spk"
-    compute_eq 4 "Flat" "$spk"
-    compute_eq 5 "Flat" "$spk"
-    compute_eq 6 "Flat" "$spk"
-    compute_eq 7 "Flat" "$spk"
-
-    compute_eq 1 "Score" "$spk"
-    compute_eq 2 "Score" "$spk"
-    compute_eq 4 "Score" "$spk"
-    compute_eq 5 "Score" "$spk"
-    compute_eq 6 "Score" "$spk"
-    compute_eq 7 "Score" "$spk"
+    compute_eq 3 "Flat" "$spk" "" ""
+    compute_eq 4 "Flat" "$spk" "" ""
+    compute_eq 5 "Flat" "$spk" "" ""
+    compute_eq 6 "Flat" "$spk" "" ""
+    compute_eq 7 "Flat" "$spk" "" ""
+
+    compute_eq 3 "Score" "$spk" "" ""
+    compute_eq 4 "Score" "$spk" "" ""
+    compute_eq 5 "Score" "$spk" "" ""
+    compute_eq 6 "Score" "$spk" "" ""
+    compute_eq 7 "Score" "$spk" "" ""
+
+    compute_eq 3 "Flat" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+    compute_eq 4 "Flat" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+    compute_eq 5 "Flat" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+    compute_eq 6 "Flat" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+    compute_eq 7 "Flat" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+
+    compute_eq 3 "Score" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+    compute_eq 4 "Score" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+    compute_eq 5 "Score" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+    compute_eq 6 "Score" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+    compute_eq 7 "Score" "$spk" "--smooth-measurements=7 --smooth-order=3" ""
+
 done
 
 for job in $(jobs -p)