add shell function

startup.sh

@@ -13,34 +13,15 @@ python3 -c "import torch; \
     print(f\"device count = {torch.cuda.device_count()}\"); \
     print(f\"current device = {torch.cuda.current_device()}\")"
 
-RUN_AND_WAIT() {
-    # 1st param: the script name, eg "server.controller"
-    # 2nd param: the command to execute
-    # 3rd param: the log entry to watch for that indicate the component is ready
-    COMPONENT=$1
-    echo "Starting $COMPONENT"
-    nohup eval $2 2>&1 | tee "$COMPONENT.log" &
-    while [ `grep -c $3 "$COMPONENT.log"` -eq '0' ];do
-            sleep 1s;
-            echo "wait $COMPONENT to be running"
-    done
-    echo "$COMPONENT is running"
-}
-
-COMPONENT="serve.controller"
-COMMAND=python3 -m $COMPONENT --host 0.0.0.0 --port 10000
-READY_LOG="Uvicorn running on"
-
-RUN_AND_WAIT $COMPONENT $COMMAND $READY_LOG
-
-# COMPONENT="serve.controller"
-# echo "Starting $COMPONENT"
-# nohup python3 -m $COMPONENT --host 0.0.0.0 --port 10000 2>&1 | tee "$COMPONENT.log" &
-# while [ `grep -c "Uvicorn running on" "$COMPONENT.log"` -eq '0' ];do
-#         sleep 1s;
-#         echo "wait $COMPONENT to be running"
-# done
-# echo "$COMPONENT is running"
+
+COMPONENT="serve.controller" 
+echo "Starting $COMPONENT"
+nohup python3 -m $COMPONENT --host 0.0.0.0 --port 10000 2>&1 | tee "$COMPONENT.log" &
+while [ `grep -c "Uvicorn running on" "$COMPONENT.log"` -eq '0' ];do
+        sleep 1s;
+        echo "wait $COMPONENT to be running"
+done
+echo "$COMPONENT is running"
 
 
 # sleep 30
@@ -53,21 +34,14 @@ RUN_AND_WAIT $COMPONENT $COMMAND $READY_LOG
 
 # echo "Starting prism-dinosiglip+7b"
 # python3 -m interactive_demo --port 40000 --model_id prism-dinosiglip+7b &
-
 COMPONENT="interactive_demo"
-COMMAND=python3 -m $COMPONENT --port 40000 --model_id prism-dinosiglip+7
-READY_LOG="loaded prismatic prism-dinosiglip+7b"
-
-RUN_AND_WAIT $COMPONENT $COMMAND $READY_LOG
-
-
-# echo "Starting $COMPONENT"
-# nohup  | tee "$COMPONENT.log" &
-# while [ `grep -c "loaded prismatic prism-dinosiglip+7b" "$COMPONENT.log"` -eq '0' ];do
-#         sleep 1s;
-#         echo "wait $COMPONENT to be running"
-# done
-# echo "$COMPONENT is running"
+echo "Starting $COMPONENT"
+nohup python3 -m $COMPONENT --port 40000 --model_id prism-dinosiglip+7 | tee "$COMPONENT.log" &
+while [ `grep -c "loaded prismatic prism-dinosiglip+7b" "$COMPONENT.log"` -eq '0' ];do
+        sleep 1s;
+        echo "wait $COMPONENT to be running"
+done
+echo "$COMPONENT is running"