ETUnwrap and cpp20 initializer in xnnpack

Author: JacobSzwejbka

backends/xnnpack/runtime/XNNCompiler.cpp

@@ -1539,8 +1539,9 @@ Error defineGenericUnaryNode(
     MAYBE_UNUSED(graph);                                          \
     auto graph_node = node->xnode_union_as_XNN##name();           \
     std::pair<float, float> min_max = getOutputMinMax(node);      \
-    union xnn_unary_params params = {                             \
-        .clamp = {.min = min_max.first, .max = min_max.second}};  \
+    union xnn_unary_params params;                                \
+    params.clamp.min = min_max.first;                             \
+    params.clamp.max = min_max.second;                            \
     return defineGenericUnaryNode(                                \
         subgraph_ptr,                                             \
         remapped_ids,                                             \

backends/xnnpack/runtime/XNNPACKBackend.cpp

@@ -82,7 +82,11 @@ class XnnpackBackend final
 
     auto program_id =
         reinterpret_cast<uintptr_t>(context.get_runtime_allocator());
-    auto workspace = ET_UNWRAP(get_or_create_workspace(program_id));
+    auto workspace_result = get_or_create_workspace(program_id);
+    if (!workspace_result.ok()) {
+      return workspace_result.error();
+    }
+    auto workspace = workspace_result.get();
 
 #ifdef ENABLE_XNNPACK_WEIGHTS_CACHE
     const std::lock_guard<std::mutex> lock_weight_cache(weights_cache_mutex_);