Project import generated by Copybara.

GitOrigin-RevId: 796203faee20d7aae2876aac8ca5a1827dee4fe3

mediapipe/framework/tool/subgraph_expansion.cc

@@ -237,9 +237,9 @@ static ::mediapipe::Status PrefixNames(int subgraph_index,
     for (auto it = subgraph_nodes_start; it != nodes->end(); ++it) {
       const auto& node = *it;
       MP_RETURN_IF_ERROR(ValidateSubgraphFields(node));
-      ASSIGN_OR_RETURN(auto subgraph, graph_registry->CreateByName(
-                                          config->package(), node.calculator(),
-                                          &node.options()));
+      ASSIGN_OR_RETURN(auto subgraph,
+                       graph_registry->CreateByName(config->package(),
+                                                    node.calculator(), &node));
       MP_RETURN_IF_ERROR(PrefixNames(subgraph_counter++, &subgraph));
       MP_RETURN_IF_ERROR(ConnectSubgraphStreams(node, &subgraph));
       subgraphs.push_back(subgraph);

mediapipe/framework/tool/subgraph_expansion_test.cc

@@ -128,8 +128,8 @@ class NodeChainSubgraph : public Subgraph {
  public:
   ::mediapipe::StatusOr<CalculatorGraphConfig> GetConfig(
       const SubgraphOptions& options) override {
-    const mediapipe::NodeChainSubgraphOptions& opts =
-        options.GetExtension(mediapipe::NodeChainSubgraphOptions::ext);
+    auto opts =
+        Subgraph::GetOptions<mediapipe::NodeChainSubgraphOptions>(options);
     const ProtoString& node_type = opts.node_type();
     int chain_length = opts.chain_length();
     RET_CHECK(!node_type.empty());