diff --git a/src/assets/logo/voxbox.png b/src/assets/logo/voxbox.png index ecb0b653..bfef95f4 100644 Binary files a/src/assets/logo/voxbox.png and b/src/assets/logo/voxbox.png differ diff --git a/src/components/icon-font/index.tsx b/src/components/icon-font/index.tsx index b91e1c14..2c4fbc7b 100644 --- a/src/components/icon-font/index.tsx +++ b/src/components/icon-font/index.tsx @@ -1,8 +1,8 @@ import { createFromIconfontCN } from '@ant-design/icons'; -// import './iconfont/iconfont.js'; +import './iconfont/iconfont.js'; const IconFont = createFromIconfontCN({ - scriptUrl: '//at.alicdn.com/t/c/font_4613488_9h4e8ttfsau.js' + scriptUrl: '' }); export default IconFont; diff --git a/src/pages/cluster-management/components/add-worker/index.tsx b/src/pages/cluster-management/components/add-worker/index.tsx index 96a01456..f8d5302b 100644 --- a/src/pages/cluster-management/components/add-worker/index.tsx +++ b/src/pages/cluster-management/components/add-worker/index.tsx @@ -91,7 +91,7 @@ const AddWorker: React.FC = (props) => { closeIcon={true} maskClosable={false} keyboard={false} - width={860} + width={865} style={{}} maxContentHeight={'max(calc(100vh - 200px), 600px)'} footer={null} diff --git a/src/pages/llmodels/forms/advance-config.tsx b/src/pages/llmodels/forms/advance-config.tsx index 56efb885..38b7d19c 100644 --- a/src/pages/llmodels/forms/advance-config.tsx +++ b/src/pages/llmodels/forms/advance-config.tsx @@ -5,13 +5,11 @@ import { useIntl } from '@umijs/max'; import { Form } from 'antd'; import _ from 'lodash'; import { useMemo } from 'react'; -import { DeployFormKeyMap, modelCategories } from '../config'; +import { modelCategories } from '../config'; import { backendOptionsMap } from '../config/backend-parameters'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; -import BackendForm from './backend'; import BackendParametersList from './backend-parameters-list'; -import CustomBackend from './custom-backend'; const AdvanceConfig = () => { const intl = useIntl(); @@ -64,12 +62,6 @@ const AdvanceConfig = () => { options={modelCategories} > - {formKey === DeployFormKeyMap.CATALOG && ( - <> - - - - )} name="env"> diff --git a/src/pages/llmodels/forms/basic.tsx b/src/pages/llmodels/forms/basic.tsx index 4b29820f..215f6cec 100644 --- a/src/pages/llmodels/forms/basic.tsx +++ b/src/pages/llmodels/forms/basic.tsx @@ -10,12 +10,14 @@ import { import { useIntl } from '@umijs/max'; import { Form } from 'antd'; import { useMemo } from 'react'; -import { DeployFormKeyMap, sourceOptions } from '../config'; +import { sourceOptions } from '../config'; import { useFormContext } from '../config/form-context'; import { FormData } from '../config/types'; import BackendForm from './backend'; +import CatalogFrom from './catalog'; import CustomBackend from './custom-backend'; import LocalPathSource from './local-path-source'; +import ModeField from './mode-field'; import OnlineSource from './online-source'; interface BasicFormProps { @@ -126,13 +128,10 @@ const BasicForm: React.FC = (props) => { > } - {formKey === DeployFormKeyMap.DEPLOYMENT && ( - <> - - - - )} - + + + + name="replicas" rules={[ diff --git a/src/pages/llmodels/forms/mode-field.tsx b/src/pages/llmodels/forms/mode-field.tsx new file mode 100644 index 00000000..5680e461 --- /dev/null +++ b/src/pages/llmodels/forms/mode-field.tsx @@ -0,0 +1,46 @@ +import AutoTooltip from '@/components/auto-tooltip'; +import SealSelect from '@/components/seal-form/seal-select'; +import { useIntl } from '@umijs/max'; +import { Form, Select } from 'antd'; +import React from 'react'; +import { DeployFormKeyMap } from '../config'; +import { useCatalogFormContext, useFormContext } from '../config/form-context'; + +const Performance: React.FC = () => { + const intl = useIntl(); + const { formKey } = useFormContext(); + const { modeList = [], onModeChange } = useCatalogFormContext(); + + if (formKey !== DeployFormKeyMap.CATALOG) return null; + + return ( + <> + + + {modeList?.map((item: any) => ( + + + {item.isBuiltIn + ? intl.formatMessage({ id: item?.label || '' }) + : item.label} + + + ))} + + + + ); +}; + +export default Performance; diff --git a/src/pages/llmodels/forms/performance.tsx b/src/pages/llmodels/forms/performance.tsx index 2463700c..7403afb3 100644 --- a/src/pages/llmodels/forms/performance.tsx +++ b/src/pages/llmodels/forms/performance.tsx @@ -1,74 +1,13 @@ -import AutoTooltip from '@/components/auto-tooltip'; -import SealSelect from '@/components/seal-form/seal-select'; -import { useIntl } from '@umijs/max'; -import { Form, Select } from 'antd'; import React from 'react'; -import { DeployFormKeyMap } from '../config'; -import { useCatalogFormContext, useFormContext } from '../config/form-context'; -import CatalogFrom from './catalog'; + import KVCacheForm from './kv-cache'; import SpeculativeDecode from './speculative-decode'; -const modeTipsList = [ - { - title: { - text: 'models.form.mode.throughput', - locale: true - }, - tips: 'models.form.mode.throughput.tips' - }, - { - title: { - text: 'models.form.mode.latency', - locale: true - }, - tips: 'models.form.mode.latency.tips' - }, - { - title: { - text: 'models.form.mode.baseline', - locale: true - }, - tips: 'models.form.mode.baseline.tips' - } -]; - const Performance: React.FC = () => { - const intl = useIntl(); - const form = Form.useFormInstance(); - const { formKey } = useFormContext(); - const { modeList = [], onModeChange } = useCatalogFormContext(); - return ( <>
- {formKey === DeployFormKeyMap.CATALOG && ( - - - {modeList?.map((item: any) => ( - - - {item.isBuiltIn - ? intl.formatMessage({ id: item?.label || '' }) - : item.label} - - - ))} - - - )} - + diff --git a/src/pages/resources/config/gpu-driver.ts b/src/pages/resources/config/gpu-driver.ts index 3473ddd8..fad88b62 100644 --- a/src/pages/resources/config/gpu-driver.ts +++ b/src/pages/resources/config/gpu-driver.ts @@ -34,7 +34,7 @@ export const GPUsConfigs: Record< label: ManufacturerMap[GPUDriverMap.AMD], value: GPUDriverMap.AMD, runtime: 'amd', - driver: 'amd-smi' + driver: 'amd-smi static' }, [GPUDriverMap.ASCEND]: { label: ManufacturerMap[GPUDriverMap.ASCEND],