diff --git a/ultralytics/engine/exporter.py b/ultralytics/engine/exporter.py index 5bd4ce1d..d15b9542 100644 --- a/ultralytics/engine/exporter.py +++ b/ultralytics/engine/exporter.py @@ -1241,7 +1241,7 @@ class Exporter: self.args.opset = min(self.args.opset or 19, 19) # rknn-toolkit expects opset<=19 f_onnx = self.export_onnx() output_dir = Path(str(self.file).replace(self.file.suffix, f"_rknn_model{os.sep}")) - dataset = None + rknn_dataset = None if self.args.int8: dataloader = self.get_int8_calibration_dataloader(prefix) image_paths = getattr(dataloader.dataset, "im_files", None) @@ -1250,14 +1250,14 @@ class Exporter: if not image_paths: raise ValueError("RKNN INT8 export requires a calibration dataset with image file paths.") output_dir.mkdir(parents=True, exist_ok=True) - dataset = output_dir / "dataset.txt" - dataset.write_text("\n".join(str(Path(x).resolve()) for x in image_paths) + "\n") + rknn_dataset = output_dir / "dataset.txt" + rknn_dataset.write_text("\n".join(str(Path(x).resolve()) for x in image_paths) + "\n") return onnx2rknn( onnx_file=f_onnx, output_dir=output_dir, name=self.args.name, int8=self.args.int8, - dataset=dataset, + dataset=rknn_dataset, metadata=self.metadata, prefix=prefix, ) diff --git a/ultralytics/utils/export/rknn.py b/ultralytics/utils/export/rknn.py index cfe65d72..5a103c30 100644 --- a/ultralytics/utils/export/rknn.py +++ b/ultralytics/utils/export/rknn.py @@ -30,7 +30,9 @@ def onnx2rknn( name (str): Target platform name (e.g. ``"rk3588"``). int8 (bool): Whether to enable INT8 quantization. When False, RKNN Toolkit builds a floating-point model for FP16-capable targets. - dataset (Path | str | None): Path to the RKNN calibration dataset text file, required when ``int8=True``. + dataset (Path | str | None): Path to the generated RKNN Toolkit calibration image-list file, required when + ``int8=True``. Users should pass YOLO dataset YAMLs to ``export(data=...)``; ``export_rknn()`` converts them + to this internal image-path list. metadata (dict | None): Metadata saved as ``metadata.yaml``. prefix (str): Prefix for log messages. @@ -42,8 +44,12 @@ def onnx2rknn( f"Rockchip target '{name}' requires int8=True. Use a target that supports floating-point builds " f"(e.g. rk2118, rk3562, rk3566, rk3568, rk3576, rk3588, rv1126b) or export with int8=True." ) - if int8 and not dataset: - raise ValueError("RKNN INT8 export requires a calibration dataset file.") + if int8: + if not dataset: + raise ValueError("RKNN INT8 export requires a generated calibration image-list file.") + dataset = Path(dataset) + if not dataset.is_file(): + raise ValueError(f"Generated RKNN INT8 calibration image-list file not found: {dataset}") from ultralytics.utils.checks import check_requirements