Client/desktop windows

client/platform/desktop/backend/ipcService.ts

@@ -1,9 +1,11 @@
-import { ipcMain } from 'electron';
+import OS from 'os';
 
+import { ipcMain } from 'electron';
 import { DesktopJobUpdate, RunPipeline, Settings } from '../constants';
 
 import server from './server';
 import linux from './platforms/linux';
+import win32 from './platforms/windows';
 import common from './platforms/common';
 
 export default function register() {
@@ -16,10 +18,6 @@ export default function register() {
    * Platform-agnostic methods
    */
 
-  ipcMain.handle('nvidia-smi', async () => {
-    const ret = await common.nvidiaSmi();
-    return ret;
-  });
   ipcMain.handle('get-pipeline-list', async (_, settings: Settings) => {
     const ret = await common.getPipelineList(settings);
     return ret;
@@ -29,21 +27,31 @@ export default function register() {
   });
 
   /**
-   * TODO: replace linux defaults with some kind of platform switching logic
+   * Platform-dependent methods
    */
 
+  // defaults to linux if win32 doesn't exist
+  const currentPlatform = OS.platform() === 'win32' ? win32 : linux;
+  if (OS.platform() === 'win32') {
+    win32.initialize();
+  }
+  ipcMain.handle('nvidia-smi', async () => {
+    const ret = await currentPlatform.nvidiaSmi();
+    return ret;
+  });
+
   ipcMain.handle('default-settings', async () => {
-    const defaults = linux.DefaultSettings;
+    const defaults = currentPlatform.DefaultSettings;
     return defaults;
   });
   ipcMain.handle('validate-settings', async (_, settings: Settings) => {
-    const ret = await linux.validateViamePath(settings);
+    const ret = await currentPlatform.validateViamePath(settings);
     return ret;
   });
   ipcMain.handle('run-pipeline', async (event, args: RunPipeline) => {
     const updater = (update: DesktopJobUpdate) => {
       event.sender.send('job-update', update);
     };
-    return linux.runPipeline(args, updater);
+    return currentPlatform.runPipeline(args, updater);
   });
 }

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

@@ -3,15 +3,13 @@
  */
 import npath from 'path';
 import fs from 'fs-extra';
-import { spawn } from 'child_process';
 import { shell } from 'electron';
 import mime from 'mime-types';
-import { xml2json } from 'xml-js';
 import moment from 'moment';
 import { TrackData } from 'vue-media-annotator/track';
 import { DatasetType, Pipelines, SaveDetectionsArgs } from 'viame-web-common/apispec';
 
-import { Settings, NvidiaSmiReply, websafeImageTypes } from '../../constants';
+import { Settings, websafeImageTypes } from '../../constants';
 import * as viameSerializers from '../serializers/viame';
 
 const AuxFolderName = 'auxiliary';
@@ -193,35 +191,6 @@ async function createKwiverRunWorkingDir(datasetName: string, baseDir: string, p
   return runFolderPath;
 }
 
-// Based on https://github.com/chrisallenlane/node-nvidia-smi
-async function nvidiaSmi(): Promise<NvidiaSmiReply> {
-  return new Promise((resolve) => {
-    const smi = spawn('nvidia-smi', ['-q', '-x']);
-    let result = '';
-    smi.stdout.on('data', (chunk) => {
-      result = result.concat(chunk.toString('utf-8'));
-    });
-    smi.on('close', (exitCode) => {
-      let jsonStr = 'null'; // parses to null
-      if (exitCode === 0) {
-        jsonStr = xml2json(result, { compact: true });
-      }
-      resolve({
-        output: JSON.parse(jsonStr),
-        exitCode,
-        error: result,
-      });
-    });
-    smi.on('error', (err) => {
-      resolve({
-        output: null,
-        exitCode: -1,
-        error: err.message,
-      });
-    });
-  });
-}
-
 /**
  * Save pre-serialized tracks to disk
  * @param datasetId path
@@ -297,7 +266,6 @@ async function openLink(url: string) {
 }
 
 export default {
-  nvidiaSmi,
   openLink,
   getAuxFolder,
   createKwiverRunWorkingDir,

client/platform/desktop/backend/platforms/linux.ts

@@ -4,10 +4,12 @@
 import npath from 'path';
 import { spawn } from 'child_process';
 import fs from 'fs-extra';
+import { xml2json } from 'xml-js';
 
 import {
   Settings, SettingsCurrentVersion,
   DesktopJob, DesktopJobUpdate, RunPipeline,
+  NvidiaSmiReply,
 } from '../../constants';
 
 import common from './common';
@@ -161,9 +163,39 @@ async function runPipeline(
 
   return jobBase;
 }
+// Based on https://github.com/chrisallenlane/node-nvidia-smi
+async function nvidiaSmi(): Promise<NvidiaSmiReply> {
+  return new Promise((resolve) => {
+    const smi = spawn('nvidia-smi', ['-q', '-x']);
+    let result = '';
+    smi.stdout.on('data', (chunk) => {
+      result = result.concat(chunk.toString('utf-8'));
+    });
+    smi.on('close', (exitCode) => {
+      let jsonStr = 'null'; // parses to null
+      if (exitCode === 0) {
+        jsonStr = xml2json(result, { compact: true });
+      }
+      resolve({
+        output: JSON.parse(jsonStr),
+        exitCode,
+        error: result,
+      });
+    });
+    smi.on('error', (err) => {
+      resolve({
+        output: null,
+        exitCode: -1,
+        error: err.message,
+      });
+    });
+  });
+}
+
 
 export default {
   DefaultSettings,
   validateViamePath,
   runPipeline,
+  nvidiaSmi,
 };