Some simple bug fixes in the scripts (#155)

Author: guangy10

.ci/scripts/validate.sh

@@ -1,3 +1,4 @@
+
 #!/bin/bash
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 # All rights reserved.
@@ -35,7 +36,7 @@ function generate_aoti_model_output() {
     local MODEL_NAME=$(basename "$CHECKPOINT_PATH" | sed 's/\.[^.]*$//')
     echo ""############### Run inference with AOTInductor for $MODEL_NAME "###############"
     python -W ignore export.py --checkpoint-path "$CHECKPOINT_PATH" --output-dso-path "${MODEL_DIR}/${MODEL_NAME}.so" --device "$TARGET_DEVICE"
-    python -W ignore generate.py --checkpoint-path "$CHECKPOINT_PATH" --dso-path "$MODEL_DIR/${MODEL_NAME}.so" --prompt "$PROMPT" > "$MODEL_DIR/output_aoti"
+    python -W ignore generate.py --checkpoint-path "$CHECKPOINT_PATH" --dso-path "$MODEL_DIR/${MODEL_NAME}.so" --prompt "$PROMPT" --device "$TARGET_DEVICE" > "$MODEL_DIR/output_aoti"
     cat "$MODEL_DIR/output_aoti"
 }
 
@@ -50,11 +51,49 @@ function generate_executorch_model_output() {
     cat "$MODEL_DIR/output_et"
 }
 
+function run_compile() {
+    generate_compiled_model_output "$CHECKPOINT_PATH" "$TARGET_DEVICE"
+}
+
+function run_aoti() {
+    generate_aoti_model_output "$CHECKPOINT_PATH" "$TARGET_DEVICE"
+}
+
+function run_executorch() {
+    if [ "$TARGET_DEVICE" = "cpu" ]; then
+        generate_executorch_model_output "$CHECKPOINT_PATH" "$TARGET_DEVICE"
+    else
+        echo "Error: Executorch doesn't run on ${TARGET_DEVICE}"
+    fi
+}
+
 
 CHECKPOINT_PATH="$1"
 TARGET_DEVICE="${2:-cpu}"
 PROMPT="Hello, my name is"
 
-generate_compiled_model_output $CHECKPOINT_PATH $TARGET_DEVICE
-generate_aoti_model_output $CHECKPOINT_PATH $TARGET_DEVICE
-generate_executorch_model_output $CHECKPOINT_PATH $TARGET_DEVICE
+
+if [ "$#" -gt 2 ]; then
+    # Additional arguments provided
+    for arg in "${@:3}"; do
+        case "$arg" in
+            "compile")
+                run_compile
+                ;;
+            "aoti")
+                run_aoti
+                ;;
+            "executorch")
+                run_executorch
+                ;;
+            *)
+                echo "Unknown argument: $arg" >&2
+                ;;
+        esac
+    done
+else
+    # No additional arguments provided, run all functions
+    run_compile
+    run_aoti
+    run_executorch
+fi

.ci/scripts/wget_checkpoint.sh

@@ -11,11 +11,9 @@ MODEL_REPO="$1"
 RESOURCES_STRING="$2"
 CHECKPOINT_NAME="${MODEL_REPO##*/}"
 
-pushd "${LLAMA_FAST_ROOT}" || exit
-
 # Create the directory for the checkpoint
 mkdir -p "checkpoints/${MODEL_REPO}"
-cd "checkpoints/${MODEL_REPO}" || exit
+pushd "checkpoints/${MODEL_REPO}" || exit
 
 # Download all resources
 IFS=',' # Set the field separator to comma

scripts/workflow.sh

@@ -49,6 +49,23 @@ function download_checkpoint() {
     fi
 }
 
+function run_validation_e2e() {
+    local MODEL_REPO="$1"
+
+    echo ""
+    echo "############### Validating ${MODEL_REPO##*/} ###############"
+    download_checkpoint "$MODEL_REPO"
+    bash .ci/scripts/convert_checkpoint.sh "$MODEL_REPO"
+
+    set +e
+    CHECKPOINT_PATH="checkpoints/$MODEL_REPO/$CHECKPOINT_FILENAME"
+    if [ -z "$ADDITIONAL_ARG" ]; then
+        bash .ci/scripts/validate.sh "$CHECKPOINT_PATH" "$DEVICE"
+    else
+        bash .ci/scripts/validate.sh "$CHECKPOINT_PATH" "$DEVICE" "$ADDITIONAL_ARG"
+    fi
+}
+
 
 # List of models to validate
 MODEL_REPOS=(
@@ -59,26 +76,26 @@ MODEL_REPOS=(
     "mistralai/Mistral-7B-Instruct-v0.1"
     "mistralai/Mistral-7B-Instruct-v0.2"
     # "openlm-research/open_llama_7b"
-    # "codellama/CodeLlama-7b-Python-hf"
-    # "codellama/CodeLlama-34b-Python-hf"
+    "codellama/CodeLlama-7b-Python-hf"
+    "codellama/CodeLlama-34b-Python-hf"
     # "meta-llama/Llama-2-7b-chat-hf"
     # "meta-llama/Llama-2-13b-chat-hf"
     # "meta-llama/Llama-2-70b-chat-hf"
 )
 
 PROMPT="Hello, my name is"
 DEVICE="${1:-cpu}"
+INPUT_MODEL_REPO="${2:-}"
+ADDITIONAL_ARG="${3:-}"
 CHECKPOINT_FILENAME="model.pth"
 
 echo "###############################################################"
 echo "############## Start LLama-fast Model Validation ##############"
 echo "###############################################################"
-for MODEL_REPO in "${MODEL_REPOS[@]}"; do
-    echo "############### Validating ${MODEL_REPO##*/} ###############"
-    download_checkpoint "$MODEL_REPO"
-    bash .ci/scripts/convert_checkpoint.sh "$MODEL_REPO"
-
-    set +e
-    CHECKPOINT_PATH="checkpoints/$MODEL_REPO/$CHECKPOINT_FILENAME"
-    bash .ci/scripts/validate.sh "$CHECKPOINT_PATH" "$DEVICE"
-done
+if [ -z "$INPUT_MODEL_REPO" ]; then
+    for MODEL_REPO in "${MODEL_REPOS[@]}"; do
+        run_validation_e2e "$MODEL_REPO" "$DEVICE"
+    done
+else
+    run_validation_e2e "$INPUT_MODEL_REPO" "$DEVICE" "$ADDITIONAL_ARG"
+fi