Merge pull request #3492 from janhq/regression/gpu-memory-utilization

fix: gpu memory utilization

web/.eslintrc.js

@@ -11,6 +11,9 @@ module.exports = {
     '_next',
     '*.md',
     'out',
+    '**/*.test.tsx',
+    '**/*.test.ts',
+    'testRunner.js',
   ],
   extends: [
     'next/core-web-vitals',

web/containers/Layout/BottomPanel/SystemMonitor/index.tsx

@@ -19,6 +19,8 @@ import { usePath } from '@/hooks/usePath'
 
 import { toGibibytes } from '@/utils/converter'
 
+import { utilizedMemory } from '@/utils/memory'
+
 import TableActiveModel from './TableActiveModel'
 
 import { showSystemMonitorPanelAtom } from '@/helpers/atoms/App.atom'
@@ -160,8 +162,9 @@ const SystemMonitor = () => {
               {gpus.length > 0 && (
                 <div className="mb-4 border-b border-[hsla(var(--app-border))] pb-4 last:border-none">
                   {gpus.map((gpu, index) => {
-                    const gpuUtilization = Math.round(
+                    const gpuUtilization = utilizedMemory(
-                      (gpu.memoryFree / Math.max(gpu.memoryTotal, 1)) * 100
+                      gpu.memoryFree,
+                      gpu.memoryTotal
                     )
                     return (
                       <div key={index} className="mt-4 flex flex-col gap-x-2">

web/jest.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  runner: './testRunner.js',
+}

web/package.json

@@ -10,7 +10,8 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx}\"",
-    "compile": "tsc --noEmit -p . --pretty"
+    "compile": "tsc --noEmit -p . --pretty",
+    "test": "jest"
   },
   "dependencies": {
     "@heroicons/react": "^2.0.18",
@@ -19,9 +20,9 @@
     "@janhq/joi": "link:./joi",
     "autoprefixer": "10.4.16",
     "class-variance-authority": "^0.7.0",
+    "csstype": "^3.0.10",
     "framer-motion": "^10.16.4",
     "highlight.js": "^11.9.0",
-    "postcss-url": "10.1.3",
     "jotai": "^2.6.0",
     "katex": "^0.16.10",
     "lodash": "^4.17.21",
@@ -32,6 +33,7 @@
     "next": "14.2.3",
     "next-themes": "^0.2.1",
     "postcss": "8.4.31",
+    "postcss-url": "10.1.3",
     "posthog-js": "^1.95.1",
     "react": "18.2.0",
     "react-circular-progressbar": "^2.1.0",
@@ -39,7 +41,6 @@
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.47.0",
     "react-hot-toast": "^2.4.1",
-    "csstype": "^3.0.10",
     "react-icons": "^4.12.0",
     "react-scroll-to-bottom": "^4.2.0",
     "react-toastify": "^9.1.3",
@@ -47,12 +48,13 @@
     "tailwind-merge": "^2.0.0",
     "tailwindcss": "3.3.5",
     "ulidx": "^2.3.0",
-    "uuid": "^9.0.1",
     "use-debounce": "^10.0.0",
+    "uuid": "^9.0.1",
     "zod": "^3.22.4"
   },
   "devDependencies": {
     "@next/eslint-plugin-next": "^14.0.1",
+    "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.200",
     "@types/node": "20.8.10",
     "@types/react": "18.2.34",
@@ -72,9 +74,11 @@
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-react": "^7.34.0",
     "eslint-plugin-react-hooks": "^4.6.0",
+    "jest-runner": "^29.7.0",
     "prettier": "^3.0.3",
     "prettier-plugin-tailwindcss": "^0.5.6",
     "rimraf": "^5.0.5",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.3.3"
   }
 }

web/testRunner.js

@@ -0,0 +1,19 @@
+const jestRunner = require('jest-runner')
+
+class EmptyTestFileRunner extends jestRunner.default {
+  async runTests(tests, watcher, onStart, onResult, onFailure, options) {
+    const nonEmptyTests = tests.filter(
+      (test) => test.context.hasteFS.getSize(test.path) > 0
+    )
+    return super.runTests(
+      nonEmptyTests,
+      watcher,
+      onStart,
+      onResult,
+      onFailure,
+      options
+    )
+  }
+}
+
+module.exports = EmptyTestFileRunner

web/tsconfig.json

@@ -2,7 +2,11 @@
   "compilerOptions": {
     "target": "ES2015",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "typeRoots": ["node_modules/@types", "./src/types"],
+    "typeRoots": [
+      "./node_modules/@types",
+      "./src/types",
+      "../node_modules/@types/jest"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -25,5 +29,5 @@
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "**/*.test.ts"]
 }

web/utils/memory.test.ts

@@ -0,0 +1,13 @@
+// @auto-generated
+
+import { utilizedMemory } from './memory'
+
+test('test_utilizedMemory_arbitraryValues', () => {
+  const result = utilizedMemory(30, 100)
+  expect(result).toBe(70)
+})
+
+test('test_utilizedMemory_freeEqualsTotal', () => {
+  const result = utilizedMemory(100, 100)
+  expect(result).toBe(0)
+})

web/utils/memory.ts

@@ -0,0 +1,9 @@
+/**
+ * Calculate the percentage of memory used
+ * @param free
+ * @param total
+ * @returns
+ */
+export const utilizedMemory = (free: number, total: number) => {
+  return Math.round(((total - free) / Math.max(total, 1)) * 100)
+}