Skip to content
Merged
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: 1 addition & 1 deletion backends/arm/cmsis_pack/config/executorch_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- pack: ARM::CMSIS
version: "6.0.0:6.99.99"
- pack: ARM::CMSIS-NN
version: "7.0.0:7.99.99"
version: "8.0.0:8.99.99"
optional: true # Only for CMSIS-NN optimized backend
- pack: ARM::ethos-u-core-driver
version: "1.0.0:1.99.99"
Expand Down
2 changes: 1 addition & 1 deletion backends/arm/cmsis_pack/test/smoke/smoke.csolution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ solution:

packs:
- pack: ARM::CMSIS@>=6.0.0
- pack: ARM::CMSIS-NN@7.0.0
- pack: ARM::CMSIS-NN@8.0.0
- pack: ARM::Cortex_DFP@>=1.1.0
- pack: PyTorch::ExecuTorch

Expand Down
5 changes: 0 additions & 5 deletions backends/arm/scripts/build_executor_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,6 @@ ethosu_tools_dir=$(realpath ${ethosu_tools_dir})
ethos_u_root_dir="${ethosu_tools_dir}/ethos-u"
mkdir -p "${ethos_u_root_dir}"
ethos_u_root_dir=$(realpath ${ethos_u_root_dir})
cmsis_nn_local_path=""
if [[ -d "${ethos_u_root_dir}/core_software/cmsis-nn" ]]; then
cmsis_nn_local_path=$(realpath "${ethos_u_root_dir}/core_software/cmsis-nn")
fi

if [[ ${system_config} == "" ]]
then
Expand Down Expand Up @@ -246,7 +242,6 @@ cmake \
${flatc_flags} \
-DEXECUTORCH_SELECT_OPS_LIST="${select_ops_list}" \
-DETHOS_SDK_PATH:PATH=${ethos_u_root_dir} \
${cmsis_nn_local_path:+-DCMSIS_NN_LOCAL_PATH:PATH=${cmsis_nn_local_path}} \
${extra_build_flags}

echo "[${BASH_SOURCE[0]}] Configured CMAKE"
Expand Down
2 changes: 1 addition & 1 deletion backends/cortex_m/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ include(FetchContent)

# CMSIS-NN configuration with dynamic path detection
set(CMSIS_NN_VERSION
"dbf45dbfcc515421dd6099037d3e2637b90748c8"
"v8.0.0"
CACHE STRING "CMSIS-NN version to download"
)
set(CMSIS_NN_LOCAL_PATH
Expand Down
8 changes: 1 addition & 7 deletions backends/cortex_m/test/ops/test_conv_transpose.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,7 @@ def test_dialect_conv_transpose2d(test_case, cortex_m_target):
tester.check_not(test_case.model.ops_after_absent)


xfails_implementation: dict[str, xfail_type] = {
"conv_transpose2d_relu": "Fused transpose-conv + relu lowers correctly but current implementation is numerically incorrect.",
"conv_transpose2d_hardtanh": "Fused transpose-conv + hardtanh lowers correctly but current implementation is numerically incorrect.",
}


@parametrize("test_case", test_cases, xfails=xfails_implementation)
@parametrize("test_case", test_cases)
def test_implementation_conv_transpose2d(test_case, cortex_m_target):
tester = CortexMTester(
test_case.model, test_case.example_inputs, target_config=cortex_m_target
Expand Down
4 changes: 2 additions & 2 deletions examples/arduino/build_arduino_library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ done
# it with FetchContent at cmake time -- so fetch it at the revision that backend
# pins. Without it the Cortex-M ops compile against headers that are not there.
if [ -z "$CMSIS_NN" ]; then
CMSIS_NN_PIN=$(sed -n '/set(CMSIS_NN_VERSION/,/)/p' \
"$ET_ROOT/backends/cortex_m/CMakeLists.txt" | grep -oE '"[0-9a-f]{40}"' | tr -d '"')
CMSIS_NN_PIN=$(sed -n '/set(CMSIS_NN_VERSION/,/)/s/^[[:space:]]*"\([^"]*\)".*/\1/p' \
"$ET_ROOT/backends/cortex_m/CMakeLists.txt")
if [ -z "$CMSIS_NN_PIN" ]; then
echo "ERROR: could not read CMSIS_NN_VERSION from backends/cortex_m/CMakeLists.txt"
exit 1
Expand Down
7 changes: 0 additions & 7 deletions examples/arm/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,6 @@ arm_scratch_dir=$(realpath "${arm_scratch_dir}")
ethos_u_root_dir="${arm_scratch_dir}/ethos-u"
mkdir -p "${ethos_u_root_dir}"
ethos_u_root_dir=$(realpath "${ethos_u_root_dir}")
cmsis_nn_local_path=""
if [[ -d "${ethos_u_root_dir}/core_software/cmsis-nn" ]]; then
cmsis_nn_local_path=$(realpath "${ethos_u_root_dir}/core_software/cmsis-nn")
fi
setup_path_script=${arm_scratch_dir}/setup_path.sh
_setup_msg="please refer to ${script_dir}/setup.sh to properly install necessary tools."

Expand Down Expand Up @@ -335,9 +331,6 @@ configure_runner_build_dir() {
-DETHOS_SDK_PATH:PATH="${ethos_u_root_dir}"
-DEXECUTORCH_SELECT_OPS_LIST="${select_ops_list}"
)
if [[ -n "${cmsis_nn_local_path}" ]]; then
cmake_cmd+=(-DCMSIS_NN_LOCAL_PATH:PATH="${cmsis_nn_local_path}")
fi
cmake_cmd+=(-DET_PTE_FILE_PATH:PATH="${pte_source}")
if [[ "${pte_placement}" == "elf" ]]; then
cmake_cmd+=(-DET_MODEL_PTE_ADDR=)
Expand Down
Loading