cpp 脚本清理：移除批量脚本、修正单条运行脚本 BSP 路径、README 对齐预编译发布

README.md

@@ -98,14 +98,6 @@ LD_LIBRARY_PATH=<BSP_LIB_DIR> cpp/bin/openwakeword_ax630c \
   --threshold 0.5
 ```
 
-也可以使用仓库内的批量运行脚本：
-
-```bash
-THRESHOLD=0.5 bash cpp/run_batch_openwakeword_ax650.sh   # AX650
-THRESHOLD=0.5 bash cpp/run_batch_openwakeword_ax630c.sh  # AX630C
-```
-
-结果分别写入 `outputs/cpp_ax650_batch/` 和 `outputs/cpp_ax630c_batch/`。
 详细 C++ 说明见 `cpp/README.md`。
 
 ### 共享库（二次开发）

cpp/README.md

@@ -1,122 +1,58 @@
-# openWakeWord C++ 推理
+# openWakeWord C++（HF 发布版）
 
-本目录提供 AX650 和 AX630C C++ 推理程序。WAV、STFT、mel 和缓存更新在 CPU
-端完成，embedding 与 classifier 使用对应平台的 `axmodel`。
+本目录只包含**预编译产物**：可直接运行的二进制与供二次开发链接的共享库。
+源码、构建脚本与 BSP 下载在 GitHub 仓库：
+<https://github.com/AXERA-TECH/openWakeWord.AXERA>。
 
-## 编译环境
-
-AX650 与 AX630C 共用 Arm GNU 9.2 AArch64 交叉编译器：
-
-```bash
-mkdir -p cpp/toolchains
-wget -P cpp/toolchains \
-  https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz
-tar -xf cpp/toolchains/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu.tar.xz \
-  -C cpp/toolchains
-```
-
-下载 BSP：
-
-```bash
-bash cpp/download_bsp.sh all
-```
-
-| 平台 | BSP 压缩包 | 编译目录 |
-| --- | --- | --- |
-| AX650 | `msp_50_3.10.2.zip` | `cpp/toolchains/ax650n_bsp_sdk/msp/out` |
-| AX630C | `msp_20e_3.0.0.zip` | `cpp/toolchains/ax620e_bsp_sdk/msp/out/arm64_glibc` |
-
-## 交叉编译
-
-```bash
-export TOOLCHAIN_ROOT="cpp/toolchains/gcc-arm-9.2-2019.12-x86_64-aarch64-none-linux-gnu"
-
-bash cpp/build_ax650.sh
-bash cpp/build_ax630c.sh
-```
-
-生成：
+## 目录
 
 ```text
-cpp/bin/openwakeword_ax650
-cpp/bin/openwakeword_ax630c
+cpp/
+├── bin/
+│   ├── openwakeword_ax650     # AX650 预编译可执行文件
+│   └── openwakeword_ax630c    # AX630C 预编译可执行文件
+├── lib/
+│   ├── ax650/libopenwakeword_ax.so     # AX650 共享库
+│   └── ax630c/libopenwakeword_ax.so    # AX630C 共享库
+├── include/openwakeword_ax.hpp         # 公共 API 头文件
+└── run_openwakeword_ax*.sh             # 板端单条运行脚本
 ```
 
-如 BSP 放在其他位置，可设置 `BSP_MSP_DIR`。AX650 应指向包含 `include/` 和
-`lib/` 的 `msp/out`；AX630C 应指向 `msp/out/arm64_glibc`。
+WAV、STFT、mel 在 CPU 端完成，embedding 与 6 个 classifier 使用对应平台的
+axmodel 在 NPU 执行。
 
-## 板端运行
+## 板端运行（预编译二进制）
 
-AX650 单条推理：
+AX650：
 
 ```bash
-AUDIO=audio/openwakeword/alexa_test.wav \
-bash cpp/run_openwakeword_ax650.sh
+AUDIO=audio/openwakeword/alexa_test.wav bash cpp/run_openwakeword_ax650.sh
 ```
 
-AX630C 单条推理：
+AX630C：
 
 ```bash
