Change rfdetr naming, apply suggestions

benITo47 · benITo47 · commit 25e795c21d1e · 2026-03-16T18:06:23.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -103,5 +103,3 @@ packages/react-native-executorch/common/rnexecutorch/tests/integration/assets/mo
 Makefile
 *.pte
 
-# Test assets
-packages/react-native-executorch/common/rnexecutorch/tests/integration/assets/models/
diff --git a/apps/computer-vision/app/vision_camera/index.tsx b/apps/computer-vision/app/vision_camera/index.tsx
@@ -28,10 +28,10 @@ import Svg, { Path, Polygon } from 'react-native-svg';
 import { GeneratingContext } from '../../context';
 import Spinner from '../../components/Spinner';
 import ColorPalette from '../../colors';
-import ClassificationTask from './tasks/ClassificationTask';
-import ObjectDetectionTask from './tasks/ObjectDetectionTask';
-import SegmentationTask from './tasks/SegmentationTask';
-import InstanceSegmentationTask from './tasks/InstanceSegmentationTask';
+import ClassificationTask from '../../components/vision_camera/tasks/ClassificationTask';
+import ObjectDetectionTask from '../../components/vision_camera/tasks/ObjectDetectionTask';
+import SegmentationTask from '../../components/vision_camera/tasks/SegmentationTask';
+import InstanceSegmentationTask from '../../components/vision_camera/tasks/InstanceSegmentationTask';
 
 type TaskId =
   | 'classification'
@@ -40,15 +40,15 @@ type TaskId =
   | 'instanceSegmentation';
 type ModelId =
   | 'classification'
-  | 'objectDetection_ssdlite'
-  | 'objectDetection_rfdetr'
-  | 'segmentation_deeplab_resnet50'
-  | 'segmentation_deeplab_resnet101'
-  | 'segmentation_deeplab_mobilenet'
-  | 'segmentation_lraspp'
-  | 'segmentation_fcn_resnet50'
-  | 'segmentation_fcn_resnet101'
-  | 'segmentation_selfie'
+  | 'objectDetectionSsdlite'
+  | 'objectDetectionRfdetr'
+  | 'segmentationDeeplabResnet50'
+  | 'segmentationDeeplabResnet101'
+  | 'segmentationDeeplabMobilenet'
+  | 'segmentationLraspp'
+  | 'segmentationFcnResnet50'
+  | 'segmentationFcnResnet101'
+  | 'segmentationSelfie'
   | 'instanceSegmentation_yolo26n'
   | 'instanceSegmentation_rfdetr';
 
@@ -87,7 +87,7 @@ const TASKS: Task[] = [
     label: 'Inst Seg',
     variants: [
       { id: 'instanceSegmentation_yolo26n', label: 'YOLO26N Seg' },
-      { id: 'instanceSegmentation_rfdetr', label: 'RF-DETR Seg' },
+      { id: 'instanceSegmentation_rfdetr', label: 'RF-DETR Nano Seg' },
     ],
   },
 ];
@@ -216,7 +216,7 @@ export default function VisionCameraScreen() {
         <ObjectDetectionTask
           {...taskProps}
           activeModel={
-            activeModel as 'objectDetection_ssdlite' | 'objectDetection_rfdetr'
+            activeModel as 'objectDetectionSsdlite' | 'objectDetectionRfdetr'
           }
         />
       )}
@@ -225,13 +225,13 @@ export default function VisionCameraScreen() {
           {...taskProps}
           activeModel={
             activeModel as
-              | 'segmentation_deeplab_resnet50'
-              | 'segmentation_deeplab_resnet101'
-              | 'segmentation_deeplab_mobilenet'
-              | 'segmentation_lraspp'
-              | 'segmentation_fcn_resnet50'
-              | 'segmentation_fcn_resnet101'
-              | 'segmentation_selfie'
+              | 'segmentationDeeplabResnet50'
+              | 'segmentationDeeplabResnet101'
+              | 'segmentationDeeplabMobilenet'
+              | 'segmentationLraspp'
+              | 'segmentationFcnResnet50'
+              | 'segmentationFcnResnet101'
+              | 'segmentationSelfie'
           }
         />
       )}
