Sync from arm/Optimized-Runtimes via hub-sync

Makefile

@@ -60,9 +60,13 @@ endif
 
 # Ultralytics benchmark
 ULTRALYTICS_VENV ?= $(ROOT)/benchmarks/ultralytics/.venv
-# TODO: Fetch and use the pinned coco-128-by-sa revision by default once the
-# dataset is public.
-DATA ?= coco128.yaml
+DATASET_REVISION := 97d6ea181e9dd0784db880b705e426ad23d424e1
+DATASET_DIR := $(ROOT)/downloads/datasets/coco-128-by-sa-$(DATASET_REVISION)
+DATASET_CONFIG := $(DATASET_DIR)/benchmark.yaml
+DATA ?= $(DATASET_CONFIG)
+ifeq ($(origin DATA), file)
+DATA_REQUIREMENT := $(DATASET_CONFIG)
+endif
 SOURCE_REVISION ?= $(shell git rev-parse HEAD)
 # Evidence is immutable, so each default invocation needs a fresh directory.
 BENCHMARK_RUN_ID := $(shell date -u +%Y%m%dT%H%M%S%NZ)-$(shell printf '%.12s' "$(SOURCE_REVISION)")
@@ -232,21 +236,22 @@ release: runtime _release-converter _release-api
 # dependencies; callers provide the hash-locked build environment defined by
 # requirements-build.txt. CI installs that environment with --require-hashes.
 .PHONY: _release-converter