-AUDIO=audio/openwakeword/alexa_test.wav \
-bash cpp/run_openwakeword_ax630c.sh
+AUDIO=audio/openwakeword/alexa_test.wav bash cpp/run_openwakeword_ax630c.sh
 ```
 
-批量测试：
+运行脚本自动设置板端运行库路径（AX650 默认 `/soc/lib`，AX630C 默认
+`/opt/lib`）；如 BSP 在其他位置，用环境变量覆盖：
 
 ```bash
-THRESHOLD=0.5 bash cpp/run_batch_openwakeword_ax650.sh
-THRESHOLD=0.5 bash cpp/run_batch_openwakeword_ax630c.sh
-```
-
-模型目录必须与平台对应：
-
-```text
-models/650/
-models/630C/
+AXERA_BSP_LIB_DIR=/path/to/bsp/lib bash cpp/run_openwakeword_ax650.sh
 ```
 
-运行脚本会检查 embedding 和 6 个 classifier 模型，避免误用其他平台的 axmodel。
-输入音频必须为 16 kHz、单声道、16-bit PCM WAV。
-
-单条推理会输出 classifier 分数和 `WAKEUP`，并只输出一个 `rtf`。`rtf` 包含
-CPU mel 和 NPU 推理，不包含一次性模型加载与初始化。
-
-阈值可通过环境变量调整：
-
-```bash
-THRESHOLD=0.6 AUDIO=audio/openwakeword/hey_mycroft_test.wav \
-bash cpp/run_openwakeword_ax630c.sh
-```
+阈值可通过 `THRESHOLD` 调整。输入音频必须为 16 kHz、单声道、16-bit PCM WAV。
 
 ## 二次开发（共享库）
 
-编译产物除可执行文件外，还包含共享库：
-
-```text
-cpp/lib/ax650/libopenwakeword_ax.so      # AX650
-cpp/lib/ax630c/libopenwakeword_ax.so     # AX630C
-cpp/include/openwakeword_ax.hpp          # 公共 API 头文件
-```
-
-在自己的 CMake 工程中链接：
-
-```cmake
-add_library(openwakeword_ax SHARED IMPORTED)
-set_target_properties(openwakeword_ax PROPERTIES
-  IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/cpp/lib/ax650/libopenwakeword_ax.so")
-target_include_directories(your_app PRIVATE cpp/include)
-target_link_libraries(your_app PRIVATE openwakeword_ax)
-```
-
-最小使用示例：
-
 ```cpp
 #include "openwakeword_ax.hpp"
 
 openwakeword::WakeWordDetector detector(
-    "models/650",                    // axmodel 目录
-    "config/openwakeword_mel_weights.bin",  // CPU mel 权重
-    0.5f);                            // 阈值
+    "models/650",                                 // axmodel 目录
+    "config/openwakeword_mel_weights.bin",        // CPU mel 权重
+    0.5f);                                        // 阈值
 
 // 每 80ms 喂一帧 1280 个 int16 样本（16 kHz）
 openwakeword::FrameResult result = detector.ProcessFrame(pcm_frame);
@@ -128,9 +64,15 @@ if (result.any_triggered) { /* 唤醒 */ }
 detector.Reset();  // 新会话时清空流式状态
 ```
 
-板端运行时需提供 BSP 动态库路径（AX650 通常为 `/soc/lib`，AX630C 为
-`/opt/lib`）：
+在自己的 CMake 工程中链接：
 
-```bash
-export LD_LIBRARY_PATH=/soc/lib:${LD_LIBRARY_PATH}
+```cmake
+add_library(openwakeword_ax SHARED IMPORTED)
+set_target_properties(openwakeword_ax PROPERTIES
+  IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/cpp/lib/ax650/libopenwakeword_ax.so")
+target_include_directories(your_app PRIVATE cpp/include)
+target_link_libraries(your_app PRIVATE openwakeword_ax)
 ```
+
+板端运行时需提供 BSP 动态库路径（AX650 通常为 `/soc/lib`，AX630C 为
+`/opt/lib`）。

cpp/run_batch_openwakeword_ax.sh

