Swap to kitware:gpu-algorithms-web tag for base Worker Branch (#1487)

* utilizing the viame:gpu-algorithms-web tag for smaller image sizes

* fix tiled image downloading, everything downloads

* read only mode disabled button until settings are validated after saving

* add support for execTime for desktop CSV files

Author: BryonLewis

client/platform/desktop/backend/native/common.ts

@@ -586,7 +586,7 @@ async function _ingestFilePath(
   await fs.copy(path, newPath);
   // Attempt to process the file
   let annotations = dive.makeEmptyAnnotationFile();
-  const meta: DatasetMetaMutable & { fps?: number } = {};
+  const meta: DatasetMetaMutable & { fps?: number, execTime?: number } = {};
   let metadataConfig = false;
   if (JsonFileName.test(path)) {
     const jsonObject = await _loadAsJson(path);
@@ -610,6 +610,7 @@ async function _ingestFilePath(
     annotations.tracks = data[0].tracks;
     annotations.groups = data[0].groups;
     meta.fps = data[0].fps;
+    meta.execTime = data[0].execTime;
     [, warnings] = data;
   } else if (YAMLFileName.test(path)) {
     annotations = await kpf.parse([path]);

client/platform/desktop/backend/serializers/viame.ts

@@ -28,6 +28,7 @@ const AttrRegex = /^\(atr\) (.*?)\s(.+)/g;
 const TrackAttrRegex = /^\(trk-atr\) (.*?)\s(.+)/g;
 const PolyRegex = /^(\(poly\)) ((?:-?[0-9]+\.*-?[0-9]*\s*)+)/g;
 const FpsRegex = /fps:\s*(\d+(\.\d+)?)/ig;
+const ExecTimeRegEx = /exec_time:\s*(\d+(\.\d+)?)/ig;
 const AtrToken = '(atr)';
 const TrackAtrToken = '(trk-atr)';
 const PolyToken = '(poly)';
@@ -37,6 +38,7 @@ export interface AnnotationFileData {
   tracks: MultiTrackRecord;
   groups: MultiGroupRecord;
   fps?: number;
+  execTime?: number;
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/matchAll
@@ -95,7 +97,13 @@ function parseCommentRow(row: string[]) {
   if (matches !== null && matches.length >= 2) {
     fps = Number.parseFloat(matches[1]);
   }
-  return { fps };
+  let execTime: undefined | number;
+  const execMatches = getCaptureGroups(ExecTimeRegEx, fullrow);
+  if (execMatches !== null && execMatches.length >= 2) {
+    execTime = Number.parseFloat(execMatches[1]);
+  }
+
+  return { fps, execTime };
 }
 
 function _deduceType(value: string): boolean | number | string {
@@ -263,6 +271,7 @@ async function parse(input: Readable, imageMap?: Map<string, number>): Promise<[
     relaxColumnCount: true,
   });
   let fps: number | undefined;
+  let execTime: number | undefined;
   const dataMap = new Map<number, TrackData>();
   const missingImages: string[] = [];
   const foundImages: {image: string; frame: number; csvFrame: number}[] = [];
@@ -377,7 +386,9 @@ async function parse(input: Readable, imageMap?: Map<string, number>): Promise<[
       if (error !== undefined) {
         reject(error);
       }
-      resolve([{ tracks, groups: {}, fps }, warnings]);
+      resolve([{
+        tracks, groups: {}, fps, execTime,
+      }, warnings]);
     });
     parser.on('readable', () => {
       let record: string[];
@@ -461,7 +472,11 @@ async function parse(input: Readable, imageMap?: Map<string, number>): Promise<[
           }
           if (err.toString().includes('comment row')) {
             // parse comment row
-            fps = fps || parseCommentRow(record).fps;
+            const parsedComment = parseCommentRow(record);
+            fps = fps || parsedComment.fps;
+            if (parsedComment.execTime) {
+              execTime = parsedComment.execTime;
+            }
           } else if (!err.toString().includes('malformed row')) {
             // Allow malformed row errors
             error = err;
@@ -495,12 +510,16 @@ async function writeHeader(writer: Writable, meta: JsonMeta) {
     'Confidence Pairs or Attributes',
   ]);
   if (meta.fps) {
-    writer.write([
+    const metadataRow = [
       '# metadata',
       `fps: ${meta.fps}`,
       `exported_by: ${JSON.stringify('dive:typescript')}`,
       `exported_time: ${JSON.stringify((new Date()).toLocaleString())}`,
-    ]);
+    ];
+    if (meta.execTime) {
+      metadataRow.push(`exec_time: ${meta.execTime}`);
+    }
+    writer.write(metadataRow);
   }
 }
 

client/platform/desktop/constants.ts

@@ -122,6 +122,9 @@ export interface JsonMeta extends DatasetMetaMutable {
 
   // Stereo or multi-camera datasets with uniform type (all images, all video)
   subType: SubType;
+
+  // execTime is athe execution time for desktop runs
+  execTime?: number
 }
 
 export type DesktopMetadata = DatasetMeta & JsonMeta;

client/platform/desktop/frontend/components/Settings.vue

@@ -61,7 +61,6 @@ export default defineComponent({
         set(localSettings.value, name, result.filePaths[0]);
       }
     }
-
     async function save() {
       if (localSettings.value !== null) {
         settingsAreValid.value = false;
@@ -158,6 +157,7 @@ export default defineComponent({
             <v-col>
               <v-switch
                 v-model="localSettings.readonlyMode"
+                :disabled="!settingsAreValid"
                 color="primary"
                 :label="'Read only mode'"
                 hide-details
@@ -170,7 +170,7 @@ export default defineComponent({
         <v-card-text>
           <v-btn
             color="primary"
-            :disabled="pendingChanges"
+            :disabled="pendingChanges || !settingsAreValid"
             @click="save"
           >
             <v-icon class="mr-2">

docker/girder_worker.Dockerfile

@@ -4,15 +4,15 @@
 # ====================
 # == FFMPEG FETCHER ==
 # ====================
-FROM python:3.8-bookworm as ffmpeg-builder
+FROM python:3.8-bookworm AS ffmpeg-builder
 RUN wget -O ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
 RUN mkdir /tmp/ffextracted
 RUN tar -xvf ffmpeg.tar.xz -C /tmp/ffextracted --strip-components 1
 
 # =================
 # == DIST WORKER ==
 # =================
-FROM kitware/viame:gpu-algorithms-latest as worker
+FROM kitware/viame:gpu-algorithms-web AS worker
 # VIAME install at /opt/noaa/viame/
 # VIAME pipelines at /opt/noaa/viame/configs/pipelines/
 

server/dive_server/crud_dataset.py

@@ -275,6 +275,8 @@ def makeAnnotationAndMedia(dsFolder: types.GirderModel):
             mediaRegex = constants.imageRegex
         elif source_type == constants.VideoType:
             mediaRegex = constants.videoRegex
+        elif source_type == constants.LargeImageType:
+            mediaRegex = constants.largeImageRegEx
         return gen, mediaFolder, mediaRegex
 
     failed_datasets = []