chore: ram vram usage in resource

src/pages/resources/components/container-install.tsx

@@ -118,12 +118,7 @@ const AddWorker: React.FC<ViewModalProps> = (props) => {
           }}
         ></div>
       )}
-      <HighlightCode
-        theme="dark"
-        code={code}
-        lang="bash"
-        height={130}
-      ></HighlightCode>
+      <HighlightCode theme="dark" code={code} lang="bash"></HighlightCode>
       <h3 className="m-b-0 m-t-10">
         3. {intl.formatMessage({ id: 'resources.worker.add.step3' })}
       </h3>

src/pages/resources/components/workers.tsx

@@ -3,11 +3,12 @@ import DeleteModal from '@/components/delete-modal';
 import DropdownButtons from '@/components/drop-down-buttons';
 import PageTools from '@/components/page-tools';
 import ProgressBar from '@/components/progress-bar';
+import InfoColumn from '@/components/simple-table/info-column';
 import StatusTag from '@/components/status-tag';
 import Hotkeys from '@/config/hotkeys';
 import useTableRowSelection from '@/hooks/use-table-row-selection';
 import useTableSort from '@/hooks/use-table-sort';
-import { convertFileSize, handleBatchRequest } from '@/utils';
+import { handleBatchRequest } from '@/utils';
 import {
   DeleteOutlined,
   EditOutlined,
@@ -37,6 +38,21 @@ import UpdateLabels from './update-labels';
 
 const { Column } = Table;
 
+const fieldList = [
+  {
+    label: 'resources.table.total',
+    key: 'total'
+  },
+  {
+    label: 'resources.table.used',
+    key: 'used'
+  },
+  {
+    label: 'resources.table.allocated',
+    key: 'allocated'
+  }
+];
+
 const ActionList = [
   {
     label: 'common.button.edit',
@@ -186,27 +202,6 @@ const Workers: React.FC = () => {
     });
   };
 
-  const renderStorageTooltip = (files: Filesystem[]) => {
-    const mountRoot = _.find(
-      files,
-      (item: Filesystem) => item.mount_point === '/'
-    );
-    return mountRoot ? (
-      <span className="flex-column">
-        <span>
-          {intl.formatMessage({ id: 'resources.table.total' })}:{' '}
-          {convertFileSize(mountRoot?.total, 0)}
-        </span>
-        <span>
-          {intl.formatMessage({ id: 'resources.table.used' })}:{' '}
-          {convertFileSize(mountRoot?.used, 0)}
-        </span>
-      </span>
-    ) : (
-      0
-    );
-  };
-
   const handleUpdateLabelsOk = useCallback(
     async (values: Record<string, any>) => {
       try {
@@ -264,27 +259,18 @@ const Workers: React.FC = () => {
     return <div></div>;
   };
 
-  const renderProgressLabels = (data: {
-    total: number;
-    used: number;
-    allocated: number;
-  }) => {
-    const { total, used, allocated } = data;
-    return (
-      <span className="flex-column">
-        <span>
-          {intl.formatMessage({ id: 'resources.table.total' })}:{' '}
-          {convertFileSize(total, 0)}
-        </span>
-        <span>
-          {intl.formatMessage({ id: 'resources.table.used' })}:{' '}
-          {convertFileSize(used, 0)}
-        </span>
-        <span>
-          {intl.formatMessage({ id: 'resources.table.allocated' })}:{' '}
-          {convertFileSize(allocated, 0)}
-        </span>
-      </span>
+  const renderStorageTooltip = (files: Filesystem[]) => {
+    const mountRoot = _.find(
+      files,
+      (item: Filesystem) => item.mount_point === '/'
+    );
+    return mountRoot ? (
+      <InfoColumn
+        fieldList={fieldList.filter((item) => item.key !== 'allocated')}
+        data={mountRoot}
+      ></InfoColumn>
+    ) : (
+      0
     );
   };
 
@@ -449,7 +435,12 @@ const Workers: React.FC = () => {
                     record?.status?.memory?.used,
                     record?.status?.memory?.total
                   )}
-                  label={renderProgressLabels(record?.status?.memory)}
+                  label={
+                    <InfoColumn
+                      fieldList={fieldList}
+                      data={record.status.memory}
+                    ></InfoColumn>
+                  }
                 ></ProgressBar>
               );
             }}
@@ -520,7 +511,12 @@ const Workers: React.FC = () => {
                                       0
                                     )
                               }
-                              label={renderProgressLabels(item.memory)}
+                              label={
+                                <InfoColumn
+                                  fieldList={fieldList}
+                                  data={item.memory}
+                                ></InfoColumn>
+                              }
                             ></ProgressBar>
                             {item.memory.is_unified_memory && (
                               <Tooltip
@@ -528,7 +524,10 @@ const Workers: React.FC = () => {
                                   id: 'resources.table.unified'
                                 })}
                               >
-                                <InfoCircleOutlined className="m-l-5" />
+                                <InfoCircleOutlined
+                                  className="m-l-5"
+                                  style={{ color: 'var(--ant-blue-5)' }}
+                                />
                               </Tooltip>
                             )}
                           </span>

src/pages/resources/config/index.ts

@@ -44,7 +44,6 @@ export const addWorkerGuide: Record<string, any> = {
       return `docker run -d --name gpustack-worker --restart=unless-stopped --gpus all -p 10150:10150 -p 40000-41024:40000-41024 -p 50000-51024:50000-51024 --ipc=host -v gpustack-worker-data:/var/lib/gpustack gpustack/gpustack:${params.tag} --server-url ${params.server} --token ${params.token} --worker-ip ${params.workerip}`;
     }
   },
-
   npu: {
     getToken:
       'Get-Content -Path (Join-Path -Path $env:APPDATA -ChildPath "gpustack\\token") -Raw',
@@ -54,31 +53,7 @@ export const addWorkerGuide: Record<string, any> = {
       token: string;
       workerip: string;
     }) {
-      return `docker run -d --name gpustack-worker \\
-    --restart=unless-stopped \\
-    --device /dev/davinci0 \\
-    --device /dev/davinci1 \\
-    --device /dev/davinci2 \\
-    --device /dev/davinci3 \\
-    --device /dev/davinci4 \\
-    --device /dev/davinci5 \\
-    --device /dev/davinci6 \\
-    --device /dev/davinci7 \\
-    --device /dev/davinci_manager \\
-    --device /dev/devmm_svm \\
-    --device /dev/hisi_hdc \\
-    -v /usr/local/dcmi:/usr/local/dcmi \\
-    -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi \\
-    -v /usr/local/Ascend/driver/lib64/:/usr/local/Ascend/driver/lib64/ \\
-    -v /usr/local/Ascend/driver/version.info:/usr/local/Ascend/driver/version.info \\
-    -v /etc/ascend_install.info:/etc/ascend_install.info \\
-    -p 10150:10150 \\
-    -p 40000-41024:40000-41024 \\
-    -p 50000-51024:50000-51024 \\
-    --ipc=host \\
-    -v gpustack-worker-data:/var/lib/gpustack \\
-    gpustack/gpustack:${params.tag} \\
-    --server-url ${params.server} --token ${params.token} --worker-ip ${params.workerip}`;
+      return `docker run -d --name gpustack-worker --restart=unless-stopped -e ASCEND_VISIBLE_DEVICES=0 -p 10150:10150 -p 40000-41024:40000-41024 -p 50000-51024:50000-51024 --ipc=host -v gpustack-worker-data:/var/lib/gpustack gpustack/gpustack:${params.tag} --server-url ${params.server} --token ${params.token} --worker-ip ${params.workerip}`;
     }
   },
   musa: {