Add more to chapel-webcam demo.

Author: Iainmon

demos/video/chapel-webcam/smol.chpl

@@ -55,10 +55,10 @@ export proc globalLoadModel() {
 
 var lastFrame = startTime;
 
-param chaiImpl = true;
+config const chaiImpl = true;
 
 
-const windowSize = 20;
+const windowSize = 5;
 var frameCount = 0;
 var runningSum: real = 0;
 var windowSum: real = 0;
@@ -95,11 +95,11 @@ export proc getNewFrame(ref frame: [] real(32),height: int, width: int,channels:
     if chaiImpl {
         const dtInput = (new dynamicTensor(frame)).reshape((...shape));
         const dtOutput = modelLayer!.forward(dtInput);
+        // const outputFrame = dtOutput.rankedData(1);
         const outputFrame = dtOutput.flatten().toArray(1);
         lastFrame = getTime();
         return outputFrame;
     } else {
-
         var btFrame: Bridge.bridge_tensor_t = Bridge.createBridgeTensorWithShape(frame,shape);
         var bt: Bridge.bridge_tensor_t;
         if modelPath == "sobel.pt" then

lib/DynamicTensor.chpl

@@ -141,10 +141,10 @@ record dynamicTensor : serializable {
         return (this.meta.borrow() : borrowed BaseTensorResource(eltType, rank)).grad;
 
     inline proc ref rankedData(param rank: int) ref : [] eltType do
-        return (this.meta.borrow() : borrowed BaseTensorResource(eltType, rank)).data;
+        return (this.meta.borrow() : borrowed BaseTensorResource(eltType, rank)).array.data;
 
     inline proc rankedData(param rank: int): [] eltType do
-        return (this.meta.borrow() : borrowed BaseTensorResource(eltType, rank)).data;
+        return (this.meta.borrow() : borrowed BaseTensorResource(eltType, rank)).array.data;
 
 
     proc toNDArray(param rank: int) : ndarray(rank,eltType) {
@@ -189,7 +189,7 @@ operator :(in t: dynamicTensor(?eltType), type toType: ndarray(?rank,?toEltType)
 operator :(in t: dynamicTensor(?eltType), type btType: Bridge.tensorHandle(eltType)): Bridge.tensorHandle(eltType) {
     for param rank in 1..maxRank do
         if t.checkRank(rank) then
-            return t.forceRank(rank) : btType;
+            return t.forceRank(rank).array : btType;
     halt("Could not identify rank for this: ", t);
 }
 
@@ -200,6 +200,12 @@ operator :(bt: Bridge.tensorHandle(real(32)), type tType: dynamicTensor(?eltType
     halt("Could not identify rank for this: ", tType:string);
 }
 
+// proc type dynamicTensor.fromBridgeTensor(handle: Bridge.tensorHandle(defaultEltType)): dynamicTensor(defaultEltType) {
+//     for param rank in 1..maxRank do
+//         if bt.dim == rank then
+//             return 
+// }
+
 proc type dynamicTensor.detachMode() param : bool {
     return defaultDetachedMode;
 }