Minizing chages to only include relevant stuff

Author: BujSet

examples/arm/ethos-u-setup/arm-zephyr-eabi-gcc.cmake

@@ -17,8 +17,9 @@
 #
 
 # Copied this file from core_platform/cmake/toolchain/arm-non-eabi-gcc.cmake And
-# modified to align better with cs300 platform
-
+# modified to align better with cs300 platform. Currently, this cmake only 
+# supports Arm Cortex m55. Future version may include support for other 
+# chips, e.g. m33, m85 
 set(TARGET_CPU
     "cortex-m55"
     CACHE STRING "Target CPU"

runtime/executor/pte_data_map.cpp

@@ -32,7 +32,7 @@ PteDataMap::get_data(executorch::aten::string_view key) const {
     ET_CHECK_OR_RETURN_ERROR(
         named_data_->Get(i) != nullptr && named_data_->Get(i)->key() != nullptr,
         InvalidArgument,
-        "Searching for key %.*s: NamedData at index %" PRId32 " is null",
+        "Searching for key %.*s: NamedData at index %d is null",
         static_cast<int>(key.size()),
         key.data(),
         i);
@@ -47,7 +47,7 @@ PteDataMap::get_data(executorch::aten::string_view key) const {
       ET_CHECK_OR_RETURN_ERROR(
           segment_index < segments_->size(),
           InvalidArgument,
-          "Segment index %zu for key %.*s is out of range for segments size %" PRId32,
+          "Segment index %zu for key %.*s is out of range for segments size %u",
           segment_index,
           static_cast<int>(key.size()),
           key.data(),
@@ -74,16 +74,15 @@ ET_NODISCARD executorch::runtime::Result<const char*> PteDataMap::get_key(
   ET_CHECK_OR_RETURN_ERROR(
       index < named_data_->size(),
       InvalidArgument,
-      "Index out of range: named_data size is %" PRId32
-      ", received index %" PRId32,
+      "Index out of range: named_data size is %u, received index %u",
       named_data_->size(),
       index);
 
   ET_CHECK_OR_RETURN_ERROR(
       named_data_->Get(index) != nullptr &&
           named_data_->Get(index)->key() != nullptr,
       InvalidArgument,
-      "NamedData at index %" PRId32 " is null",
+      "NamedData at index %u is null",
       index);
   return named_data_->Get(index)->key()->c_str();
 }

runtime/executor/tensor_parser_exec_aten.cpp

@@ -133,8 +133,7 @@ ET_NODISCARD Error validateTensorLayout(
     ET_CHECK_OR_RETURN_ERROR(
         s_tensor->sizes()->Get(i) == expected_layout.sizes()[i],
         InvalidExternalData,
-        "Sizes mismatch. Expected %" PRId32 ", got %" PRId32
-        " for size at index %d.",
+        "Sizes mismatch. Expected %d, got %d for size at index %d.",
         s_tensor->sizes()->Get(i),
         expected_layout.sizes()[i],
         i);

runtime/kernel/operator_registry.h

@@ -30,13 +30,13 @@
       "key: %s, is_fallback: %s", \
       k.data(),                   \
       k.is_fallback() ? "true" : "false");
-#define ET_LOG_TENSOR_META(meta_list)                                         \
-  for (const auto& meta : meta_list) {                                        \
-    ET_LOG(Info, "dtype: %d | dim order: [", int(meta.dtype_));               \
-    for (size_t i = 0; i < meta.dim_order_.size(); i++) {                     \
-      ET_LOG(Info, "%" PRId32 ",", static_cast<int32_t>(meta.dim_order_[i])); \
-    }                                                                         \
-    ET_LOG(Info, "]");                                                        \
+#define ET_LOG_TENSOR_META(meta_list)                                \
+  for (const auto& meta : meta_list) {                               \
+    ET_LOG(Info, "dtype: %d | dim order: [", int(meta.dtype_));      \
+    for (size_t i = 0; i < meta.dim_order_.size(); i++) {            \
+      ET_LOG(Info, "%d,", static_cast<int32_t>(meta.dim_order_[i])); \
+    }                                                                \
+    ET_LOG(Info, "]");                                               \
   }
 
 namespace executorch {

tools/cmake/preset/zephyr.cmake

@@ -5,15 +5,11 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-set_overridable_option(CMAKE_SYSTEM_PROCESSOR                   cortex-m55)
-set_overridable_option(CMAKE_BUILD_TYPE                         Release)
-set_overridable_option(PYTHON_EXECUTABLE                        /home/zephyruser/executorch/.venv/bin/python3)
 set_overridable_option(CMAKE_CXX_COMPILER_ID                    GNU)
 set_overridable_option(CMAKE_TOOLCHAIN_FILE                     "${PROJECT_SOURCE_DIR}/examples/arm/ethos-u-setup/arm-zephyr-eabi-gcc.cmake")
 set_overridable_option(EXECUTORCH_ENABLE_LOGGING                ON)
 set_overridable_option(EXECUTORCH_BUILD_COREML                  OFF)
 set_overridable_option(EXECUTORCH_FLATBUFFERS_MAX_ALIGNMENT     1024)
-set_overridable_option(EXECUTORCH_PAL_DEFAULT                   minimal)
 set_overridable_option(EXECUTORCH_LOG_LEVEL                     Info)
 set_overridable_option(EXECUTORCH_ENABLE_PROGRAM_VERIFICATION   OFF)
 set_overridable_option(EXECUTORCH_ENABLE_EVENT_TRACER           OFF)