@@ -1,122 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-TARGET="${AXERA_TARGET:-AX650}"
-AUDIO_DIR="${AUDIO_DIR:-${ROOT}/audio/openwakeword}"
-THRESHOLD="${THRESHOLD:-0.5}"
-
-case "${TARGET}" in
-  AX650)
-    TARGET_SLUG="ax650"
-    BINARY="${ROOT}/cpp/bin/openwakeword_ax650"
-    MODELS_DIR="${MODELS_DIR:-${ROOT}/models/650}"
-    BSP_LIB_DIR="${AXERA_BSP_LIB_DIR:-${AX650_BSP_LIB_DIR:-${ROOT}/cpp/toolchains/ax650n_bsp_sdk/msp/out/lib}}"
-    BUILD_SCRIPT="cpp/build_ax650.sh"
-    ;;
-  AX630C)
-    TARGET_SLUG="ax630c"
-    BINARY="${ROOT}/cpp/bin/openwakeword_ax630c"
-    MODELS_DIR="${MODELS_DIR:-${ROOT}/models/630C}"
-    BSP_LIB_DIR="${AXERA_BSP_LIB_DIR:-${AX630C_BSP_LIB_DIR:-${ROOT}/cpp/toolchains/ax620e_bsp_sdk/msp/out/arm64_glibc/lib}}"
-    BUILD_SCRIPT="cpp/build_ax630c.sh"
-    ;;
-  *)
-    echo "ERROR: AXERA_TARGET must be AX650 or AX630C" >&2
-    exit 2
-    ;;
-esac
-
-OUTPUT_DIR="${OUTPUT_DIR:-${ROOT}/outputs/cpp_${TARGET_SLUG}_batch}"
-if [[ ! -x "${BINARY}" ]]; then
-  echo "ERROR: ${BINARY} is missing; run bash ${BUILD_SCRIPT} first" >&2
-  exit 2
-fi
-if [[ ! -d "${AUDIO_DIR}" ]]; then
-  echo "ERROR: audio directory does not exist: ${AUDIO_DIR}" >&2
-  exit 2
-fi
-for name in embedding_model alexa_v0.1 hey_jarvis_v0.1 hey_mycroft_v0.1 \
-    hey_rhasspy_v0.1 timer_v0.1 weather_v0.1; do
-  model="${MODELS_DIR}/openwakeword__${name}.axmodel"
-  if [[ ! -f "${model}" ]]; then
-    echo "ERROR: ${TARGET} model is missing: ${model}" >&2
-    exit 2
-  fi
-done
-
-mapfile -d '' AUDIO_FILES < <(
-  find "${AUDIO_DIR}" -maxdepth 1 -type f -iname '*.wav' -print0 | sort -z
-)
-if [[ "${#AUDIO_FILES[@]}" -eq 0 ]]; then
-  echo "ERROR: no WAV files found under ${AUDIO_DIR}" >&2
-  exit 2
-fi
-
-mkdir -p "${OUTPUT_DIR}/logs"
-RESULTS="${OUTPUT_DIR}/results.tsv"
-SUMMARY="${OUTPUT_DIR}/summary.txt"
-printf 'file\taudio_seconds\tfeature_seconds\tnpu_seconds\tinference_seconds\trtf\tmodel_load_seconds\tdetections\n' > "${RESULTS}"
-
-export LD_LIBRARY_PATH="${BSP_LIB_DIR}:${LD_LIBRARY_PATH:-}"
-for audio in "${AUDIO_FILES[@]}"; do
-  name="$(basename "${audio}")"
-  stem="${name%.*}"
-  log="${OUTPUT_DIR}/logs/${stem}.log"
-  echo "[RUN] target=${TARGET} ${name} threshold=${THRESHOLD}"
-  "${BINARY}" \
-    --models-dir "${MODELS_DIR}" \
-    --mel-weights "${ROOT}/config/openwakeword_mel_weights.bin" \
-    --audio "${audio}" \
-    --threshold "${THRESHOLD}" > "${log}" 2>&1
-  cat "${log}"
-
-  field() {
-    awk -F': ' -v key="$1" '$1 == key {print $2; exit}' "${log}"
-  }
-  audio_seconds="$(field audio_seconds)"
-  feature_seconds="$(field feature_seconds)"
-  npu_seconds="$(field npu_seconds)"
-  inference_seconds="$(field inference_seconds)"
-  rtf="$(field rtf)"
-  model_load_seconds="$(field model_load_seconds)"
-  detections="$(awk '$NF == "WAKEUP" {print $1}' "${log}" | paste -sd ',' -)"
-  detections="${detections:-none}"
-
-  for value in "${audio_seconds}" "${feature_seconds}" "${npu_seconds}" \
-      "${inference_seconds}" "${rtf}" "${model_load_seconds}"; do
-    if [[ -z "${value}" ]]; then
-      echo "ERROR: timing field missing from ${log}" >&2
-      exit 1
-    fi
-  done
-  printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' \
-    "${name}" "${audio_seconds}" "${feature_seconds}" "${npu_seconds}" \
-    "${inference_seconds}" "${rtf}" "${model_load_seconds}" "${detections}" \
-    >> "${RESULTS}"
-done
-
-awk -F'\t' '
-  NR > 1 {
-    files += 1
-    audio += $2
-    feature += $3
-    npu += $4
-    inference += $5
-    model_load += $7
-  }
-  END {
-    printf "files: %d\n", files
-    printf "total_audio_seconds: %.6f\n", audio
-    printf "total_feature_seconds: %.6f\n", feature
-    printf "total_npu_seconds: %.6f\n", npu
-    printf "total_inference_seconds: %.6f\n", inference
-    printf "total_model_load_seconds: %.6f\n", model_load
-    printf "rtf: %.6f\n", inference / audio
-  }
-' "${RESULTS}" > "${SUMMARY}"
-
-echo "[SUMMARY]"
-cat "${SUMMARY}"
-echo "results: ${RESULTS}"
-echo "logs: ${OUTPUT_DIR}/logs"

