Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions scripts/compare_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ def collect_log_files(base_dir: Path):
duplicates = {}

for path in base_dir.rglob("*.log"):
if path.name == "run_metadata.log":
continue
if path.name.startswith(("build", "ctest_")) or path.name.endswith("_profile.log"):
continue

Expand Down
55 changes: 51 additions & 4 deletions scripts/run_models_and_profile.bash
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,7 @@ RUN_CTEST="$(read_var RUN_CTEST)"; : "${RUN_CTEST:=true}"
RUN_PROFILE_TEST="$(read_var RUN_PROFILE_TEST)"; : "${RUN_PROFILE_TEST:=true}"
CKPT_ROOT_DIR="$(read_var CKPT_ROOT_DIR)"; : "${CKPT_ROOT_DIR:=/data1/ckpt}"

mkdir -p "$BUILD_DIR" "$LOG_DIR" "$PROFILE_LOG_DIR"

# export custom PATHs
export BUILD_DIR LOG_DIR PROFILE_LOG_DIR
# export custom variables from config first. LOG_DIR/PROFILE_LOG_DIR are normalized below.
while IFS="=" read -r k v; do
[[ -z "$k" || "$k" == "null" ]] && continue
export "$k"="$v"
Expand All @@ -87,6 +84,48 @@ done < <(jq -r '.variables | to_entries[] | "\(.key)=\(.value)"' "$CONFIG_FILE")
LAST_CMAKE_CMD=""
declare -A SELECTED_TAGS=()

RUN_STARTED_AT="$(date '+%Y-%m-%d %H:%M:%S')"
RUN_ID="$(date '+%Y%m%d_%H%M%S')"
RUN_DATE="$(date '+%Y%m%d')"
GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
: "${GIT_BRANCH:=unknown}"
GIT_COMMIT_FULL="$(git rev-parse HEAD 2>/dev/null || true)"
: "${GIT_COMMIT_FULL:=unknown}"
GIT_COMMIT_SHORT="${GIT_COMMIT_FULL:0:7}"
SAFE_GIT_BRANCH="${GIT_BRANCH//\//_}"
SAFE_GIT_BRANCH="${SAFE_GIT_BRANCH//[[:space:]]/_}"
SAFE_GIT_BRANCH="$(printf '%s' "$SAFE_GIT_BRANCH" | tr -cd '[:alnum:]_.-')"
: "${SAFE_GIT_BRANCH:=unknown}"

LOG_DIR_PARENT="$(dirname "$LOG_DIR")"
if [[ "$LOG_DIR_PARENT" == "." ]]; then
RUN_OUTPUT_DIR="${RUN_DATE}/${SAFE_GIT_BRANCH}_${GIT_COMMIT_SHORT}"
else
RUN_OUTPUT_DIR="${LOG_DIR_PARENT}/${RUN_DATE}/${SAFE_GIT_BRANCH}_${GIT_COMMIT_SHORT}"
fi
LOG_DIR="${RUN_OUTPUT_DIR}/logs"
PROFILE_LOG_DIR="${RUN_OUTPUT_DIR}/profile_logs"

mkdir -p "$BUILD_DIR" "$LOG_DIR" "$PROFILE_LOG_DIR"
export BUILD_DIR LOG_DIR PROFILE_LOG_DIR

RUN_METADATA_FILE="${LOG_DIR}/run_metadata.log"
: > "$RUN_METADATA_FILE"
RUN_METADATA_FILE="$(realpath "$RUN_METADATA_FILE")"
{
echo "[RUN_STARTED_AT] $RUN_STARTED_AT"
echo "[RUN_ID] $RUN_ID"
echo "[GIT_BRANCH] $GIT_BRANCH"
echo "[GIT_COMMIT] $GIT_COMMIT_FULL"
echo "[GIT_COMMIT_SHORT] $GIT_COMMIT_SHORT"
echo "[CONFIG_FILE] $CONFIG_FILE"
echo "[LOG_DIR] $(realpath "$LOG_DIR")"
echo "[PROFILE_LOG_DIR] $(realpath "$PROFILE_LOG_DIR")"
} > "$RUN_METADATA_FILE"
echo -e "\033[1;33mRun metadata:\033[0m $RUN_METADATA_FILE"
echo -e "\033[1;33mRun log dir:\033[0m $(realpath "$LOG_DIR")"
echo -e "\033[1;33mRun profile log dir:\033[0m $(realpath "$PROFILE_LOG_DIR")"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

感觉这个脚本执行完毕后再加一个输出信息,提示下下一步可以执行 python write_to_feishu_sheet.py token.json --log-dir xxxx (就是把刚刚实际写入的路径 print 出来)会比较合适,这样我们可以直接复制这个继续执行

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


normalize_tag() {
local raw="$1"
raw="${raw#"${raw%%[![:space:]]*}"}"
Expand Down Expand Up @@ -260,6 +299,11 @@ run_and_log() {
fi

# Write the current run command to the log
echo "[RUN_METADATA] $RUN_METADATA_FILE" >> "$log_path"
echo "[RUN_STARTED_AT] $RUN_STARTED_AT" >> "$log_path"
echo "[GIT_BRANCH] $GIT_BRANCH" >> "$log_path"
echo "[GIT_COMMIT] $GIT_COMMIT_FULL" >> "$log_path"
echo "[GIT_COMMIT_SHORT] $GIT_COMMIT_SHORT" >> "$log_path"
echo "[COMMAND] $cmd" >> "$log_path"

# Run the command and append both stdout and stderr to the log file
Expand Down Expand Up @@ -457,3 +501,6 @@ fi

echo -e "\n\033[1;36m[END OF TEST] Cleaning build directory after all tests\033[0m"
clean_build_dir

echo -e "\n\033[1;33mNext step:\033[0m"
echo "python3 write_to_feishu_sheet.py token.json --log-dir \"$(realpath "$RUN_OUTPUT_DIR")\""
Loading
Loading