cleanup syntax

RunYOLO.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using Unity.InferenceEngine;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.Video;
-using System.IO;
-using FF = Unity.InferenceEngine.Functional;
 
 /*
  *  YOLO Inference Script
@@ -51,10 +51,12 @@ public class RunYOLO : MonoBehaviour
     List<GameObject> boxPool = new();
 
     [Tooltip("Intersection over union threshold used for non-maximum suppression")]
-    [SerializeField, Range(0, 1)] float iouThreshold = 0.5f;
+    [SerializeField, Range(0, 1)]
+    float iouThreshold = 0.5f;
 
     [Tooltip("Confidence score threshold used for non-maximum suppression")]
-    [SerializeField, Range(0, 1)] float scoreThreshold = 0.5f;
+    [SerializeField, Range(0, 1)]
+    float scoreThreshold = 0.5f;
 
     Tensor<float> centersToCorners;
     //bounding box data
@@ -103,15 +105,15 @@ public class RunYOLO : MonoBehaviour
         //Here we transform the output of the model1 by feeding it through a Non-Max-Suppression layer.
         var graph = new FunctionalGraph();
         var inputs = graph.AddInputs(model1);
-        var modelOutput = FF.Forward(model1, inputs)[0];                        //shape=(1,84,8400)
+        var modelOutput = Functional.Forward(model1, inputs)[0];                        //shape=(1,84,8400)
         var boxCoords = modelOutput[0, 0..4, ..].Transpose(0, 1);               //shape=(8400,4)
         var allScores = modelOutput[0, 4.., ..];                                //shape=(80,8400)
-        var scores = FF.ReduceMax(allScores, 0);                                //shape=(8400)
-        var classIDs = FF.ArgMax(allScores, 0);                                 //shape=(8400)
-        var boxCorners = FF.MatMul(boxCoords, FF.Constant(centersToCorners));   //shape=(8400,4)
-        var indices = FF.NMS(boxCorners, scores, iouThreshold, scoreThreshold); //shape=(N)
-        var coords = FF.IndexSelect(boxCoords, 0, indices);                     //shape=(N,4)
-        var labelIDs = FF.IndexSelect(classIDs, 0, indices);                    //shape=(N)
+        var scores = Functional.ReduceMax(allScores, 0);                                //shape=(8400)
+        var classIDs = Functional.ArgMax(allScores, 0);                                 //shape=(8400)
+        var boxCorners = Functional.MatMul(boxCoords, Functional.Constant(centersToCorners));   //shape=(8400,4)
+        var indices = Functional.NMS(boxCorners, scores, iouThreshold, scoreThreshold); //shape=(N)
+        var coords = Functional.IndexSelect(boxCoords, 0, indices);                     //shape=(N,4)
+        var labelIDs = Functional.IndexSelect(classIDs, 0, indices);                    //shape=(N)
 
         //Create worker to run model
         worker = new Worker(graph.Compile(coords, labelIDs), backend);
@@ -247,7 +249,7 @@ public class RunYOLO : MonoBehaviour
         }
     }
 
-    private void OnDestroy()
+    void OnDestroy()
     {
         centersToCorners?.Dispose();
         worker?.Dispose();