Chore: merge upstream 2025-09-11

.github/workflows/build_release_adapters.yml

@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         runner: [ubuntu-22.04, macos-latest, ubuntu-22.04-arm]
-        python-version: ['3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout code

.github/workflows/test_build_single_adapter.yml

@@ -26,10 +26,11 @@ on:
         default: "3.11"
         type: choice
         options:
-          - "3.12"
-          - "3.11"
-          - "3.10"
-          - "3.9"
+          - '3.13'
+          - '3.12'
+          - '3.11'
+          - '3.10'
+          - '3.9'
 
       package-version:
         description: "Package Version"

README.md

@@ -47,6 +47,7 @@ instructions and check out its [demos](src/custom_element_demos/).
 
 - ONNX Adapter: https://github.com/justinchuby/model-explorer-onnx
 - VGF Adapter: https://github.com/arm/vgf-adapter-model-explorer
+- TOSA Adapter: https://github.com/arm/tosa-adapter-model-explorer
 
 ## Contributions
 

src/builtin-adapter/.bazelrc

@@ -48,7 +48,13 @@ build --host_copt=-DGRPC_BAZEL_BUILD
 build --action_env=GRPC_BAZEL_RUNTIME=1
 build --repo_env=PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=upb
 build --action_env=PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=upb
-build --repo_env=RULES_PYTHON_ENABLE_PYSTAR=0
+
+# Some targets have the same py source file, but use different
+# configurations via `requires-` tags. This results in an action
+# conflict when precompiling. Disable to avoid that problem.
+# See https://github.com/bazel-contrib/rules_python/issues/2445
+build --@rules_python//python/config_settings:precompile=force_disabled
+
 # Do not do this. This is how gRPC builds itself by default, but we don't want
 # that as it would link protobuf into its own set of dynamic libraries, which
 # would conflict with our protobuf linkage.

src/builtin-adapter/WORKSPACE

@@ -40,9 +40,9 @@ rules_shell_toolchains()
 # b) get the sha256 hash of the commit by running:
 #    curl -L https://github.com/tensorflow/tensorflow/archive/<COMMIT_HASH>.tar.gz | sha256sum
 #    and update TENSORFLOW_SHA256 with the result.
-TENSORFLOW_COMMIT = "1e03bc9bb2fdccdb58a1a809e3358030b9e498b2"
+TENSORFLOW_COMMIT = "ec7c1948718638d4e63a68ce511c8425d930b7d9"
 
-TENSORFLOW_SHA256 = "0641196b87046cbaefcc4a627cb2d97a3eca6a41ec72f3447655cf45557071f0"
+TENSORFLOW_SHA256 = "f67de8c5db765f11ffb7ef28bac151398e46f76c74b3d5c156bc894ec54b0bfb"
 
 http_archive(
     name = "org_tensorflow",

src/builtin-adapter/formats/schema_structs.cc

@@ -180,9 +180,22 @@ llvm::json::Object TasksData::Json() const {
   return json_tasks_data;
 }
 
+const char GroupNodeConfig::kNamespaceRegex[] = "namespaceRegex";
+const char GroupNodeConfig::kLayoutDirection[] = "layoutDirection";
+
+llvm::json::Object GroupNodeConfig::Json() const {
+  llvm::json::Object json_config;
+  json_config[kNamespaceRegex] = namespace_regex;
+  if (layout_direction.has_value()) {
+    json_config[kLayoutDirection] = (int)layout_direction.value();
+  }
+  return json_config;
+}
+
 const char Subgraph::kSubgraphId[] = "id";
 const char Subgraph::kNodes[] = "nodes";
 const char Subgraph::kTasksData[] = "tasksData";
+const char Subgraph::kGroupNodeConfigs[] = "groupNodeConfigs";
 
 llvm::json::Object Subgraph::Json() const {
   llvm::json::Object json_subgraph;
@@ -191,6 +204,9 @@ llvm::json::Object Subgraph::Json() const {
   if (tasks_data.has_value()) {
     json_subgraph[kTasksData] = tasks_data->Json();
   }
+  if (!group_node_configs.empty()) {
+    json_subgraph[kGroupNodeConfigs] = ToJsonArray(group_node_configs);
+  }
   return json_subgraph;
 }
 

src/builtin-adapter/formats/schema_structs.h

@@ -208,6 +208,26 @@ struct TasksData {
   static const char kEdgeOverlaysDataListRightPane[];
 };
 
+/// Layout direction for group nodes.
+enum class LayoutDirection {
+  kTopBottom = 0,
+  kLeftRight = 1,
+};
+
+/// Configuration for a group node.
+struct GroupNodeConfig {
+  /// The regex to match against the namespace of group nodes.
+  std::string namespace_regex;
+  /// Whether to expand the group node by default.
+  std::optional<LayoutDirection> layout_direction;
+
+  llvm::json::Object Json() const;
+
+ private:
+  static const char kNamespaceRegex[];
+  static const char kLayoutDirection[];
+};
+
 /// A subgraph corresponds to a single renderable graph with an ID and a list of
 /// nodes.
 struct Subgraph {
@@ -219,13 +239,16 @@ struct Subgraph {
   std::vector<GraphNode> nodes;
   /// Data for various tasks that provide extra data to be visualized.
   std::optional<TasksData> tasks_data;
+  /// Custom configs for group nodes.
+  std::vector<GroupNodeConfig> group_node_configs;
 
   llvm::json::Object Json() const;
 
  private:
   static const char kSubgraphId[];
   static const char kNodes[];
   static const char kTasksData[];
+  static const char kGroupNodeConfigs[];
 };
 
 /// A logical grouping of subgraphs with a shared label.

src/builtin-adapter/python/pip_package/build_pip_package.sh

@@ -43,7 +43,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PYTHON="${CI_BUILD_PYTHON:-python3}"
 PYTHON_VERSION="$(${PYTHON} --version | cut -d " " -f 2)"
 IFS='.' read -ra VERSION_PARTS <<< "${PYTHON_VERSION}"
-# TF only supports python version ["3.9", "3.10", "3.11", "3.12"].
+# TF supports python version ["3.9", "3.10", "3.11", "3.12", "3.13"].
 export TF_PYTHON_VERSION="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}"
 export PROJECT_NAME=${WHEEL_PROJECT_NAME:-ai_edge_model_explorer_adapter}
 BUILD_DIR="gen/adapter_pip"

src/builtin-adapter/python/pip_package/setup_with_binary.py

@@ -57,6 +57,7 @@
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
         'Topic :: Scientific/Engineering',
         'Topic :: Scientific/Engineering :: Mathematics',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',

src/builtin-adapter/translate_helpers.cc

@@ -196,19 +196,22 @@ void AddCustomOptions(const ConstBytesAttr& const_bytes_attr,
 
 // Adds attributes from block arguments to the graph node.
 void AddBlockArgAttrs(const VisualizeConfig& config,
-                      const mlir::BlockArgument& arg,
+                      const mlir::DictionaryAttr& arg_attr_dict,
                       GraphNodeBuilder& builder) {
-  // TODO(b/412976666): Extract all attributes from block arguments, (currently
-  // only supports "sdy.shardings").
-  std::string value;
-  llvm::raw_string_ostream sstream(value);
-  mlir::sdy::TensorShardingAttr attr = mlir::sdy::getSharding(arg);
-  // Don't append sharding attribute to block argument if it is not sharded.
-  if (attr == mlir::sdy::TensorShardingAttr()) {
+  if (arg_attr_dict == nullptr) {
     return;
   }
-  PrintAttribute(attr, config.const_element_count_limit, sstream);
-  builder.AppendNodeAttribute(mlir::sdy::kShardingAttr, value);
+  for (const mlir::NamedAttribute& attr : arg_attr_dict) {
+    std::string value;
+    llvm::raw_string_ostream sstream(value);
+    const llvm::StringRef name = attr.getName();
+    const mlir::Attribute attr_val = attr.getValue();
+    if (SkipAttr(name)) {
+      continue;
+    }
+    PrintAttribute(attr_val, config.const_element_count_limit, sstream);
+    builder.AppendNodeAttribute(name, value);
+  }
 }
 
 // Appends node attributes to the graph node builder.
@@ -376,7 +379,8 @@ void AddGraphInputs(const VisualizeConfig& config, mlir::func::FuncOp& fop,
     }
     builder.AppendAttrToMetadata(EdgeType::kOutput, /*metadata_id=*/0,
                                  kTensorShape, GetTypeString(it.value()));
-    AddBlockArgAttrs(config, fop.getArgument(it.index()), builder);
+
+    AddBlockArgAttrs(config, fop.getArgAttrDict(it.index()), builder);
     subgraph.nodes.push_back(std::move(builder).Build());
   }
 }
@@ -623,11 +627,11 @@ absl::Status AddIncomingEdges(Operation& operation, GraphBuildContext& context,
 
 // Iterates through all result values of an operation and adds the output
 // metadata to the graph node.
-void AddOutputsMetadata(Operation& operation, GraphBuildContext& context,
-                        GraphNodeBuilder& builder) {
+void AddOutputsMetadata(const VisualizeConfig& config, Operation& operation,
+                        GraphBuildContext& context, GraphNodeBuilder& builder) {
   Counter& tensor_counter = context.tensor_counter;
   llvm::SmallVector<llvm::StringRef, 2> tensor_names;
-  if (IsTfliteDialect(operation)) {
+  if (IsTfliteDialect(operation) || config.add_tensor_name_attribute) {
     tensor_names = GetTfliteTensorNames(operation);
   }
   for (int output_index = 0, e = operation.getNumResults(); output_index < e;
@@ -674,7 +678,7 @@ absl::Status AddNestedRegionNode(const VisualizeConfig& config,
     RETURN_IF_ERROR(
         MaybeAddNestedRegion(config, operation, context, builder, subgraph));
   }
-  AddOutputsMetadata(operation, context, builder);
+  AddOutputsMetadata(config, operation, context, builder);
   subgraph.nodes.push_back(std::move(builder).Build());
   return absl::OkStatus();
 }
@@ -939,7 +943,7 @@ absl::Status AddNode(const VisualizeConfig& config, Operation& operation,
   }
   RETURN_IF_ERROR(
       MaybeAddNestedRegion(config, operation, context, builder, subgraph));
-  AddOutputsMetadata(operation, context, builder);
+  AddOutputsMetadata(config, operation, context, builder);
   subgraph.nodes.push_back(std::move(builder).Build());
   return absl::OkStatus();
 }

src/builtin-adapter/visualize_config.h

@@ -28,6 +28,10 @@ struct VisualizeConfig {
   // exceeds this threshold, the rest of data will be elided. The default
   // threshold is set to 16 (use -1 to print all).
   int const_element_count_limit = 16;
+
+  // If true, adds the `tensor_name` meta attribute to the node from the MLIR
+  // location. This attribute is always added for the tfl dialect.
+  bool add_tensor_name_attribute = false;
 };
 
 }  // namespace visualization_client

src/server/package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ai-edge-model-explorer"
-version = "0.1.25"
+version = "0.1.26"
 authors = [
   { name="Google LLC", email="opensource@google.com" },
 ]
@@ -12,13 +12,14 @@ classifiers = [
    "Programming Language :: Python :: 3.10",
    "Programming Language :: Python :: 3.11",
    "Programming Language :: Python :: 3.12",
+   "Programming Language :: Python :: 3.13",
    "License :: OSI Approved :: Apache Software License",
 ]
 dependencies = [
   "flask",
   "ipython",
   # Skip on windows.
-  "ai-edge-model-explorer-adapter == 0.1.11; sys_platform != 'win32'",
+  "ai-edge-model-explorer-adapter == 0.1.12; sys_platform != 'win32'",
   "packaging",
   "portpicker",
   "requests",