-_release-converter:
+_release-converter: _dev
 	mkdir -p "$(PACKAGE_DIST)"
 	@# Give setuptools a self-contained project without writing build state into
 	@# the converter source directory or duplicating the repository version.
 	@staging="$$(mktemp -d)"; \
 	  trap 'rm -rf -- "$$staging"' EXIT; \
 	  cp src/converter/*.py src/converter/pyproject.toml \
-	    src/converter/VERSION src/converter/LICENSE "$$staging/"; \
-	  PIP_CONFIG_FILE=/dev/null "$(PYTHON)" -m pip wheel \
+	    src/converter/VERSION "$$staging/"; \
+	  install --mode 0644 "$(ROOT)/../LICENSE" "$$staging/LICENSE"; \
+	  PIP_CONFIG_FILE=/dev/null "$(DEV_VENV)/bin/python" -m pip wheel \
 	    --no-deps --no-build-isolation --wheel-dir "$(PACKAGE_DIST)" "$$staging"
 
 .PHONY: _release-api
-_release-api:
+_release-api: _dev
 	mkdir -p "$(PACKAGE_DIST)"
-	PIP_CONFIG_FILE=/dev/null "$(PYTHON)" -m pip wheel \
+	PIP_CONFIG_FILE=/dev/null "$(DEV_VENV)/bin/python" -m pip wheel \
 	  --no-deps --no-build-isolation --wheel-dir "$(PACKAGE_DIST)" .
 
 # Examples
@@ -350,9 +355,14 @@ $(ULTRALYTICS_VENV)/pyvenv.cfg: benchmarks/ultralytics/patch.sh \
     $(wildcard src/runtime/api/python/arm_yolo26n/*.py)
 	./benchmarks/ultralytics/patch.sh "$(ULTRALYTICS_VENV)"
 
+$(DATASET_CONFIG): benchmarks/ultralytics/download_dataset.sh
+	@printf 'Downloading coco-128-by-sa dataset revision %s\n' "$(DATASET_REVISION)"
+	./benchmarks/ultralytics/download_dataset.sh \
+	  "$(DATASET_REVISION)" "$(DATASET_DIR)"
+
 .PHONY: ultralytics-benchmark
 ultralytics-benchmark: $(RUNTIME) $(MODEL)/manifest.json $(MODEL)/model.bin \
-    $(ULTRALYTICS_VENV)/pyvenv.cfg
+    $(ULTRALYTICS_VENV)/pyvenv.cfg $(DATA_REQUIREMENT)
 	"$(PYTHON)" -m benchmarks.ultralytics.benchmark \
 	  --runtime "$(RUNTIME)" \
 	  --model "$(MODEL)" \

README.md

@@ -53,7 +53,10 @@ sudo apt install --yes --no-install-recommends \
   ca-certificates \
   curl \
   git \
+  libgl1 \
+  libglib2.0-0t64 \
   make \
+  patch \
   python3 \
   python3-venv \
   tar \
@@ -106,6 +109,7 @@ sudo apt install --yes --no-install-recommends \
   build-essential \
   ca-certificates \
   cmake \
+  curl \
   git \
   patch \
   python3 \

benchmarks/reporting/baseline.md

@@ -6,8 +6,8 @@ changes must use the same dataset and validation configuration before comparing
 their results with this measurement.
 
 The measurement uses the published Hugging Face dataset revision identified
-below. Benchmark operators must download that revision and supply its local
-validation configuration explicitly with `DATA=/path/to/data.yaml`.
+below. The default benchmark target downloads and uses that pinned revision
+automatically.
 
 ## Measurement
 

benchmarks/ultralytics/README.md

@@ -7,6 +7,7 @@ runtimes.
 ## Usage
 
 Run these commands from the `yolo26-raspberry-pi-5/` runtime directory.
+Install the [project prerequisites](../../README.md#prerequisites) first.
 
 Run the benchmark:
 
@@ -14,8 +15,10 @@ Run the benchmark:
 make ultralytics-benchmark
 ```
 
-The target prepares any missing default runtime, converted model, and pinned
-benchmark environment.
+The target prepares any missing default runtime, converted model, pinned
+benchmark environment, and pinned revision of the public
+[`Arm/coco-128-by-sa`](https://huggingface.co/datasets/Arm/coco-128-by-sa)
+dataset.
 
 Select another Ultralytics dataset configuration with `DATA`:
 

benchmarks/ultralytics/download_dataset.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+revision="$1"
+output="$2"
+base="https://huggingface.co/datasets/Arm/coco-128-by-sa/resolve/$revision"
+manifest="LICENSE_MANIFEST.csv"
+
+# The manifest is the dataset's lightweight index of image paths. Publish it
+# only after curl succeeds so an interrupted transfer cannot become the index.
+mkdir -p "$output"
+curl --fail --location --retry 3 --silent --show-error \
+  --output "$output/$manifest.part" "$base/$manifest"
+mv "$output/$manifest.part" "$output/$manifest"
+
+paths=(
+  data.yaml
+)
+
+# The first three CSV fields contain no commas. Validate them before using
+# repository-controlled values as local paths and download URLs.
+while IFS=, read -r image_id file_name relative_path _; do
+  if [[ "$image_id" == image_id ]]; then
+    continue
+  fi
+  [[ "$image_id" =~ ^[0-9]+$ ]]
+  [[ "$file_name" =~ ^[0-9]{12}\.jpg$ ]]
+  [[ "$relative_path" == "images/train2017/$file_name" ]]
+  paths+=("$relative_path" "labels/train2017/${file_name%.jpg}.txt")
+done < "$output/$manifest"
+
+# Build one bounded parallel curl operation. --next separates the options for
+# each transfer, and every transfer writes to a temporary path.
+arguments=(--parallel --parallel-max 8)
+first=true
+for path in "${paths[@]}"; do
+  mkdir -p "$(dirname "$output/$path")"
+  if ! $first; then
+    arguments+=(--next)
+  fi
+  first=false
+  arguments+=(
+    --fail --location --retry 3 --silent --show-error
+    --url "$base/$path" --output "$output/$path.part"
+  )
+done
+curl "${arguments[@]}"
+
+# Publish the dataset files only after every parallel transfer has succeeded.
+for path in "${paths[@]}"; do
+  mv "$output/$path.part" "$output/$path"
+done
+
+# Ultralytics resolves "path: ." against its working directory rather than the
+# source YAML's directory. Generate an absolute-path benchmark configuration,
+# escaping single quotes according to YAML rules. Written last, this file is
+# also the Make target that records successful dataset preparation.
+escaped_output=${output//\'/\'\'}
+{
+  printf "path: '%s'\n" "$escaped_output"
+  tail -n +2 "$output/data.yaml"
+} > "$output/benchmark.yaml.part"
+mv "$output/benchmark.yaml.part" "$output/benchmark.yaml"

examples/picamera2/README.md

@@ -36,6 +36,14 @@ Confirm camera access:
 rpicam-hello --list-cameras
 ```
 
+For a graphical preview, also install the Qt and OpenGL Python bindings:
+
+```bash
+sudo apt install --yes --no-install-recommends \
+  python3-opengl \
+  python3-pyqt5
+```
+
 To use your own compatible model, see [Acquiring a model](../../README.md#acquiring-a-model).
 Otherwise, the pinned standard YOLO26n checkpoint is downloaded and converted
 automatically.

src/converter/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.