cpp/run_batch_openwakeword_ax630c.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-AXERA_TARGET=AX630C exec bash "${ROOT}/cpp/run_batch_openwakeword_ax.sh"

cpp/run_batch_openwakeword_ax650.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-AXERA_TARGET=AX650 exec bash "${ROOT}/cpp/run_batch_openwakeword_ax.sh"

cpp/run_openwakeword_ax.sh

@@ -10,14 +10,13 @@ case "${TARGET}" in
   AX650)
     BINARY="${ROOT}/cpp/bin/openwakeword_ax650"
     MODELS_DIR="${MODELS_DIR:-${ROOT}/models/650}"
-    BSP_LIB_DIR="${AXERA_BSP_LIB_DIR:-${AX650_BSP_LIB_DIR:-${ROOT}/cpp/toolchains/ax650n_bsp_sdk/msp/out/lib}}"
-    BUILD_SCRIPT="cpp/build_ax650.sh"
+    # 板端运行库默认路径（AX650 通常为 /soc/lib），可用 AXERA_BSP_LIB_DIR 覆盖
+    BSP_LIB_DIR="${AXERA_BSP_LIB_DIR:-${AX650_BSP_LIB_DIR:-/soc/lib}}"
     ;;
   AX630C)
     BINARY="${ROOT}/cpp/bin/openwakeword_ax630c"
     MODELS_DIR="${MODELS_DIR:-${ROOT}/models/630C}"
-    BSP_LIB_DIR="${AXERA_BSP_LIB_DIR:-${AX630C_BSP_LIB_DIR:-${ROOT}/cpp/toolchains/ax620e_bsp_sdk/msp/out/arm64_glibc/lib}}"
-    BUILD_SCRIPT="cpp/build_ax630c.sh"
+    BSP_LIB_DIR="${AXERA_BSP_LIB_DIR:-${AX630C_BSP_LIB_DIR:-/opt/lib}}"
     ;;
   *)
     echo "ERROR: AXERA_TARGET must be AX650 or AX630C" >&2
@@ -26,7 +25,7 @@ case "${TARGET}" in
 esac
 
 if [[ ! -x "${BINARY}" ]]; then
-  echo "ERROR: ${BINARY} is missing; run bash ${BUILD_SCRIPT} first" >&2
+  echo "ERROR: 预编译二进制不存在: ${BINARY}（HF 发布版应包含 cpp/bin/）" >&2
   exit 2
 fi
 for name in embedding_model alexa_v0.1 hey_jarvis_v0.1 hey_mycroft_v0.1 \