Update acuity.js (#1423)

Author: lutzroeder

source/acuity.js

@@ -33,13 +33,15 @@ acuity.Graph = class {
         this.nodes = [];
         this.inputs = [];
         this.outputs = [];
+        this.metrics = [];
         const values = new Map();
         const value = (name) => {
             if (!values.has(name)) {
                 values.set(name, { name, shape: null });
             }
             return values.get(name);
         };
+        let totalFlops = 0;
         for (const [name, layer] of Object.entries(model.Layers)) {
             layer.inputs = layer.inputs.map((input) => {
                 return value(input);
@@ -64,7 +66,19 @@ acuity.Graph = class {
                 output.shape = shape;
                 return output;
             });
+            // Add other layer types (e.g., pooling, batch norm, etc.) as needed.
+            if (layer.type === 'Conv2D') {
+                const { kernelShape, inputShape, outputShape } = layer;
+                const [kH, kW] = kernelShape;
+                const [inC] = inputShape;
+                const [outC, oH, oW] = outputShape;
+                totalFlops += kH * kW * inC * oH * oW * outC;
+            } else if (layer.type === 'Dense') {
+                const { inputSize, outputSize } = layer;
+                totalFlops += inputSize * outputSize;
+            }
         }
+        this.metrics.push(new acuity.Argument('flops', totalFlops));
         acuity.Inference.infer(model.Layers);
         for (const [name, obj] of values) {
             const type = new acuity.TensorType(null, new acuity.TensorShape(obj.shape));

source/view.js

@@ -2855,7 +2855,7 @@ view.TextView = class extends view.Control {
         super(context);
         this.element = this.createElement('div', 'sidebar-item-value');
         let className = 'sidebar-item-value-line';
-        if (value) {
+        if (value !== null && value !== undefined) {
             const list = Array.isArray(value) ? value : [value];
             for (const item of list) {
                 const line = this.createElement('div', className);
@@ -3641,6 +3641,13 @@ view.ModelSidebar = class extends view.ObjectSidebar {
                 this.addProperty(argument.name, argument.value);
             }
         }
+        const metrics = model.metrics;
+        if (Array.isArray(metrics) && metrics.length > 0) {
+            this.addHeader('Metrics');
+            for (const argument of metrics) {
+                this.addProperty(argument.name, argument.value);
+            }
+        }
         if (graph) {
             if (graph.version) {
                 this.addProperty('version', graph.version);
@@ -3675,6 +3682,13 @@ view.ModelSidebar = class extends view.ObjectSidebar {
                     this.addProperty(argument.name, argument.value);
                 }
             }
+            const metrics = graph.metrics;
+            if (Array.isArray(metrics) && metrics.length > 0) {
+                this.addHeader('Metrics');
+                for (const argument of metrics) {
+                    this.addProperty(argument.name, argument.value);
+                }
+            }
         }
     }