diff --git a/apps/computer-vision/components/vision_camera/tasks/InstanceSegmentationTask.tsx b/apps/computer-vision/components/vision_camera/tasks/InstanceSegmentationTask.tsx
@@ -5,7 +5,7 @@ import { scheduleOnRN } from 'react-native-worklets';
 import {
   SegmentedInstance,
   YOLO26N_SEG,
-  RF_DETR_SEG,
+  RF_DETR_NANO_SEG,
   useInstanceSegmentation,
   CocoLabel,
   CocoLabelYolo,
@@ -40,7 +40,7 @@ export default function InstanceSegmentationTask({
     preventLoad: activeModel !== 'instanceSegmentation_yolo26n',
   });
   const rfdetr = useInstanceSegmentation({
-    model: RF_DETR_SEG,
+    model: RF_DETR_NANO_SEG,
     preventLoad: activeModel !== 'instanceSegmentation_rfdetr',
   });
 
diff --git a/packages/react-native-executorch/common/rnexecutorch/utils/computer_vision/Processing.cpp b/packages/react-native-executorch/common/rnexecutorch/utils/computer_vision/Processing.cpp
@@ -19,7 +19,7 @@ float computeIoU(const BBox &a, const BBox &b) {
 }
 
 BBox scaleBBox(const BBox &box, float widthRatio, float heightRatio) {
-  return BBox{
+  return {
       .x1 = box.x1 * widthRatio,
       .y1 = box.y1 * heightRatio,
       .x2 = box.x2 * widthRatio,
@@ -28,7 +28,7 @@ BBox scaleBBox(const BBox &box, float widthRatio, float heightRatio) {
 }
 
 BBox clipBBox(const BBox &box, float maxWidth, float maxHeight) {
-  return BBox{
+  return {
       .x1 = std::max(0.0f, box.x1),
       .y1 = std::max(0.0f, box.y1),
       .x2 = std::min(maxWidth, box.x2),
diff --git a/packages/react-native-executorch/common/rnexecutorch/utils/computer_vision/Processing.h b/packages/react-native-executorch/common/rnexecutorch/utils/computer_vision/Processing.h
@@ -2,6 +2,7 @@
 
 #include "Types.h"
 #include <algorithm>
+#include <ranges>
 #include <vector>
 
 namespace rnexecutorch::utils::computer_vision {
@@ -18,8 +19,8 @@ std::vector<T> nonMaxSuppression(std::vector<T> items, double iouThreshold) {
     return {};
   }
 
-  std::sort(items.begin(), items.end(),
-            [](const T &a, const T &b) { return a.score > b.score; });
+  std::ranges::sort(items,
+                    [](const T &a, const T &b) { return a.score > b.score; });
 
   std::vector<T> result;
   std::vector<bool> suppressed(items.size(), false);
diff --git a/packages/react-native-executorch/src/constants/modelUrls.ts b/packages/react-native-executorch/src/constants/modelUrls.ts
@@ -814,7 +814,7 @@ const YOLO26S_SEG_MODEL = `${URL_PREFIX}-yolo26-seg/${NEXT_VERSION_TAG}/yolo26s-
 const YOLO26M_SEG_MODEL = `${URL_PREFIX}-yolo26-seg/${NEXT_VERSION_TAG}/yolo26m-seg/xnnpack/yolo26m-seg.pte`;
 const YOLO26L_SEG_MODEL = `${URL_PREFIX}-yolo26-seg/${NEXT_VERSION_TAG}/yolo26l-seg/xnnpack/yolo26l-seg.pte`;
 const YOLO26X_SEG_MODEL = `${URL_PREFIX}-yolo26-seg/${NEXT_VERSION_TAG}/yolo26x-seg/xnnpack/yolo26x-seg.pte`;
-const RF_DETR_SEG_MODEL = `${URL_PREFIX}-rfdetr-nano-segmentation/${NEXT_VERSION_TAG}/rfdetr_segmentation.pte`;
+const RF_DETR_NANO_SEG_MODEL = `${URL_PREFIX}-rfdetr-nano-segmentation/${NEXT_VERSION_TAG}/rfdetr_segmentation.pte`;
 /**
  * @category Models - Instance Segmentation
  */
@@ -858,9 +858,9 @@ export const YOLO26X_SEG = {
 /**
  * @category Models - Instance Segmentation
  */
-export const RF_DETR_SEG = {
-  modelName: 'rfdetr-seg',
-  modelSource: RF_DETR_SEG_MODEL,
+export const RF_DETR_NANO_SEG = {
+  modelName: 'rfdetr-nano-seg',
+  modelSource: RF_DETR_NANO_SEG_MODEL,
 } as const;
 
 // Image Embeddings
diff --git a/packages/react-native-executorch/src/hooks/computer_vision/useSemanticSegmentation.ts b/packages/react-native-executorch/src/hooks/computer_vision/useSemanticSegmentation.ts
@@ -21,7 +21,7 @@ import { useModuleFactory } from '../useModuleFactory';
  * @example
  * ```ts
  * const { isReady, forward } = useSemanticSegmentation({
- *   model: { modelName: 'deeplab-v3', modelSource: DEEPLAB_V3_RESNET50 },
+ *   model: { modelName: 'deeplab-v3-resnet50', modelSource: DEEPLAB_V3_RESNET50 },
  * });
  * ```
  *
diff --git a/packages/react-native-executorch/src/modules/computer_vision/InstanceSegmentationModule.ts b/packages/react-native-executorch/src/modules/computer_vision/InstanceSegmentationModule.ts
@@ -34,7 +34,7 @@ const YOLO_SEG_CONFIG = {
   },
 } satisfies InstanceSegmentationConfig<typeof CocoLabelYolo>;
 
-const RF_DETR_SEG_CONFIG = {
+const RF_DETR_NANO_SEG_CONFIG = {
   preprocessorConfig: { normMean: IMAGENET1K_MEAN, normStd: IMAGENET1K_STD },
   labelMap: CocoLabel,
   availableInputSizes: undefined,
@@ -73,7 +73,7 @@ const ModelConfigs = {
   'yolo26m-seg': YOLO_SEG_CONFIG,
   'yolo26l-seg': YOLO_SEG_CONFIG,
   'yolo26x-seg': YOLO_SEG_CONFIG,
-  'rfdetr-seg': RF_DETR_SEG_CONFIG,
+  'rfdetr-nano-seg': RF_DETR_NANO_SEG_CONFIG,
 } as const satisfies Record<
   InstanceSegmentationModelName,
   | InstanceSegmentationConfig<typeof CocoLabel>
@@ -109,6 +109,7 @@ type ResolveLabels<T extends InstanceSegmentationModelName | LabelEnum> =
  *
  * Supported models (download from HuggingFace):
  * - `yolo26n-seg`, `yolo26s-seg`, `yolo26m-seg`, `yolo26l-seg`, `yolo26x-seg` - YOLO models with COCO labels (80 classes)
+ * - `rfdetr-nano-seg` - RF-DETR Nano model with COCO labels (80 classes)
  *
  * @typeParam T - Either a pre-configured model name from {@link InstanceSegmentationModelName}
  *   or a custom label map conforming to {@link LabelEnum}.
diff --git a/packages/react-native-executorch/src/types/instanceSegmentation.ts b/packages/react-native-executorch/src/types/instanceSegmentation.ts
@@ -120,7 +120,7 @@ export type InstanceSegmentationModelSources =
   | { modelName: 'yolo26m-seg'; modelSource: ResourceSource }
   | { modelName: 'yolo26l-seg'; modelSource: ResourceSource }
   | { modelName: 'yolo26x-seg'; modelSource: ResourceSource }
-  | { modelName: 'rfdetr-seg'; modelSource: ResourceSource };
+  | { modelName: 'rfdetr-nano-seg'; modelSource: ResourceSource };
 
 /**
  * Union of all built-in instance segmentation model names.

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import { useModuleFactory } from '../useModuleFactory';`
`21`	`21`	`* @example`
`22`	`22`	* ```ts
`23`	`23`	`* const { isReady, forward } = useSemanticSegmentation({`
`24`		`- * model: { modelName: 'deeplab-v3', modelSource: DEEPLAB_V3_RESNET50 },`
	`24`	`+ * model: { modelName: 'deeplab-v3-resnet50', modelSource: DEEPLAB_V3_RESNET50 },`
`25`	`25`	`* });`
`26`	`26`	* ```
`27`	`27`	`*`