edge-impulse-linux 1.15.3 → 1.15.5

package/build/sdk/studio/sdk/model/tunerBlockSearchSpaceTemplates.js

@@ -0,0 +1,39 @@
+"use strict";
+/**
+ * Edge Impulse API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TunerBlockSearchSpaceTemplates = void 0;
+class TunerBlockSearchSpaceTemplates {
+    static getAttributeTypeMap() {
+        return TunerBlockSearchSpaceTemplates.attributeTypeMap;
+    }
+}
+exports.TunerBlockSearchSpaceTemplates = TunerBlockSearchSpaceTemplates;
+TunerBlockSearchSpaceTemplates.discriminator = undefined;
+TunerBlockSearchSpaceTemplates.attributeTypeMap = [
+    {
+        "name": "template",
+        "baseName": "template",
+        "type": "string"
+    },
+    {
+        "name": "group",
+        "baseName": "group",
+        "type": "string"
+    },
+    {
+        "name": "blocks",
+        "baseName": "blocks",
+        "type": "TunerBlockBlocks"
+    }
+];
+//# sourceMappingURL=tunerBlockSearchSpaceTemplates.js.map

package/build/sdk/studio/sdk/model/tunerBlockSearchSpaceTemplates.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tunerBlockSearchSpaceTemplates.js","sourceRoot":"","sources":["../../../../../sdk/studio/sdk/model/tunerBlockSearchSpaceTemplates.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAIH,MAAa,8BAA8B;IAwBvC,MAAM,CAAC,mBAAmB;QACtB,OAAO,8BAA8B,CAAC,gBAAgB,CAAC;IAC3D,CAAC;;AA1BL,wEA2BC;AAtBU,4CAAa,GAAuB,SAAS,CAAC;AAE9C,+CAAgB,GAA0D;IAC7E;QACI,MAAM,EAAE,UAAU;QAClB,UAAU,EAAE,UAAU;QACtB,MAAM,EAAE,QAAQ;KACnB;IACD;QACI,MAAM,EAAE,OAAO;QACf,UAAU,EAAE,OAAO;QACnB,MAAM,EAAE,QAAQ;KACnB;IACD;QACI,MAAM,EAAE,QAAQ;QAChB,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,kBAAkB;KAC7B;CAAK,CAAC"}

package/build/sdk/studio/sdk/model/tunerBlockVariants.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Edge Impulse API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { TunerBlockSearchSpaceTemplates } from './tunerBlockSearchSpaceTemplates';
+export declare class TunerBlockVariants {
+    'title'?: string;
+    'key'?: string;
+    'regression'?: boolean;
+    'objectDetection'?: boolean;
+    'projectDataType'?: string;
+    'searchSpaceTemplates'?: Array<TunerBlockSearchSpaceTemplates>;
+    'params'?: {
+        [key: string]: Array<object>;
+    };
+    static discriminator: string | undefined;
+    static attributeTypeMap: Array<{
+        name: string;
+        baseName: string;
+        type: string;
+    }>;
+    static getAttributeTypeMap(): {
+        name: string;
+        baseName: string;
+        type: string;
+    }[];
+}

package/build/sdk/studio/sdk/model/tunerBlockVariants.js

@@ -0,0 +1,59 @@
+"use strict";
+/**
+ * Edge Impulse API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TunerBlockVariants = void 0;
+class TunerBlockVariants {
+    static getAttributeTypeMap() {
+        return TunerBlockVariants.attributeTypeMap;
+    }
+}
+exports.TunerBlockVariants = TunerBlockVariants;
+TunerBlockVariants.discriminator = undefined;
+TunerBlockVariants.attributeTypeMap = [
+    {
+        "name": "title",
+        "baseName": "title",
+        "type": "string"
+    },
+    {
+        "name": "key",
+        "baseName": "key",
+        "type": "string"
+    },
+    {
+        "name": "regression",
+        "baseName": "regression",
+        "type": "boolean"
+    },
+    {
+        "name": "objectDetection",
+        "baseName": "objectDetection",
+        "type": "boolean"
+    },
+    {
+        "name": "projectDataType",
+        "baseName": "projectDataType",
+        "type": "string"
+    },
+    {
+        "name": "searchSpaceTemplates",
+        "baseName": "searchSpaceTemplates",
+        "type": "Array<TunerBlockSearchSpaceTemplates>"
+    },
+    {
+        "name": "params",
+        "baseName": "params",
+        "type": "{ [key: string]: Array<object>; }"
+    }
+];
+//# sourceMappingURL=tunerBlockVariants.js.map

package/build/sdk/studio/sdk/model/tunerBlockVariants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tunerBlockVariants.js","sourceRoot":"","sources":["../../../../../sdk/studio/sdk/model/tunerBlockVariants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAIH,MAAa,kBAAkB;IAgD3B,MAAM,CAAC,mBAAmB;QACtB,OAAO,kBAAkB,CAAC,gBAAgB,CAAC;IAC/C,CAAC;;AAlDL,gDAmDC;AA1CU,gCAAa,GAAuB,SAAS,CAAC;AAE9C,mCAAgB,GAA0D;IAC7E;QACI,MAAM,EAAE,OAAO;QACf,UAAU,EAAE,OAAO;QACnB,MAAM,EAAE,QAAQ;KACnB;IACD;QACI,MAAM,EAAE,KAAK;QACb,UAAU,EAAE,KAAK;QACjB,MAAM,EAAE,QAAQ;KACnB;IACD;QACI,MAAM,EAAE,YAAY;QACpB,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE,SAAS;KACpB;IACD;QACI,MAAM,EAAE,iBAAiB;QACzB,UAAU,EAAE,iBAAiB;QAC7B,MAAM,EAAE,SAAS;KACpB;IACD;QACI,MAAM,EAAE,iBAAiB;QACzB,UAAU,EAAE,iBAAiB;QAC7B,MAAM,EAAE,QAAQ;KACnB;IACD;QACI,MAAM,EAAE,sBAAsB;QAC9B,UAAU,EAAE,sBAAsB;QAClC,MAAM,EAAE,uCAAuC;KAClD;IACD;QACI,MAAM,EAAE,QAAQ;QAChB,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,mCAAmC;KAC9C;CAAK,CAAC"}

package/examples/js/classify-camera.js

@@ -48,7 +48,9 @@ const { ImageClassifier, LinuxImpulseRunner, Ffmpeg, Imagesnap, RunnerHelloHasAn
             camera = new Imagesnap();
         }
         else if (process.platform === 'linux') {
-            camera = new Ffmpeg(false /* verbose */);
+            camera = new Ffmpeg(false /* verbose */, {
+                scaleAndCropInPipeline: true,
+            });
         }
         else {
             throw new Error('Unsupported platform "' + process.platform + '"');
@@ -71,7 +73,12 @@ const { ImageClassifier, LinuxImpulseRunner, Ffmpeg, Imagesnap, RunnerHelloHasAn
         await camera.start({
             device: device,
             intervalMs: 1000 / fps,
-            dimensions: dimensions
+            dimensions: dimensions,
+            inferenceDimensions: {
+                width: model.modelParameters.image_input_width,
+                height: model.modelParameters.image_input_height,
+                resizeMode: model.modelParameters.image_resize_mode || 'none',
+            },
         });
 
         camera.on('error', error => {

package/examples/ts/classify-camera-webserver.ts

@@ -1,4 +1,4 @@
-import { ImageClassifier, LinuxImpulseRunner, Ffmpeg, ICamera, Imagesnap, ModelInformation } from "../../library";
+import { ImageClassifier, LinuxImpulseRunner, ICamera, Imagesnap, ModelInformation, GStreamer } from "../../library";
 import { ips } from "../../cli-common/get-ips";
 import sharp from 'sharp';
 import express = require('express');
@@ -58,7 +58,7 @@ import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-ru
             camera = new Imagesnap();
         }
         else if (process.platform === 'linux') {
-            camera = new Ffmpeg(false /* verbose */);
+            camera = new GStreamer(false /* verbose */);
         }
         else {
             throw new Error('Unsupported platform "' + process.platform + '"');
@@ -81,7 +81,12 @@ import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-ru
         await camera.start({
             device: device,
             intervalMs: 1000 / fps,
-            dimensions: dimensions
+            dimensions: dimensions,
+            inferenceDimensions: {
+                width: model.modelParameters.image_input_width,
+                height: model.modelParameters.image_input_height,
+                resizeMode: model.modelParameters.image_resize_mode || 'none',
+            },
         });
 
         camera.on('error', error => {

package/examples/ts/classify-camera.ts

@@ -1,4 +1,4 @@
-import { ImageClassifier, LinuxImpulseRunner, Ffmpeg, ICamera, Imagesnap } from "../../library";
+import { ImageClassifier, LinuxImpulseRunner, ICamera, Imagesnap, GStreamer } from "../../library";
 import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-runner";
 
 (async () => {
@@ -49,7 +49,9 @@ import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-ru
             camera = new Imagesnap();
         }
         else if (process.platform === 'linux') {
-            camera = new Ffmpeg(false /* verbose */);
+            camera = new GStreamer(false /* verbose */, {
+                scaleAndCropInPipeline: true,
+            });
         }
         else {
             throw new Error('Unsupported platform "' + process.platform + '"');
@@ -72,7 +74,12 @@ import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-ru
         await camera.start({
             device: device,
             intervalMs: 1000 / fps,
-            dimensions: dimensions
+            dimensions: dimensions,
+            inferenceDimensions: {
+                width: model.modelParameters.image_input_width,
+                height: model.modelParameters.image_input_height,
+                resizeMode: model.modelParameters.image_resize_mode || 'none',
+            },
         });
 
         camera.on('error', error => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-impulse-linux",
-  "version": "1.15.3",
+  "version": "1.15.5",
   "description": "Node.js SDK and tools for Edge Impulse for Linux",
   "directories": {
     "example": "examples"

package/test/gstreamer.test.ts

@@ -5234,6 +5234,7 @@ Freeing pipeline ...
 
             const gstreamer = new GStreamer(false, {
                 spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: true,
             });
             await gstreamer.init();
             const launchResp = await gstreamer.getGstreamerLaunchCommand({
@@ -5246,7 +5247,195 @@ Freeing pipeline ...
                     type: "pylonsrc",
                 }],
                 videoSource: 'pylonsrc',
-            }, { width: 1440, height: 1080 });
+            }, { width: 1440, height: 1080 }, undefined);
+
+            // console.log('launchResp', launchResp);
+
+            assert.equal(launchResp.invokeProcess, 'spawn');
+            assert.equal(launchResp.command, 'gst-launch-1.0');
+            assert.equal(launchResp.args.join(' '),
+                'pylonsrc ! video/x-raw,width=1440,height=1080 ! videoconvert ! jpegenc ! multifilesink location=test%05d.jpg');
+        });
+
+        it("w/ inference dims #1", async () => {
+            const spawnHelper: SpawnHelperType = async (command: string,
+                args: string[],
+                opts: {
+                    ignoreErrors: boolean,
+                    cwd ? : string
+                } = {
+                    ignoreErrors: false
+                }) => {
+
+                if (command === 'which') {
+                    return  '';
+                }
+                else {
+                    throw new Error('spawnHelper failed on ' + command + ' ' + args.join(' '));
+                }
+            };
+
+            const gstreamer = new GStreamer(false, {
+                spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: true,
+            });
+            await gstreamer.init();
+            const launchResp = await gstreamer.getGstreamerLaunchCommand({
+                id: 'pylonsrc',
+                name: 'Basler camera',
+                caps: [{
+                    framerate: 60,
+                    height: 1080,
+                    width: 1440,
+                    type: "pylonsrc",
+                }],
+                videoSource: 'pylonsrc',
+            }, { width: 1440, height: 1080 }, {
+                width: 320,
+                height: 320,
+                resizeMode: 'fit-shortest',
+            });
+
+            // console.log('launchResp', launchResp);
+
+            assert.equal(launchResp.invokeProcess, 'spawn');
+            assert.equal(launchResp.command, 'gst-launch-1.0');
+            assert.equal(launchResp.args.join(' '),
+                'pylonsrc ! video/x-raw,width=1440,height=1080 ! videoconvert ! videocrop left=180 right=180 ! videoscale method=lanczos ! video/x-raw,width=320,height=320 ! jpegenc ! multifilesink location=test%05d.jpg');
+        });
+
+        it("w/ inference dims #2", async () => {
+            const spawnHelper: SpawnHelperType = async (command: string,
+                args: string[],
+                opts: {
+                    ignoreErrors: boolean,
+                    cwd ? : string
+                } = {
+                    ignoreErrors: false
+                }) => {
+
+                if (command === 'which') {
+                    return  '';
+                }
+                else {
+                    throw new Error('spawnHelper failed on ' + command + ' ' + args.join(' '));
+                }
+            };
+
+            const gstreamer = new GStreamer(false, {
+                spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: true,
+            });
+            await gstreamer.init();
+            const launchResp = await gstreamer.getGstreamerLaunchCommand({
+                id: 'pylonsrc',
+                name: 'Basler camera',
+                caps: [{
+                    framerate: 60,
+                    height: 1080,
+                    width: 1440,
+                    type: "pylonsrc",
+                }],
+                videoSource: 'pylonsrc',
+            }, { width: 1440, height: 1080 }, {
+                width: 320,
+                height: 320,
+                resizeMode: 'squash',
+            });
+
+            // console.log('launchResp', launchResp);
+
+            assert.equal(launchResp.invokeProcess, 'spawn');
+            assert.equal(launchResp.command, 'gst-launch-1.0');
+            assert.equal(launchResp.args.join(' '),
+                'pylonsrc ! video/x-raw,width=1440,height=1080 ! videoconvert ! videoscale method=lanczos ! video/x-raw,width=320,height=320 ! jpegenc ! multifilesink location=test%05d.jpg');
+        });
+
+        it("w/ inference dims #3", async () => {
+            const spawnHelper: SpawnHelperType = async (command: string,
+                args: string[],
+                opts: {
+                    ignoreErrors: boolean,
+                    cwd ? : string
+                } = {
+                    ignoreErrors: false
+                }) => {
+
+                if (command === 'which') {
+                    return  '';
+                }
+                else {
+                    throw new Error('spawnHelper failed on ' + command + ' ' + args.join(' '));
+                }
+            };
+
+            const gstreamer = new GStreamer(false, {
+                spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: true,
+            });
+            await gstreamer.init();
+            const launchResp = await gstreamer.getGstreamerLaunchCommand({
+                id: 'pylonsrc',
+                name: 'Basler camera',
+                caps: [{
+                    framerate: 60,
+                    height: 1080,
+                    width: 1440,
+                    type: "pylonsrc",
+                }],
+                videoSource: 'pylonsrc',
+            }, { width: 1440, height: 1080 }, {
+                width: 320,
+                height: 320,
+                resizeMode: 'fit-longest',
+            });
+
+            // console.log('launchResp', launchResp);
+
+            assert.equal(launchResp.invokeProcess, 'spawn');
+            assert.equal(launchResp.command, 'gst-launch-1.0');
+            assert.equal(launchResp.args.join(' '),
+                'pylonsrc ! video/x-raw,width=1440,height=1080 ! videoconvert ! jpegenc ! multifilesink location=test%05d.jpg');
+        });
+
+        it("w/ inference dims #4", async () => {
+            const spawnHelper: SpawnHelperType = async (command: string,
+                args: string[],
+                opts: {
+                    ignoreErrors: boolean,
+                    cwd ? : string
+                } = {
+                    ignoreErrors: false
+                }) => {
+
+                if (command === 'which') {
+                    return  '';
+                }
+                else {
+                    throw new Error('spawnHelper failed on ' + command + ' ' + args.join(' '));
+                }
+            };
+
+            const gstreamer = new GStreamer(false, {
+                spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: undefined,
+            });
+            await gstreamer.init();
+            const launchResp = await gstreamer.getGstreamerLaunchCommand({
+                id: 'pylonsrc',
+                name: 'Basler camera',
+                caps: [{
+                    framerate: 60,
+                    height: 1080,
+                    width: 1440,
+                    type: "pylonsrc",
+                }],
+                videoSource: 'pylonsrc',
+            }, { width: 1440, height: 1080 }, {
+                width: 320,
+                height: 320,
+                resizeMode: 'squash',
+            });
 
             // console.log('launchResp', launchResp);
 
@@ -5302,6 +5491,7 @@ async function testGetDevices(output: {
     const gstreamer = new GStreamer(false, {
         spawnHelperOverride: spawnHelper,
         modeOverride: output?.modeOverride,
+        scaleAndCropInPipeline: true,
     });
     await gstreamer.init();
     const devices = await gstreamer.getAllDevices();