root/gpustack-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: add worker notes

Browse Source
This commit is contained in:
jialin
2025-11-04 17:19:20 +08:00
parent 23b7936924
commit e5733a7f6e
15 changed files with 318 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/seal-form/seal-cascader.tsx
+1 -1
View File
@@ -21,10 +21,10 @@ const tag = (props: any) => {
const renderTag = (props: any) => { const renderTag = (props: any) => {
return ( return (
<AutoTooltip <AutoTooltip
className="m-r-4"
closable={props.closable} closable={props.closable}
onClose={props.onClose} onClose={props.onClose}
maxWidth={240} maxWidth={240}
style={{ marginRight: 4 }}
filled filled
> >
{tag(props)} {tag(props)}
src/locales/en-US/clusters.ts
+13 -1
View File
@@ -46,5 +46,17 @@ export default {
' On the Kubernetes cluster that needs to be added, run the following command to join its nodes to the cluster.', ' On the Kubernetes cluster that needs to be added, run the following command to join its nodes to the cluster.',
'cluster.create.checkEnv.tips': 'cluster.create.checkEnv.tips':
'Use the following command to check if the environment is ready', 'Use the following command to check if the environment is ready',
'cluster.provider.comingsoon': 'Coming soon' 'cluster.provider.comingsoon': 'Coming soon',
'clusters.addworker.nvidiaNotes-01':
'If the worker has multiple outbound IP addresses, enter <span class="bold-text">WORKER_IP</span> to ensure that the node uses the desired IP. Please double-check with <span class="bold-text">hostname -I | xargs -n1</span>.',
'clusters.addworker.nvidiaNotes-02':
'If the model directory already exists on the worker, please add the <span class="bold-text">--volume</span> directive to mount it.',
'clusters.addworker.hygonNotes':
'If the <span class="bold-text">/opt/hyhal</span> directory does not exist, please create a symbolic link pointing to the Hygon installed path: <span class="bold-text">/opt/hyhal</span>. Same as <span class="bold-text">/opt/dtk</span> directory.',
'clusters.addworker.corexNotes':
'If the <span class="bold-text">/lib/modules</span> directory does not exist, please create a symbolic link pointing to the Iluvatar installed path: <span class="bold-text">ln -s /path/to/corex /lib/modules</span>. Same as <span class="bold-text">/usr/local/corex</span> directory.',
'clusters.addworker.metaxNotes':
'If the <span class="bold-text">/opt/mxdriver</span> directory does not exist, please create a symbolic link pointing to the MetaX installed path: <span class="bold-text">ln -s /path/to/metax /opt/mxdriver</span>. Same as <span class="bold-text">/opt/maca</span> directory.',
'clusters.addworker.cambriconNotes':
'If the <span class="bold-text">/usr/local/neuware</span> directory does not exist, please create a symbolic link pointing to the Cambricon installed path: <span class="bold-text">ln -s /path/to/neuware /usr/local/neuware</span>.'
}; };
src/locales/en-US/common.ts
+2 -1
View File
@@ -263,5 +263,6 @@ export default {
'common.button.addItem': 'Add Item', 'common.button.addItem': 'Add Item',
'common.help.default': 'Default: {content}', 'common.help.default': 'Default: {content}',
'common.filter.status': 'Filter by status', 'common.filter.status': 'Filter by status',
'common.form.rule.selectInput': 'Please select or enter a {name}' 'common.form.rule.selectInput': 'Please select or enter a {name}',
'common.tag.experimental': 'Experimental'
}; };
src/locales/ja-JP/clusters.ts
+20 -2
View File
@@ -46,7 +46,19 @@ export default {
'Use the following command to check if the environment is ready', 'Use the following command to check if the environment is ready',
'clusters.create.register.tips': 'clusters.create.register.tips':
' On the Kubernetes cluster that needs to be added, run the following command to join its nodes to the cluster.', ' On the Kubernetes cluster that needs to be added, run the following command to join its nodes to the cluster.',
'cluster.provider.comingsoon': 'Coming soon' 'cluster.provider.comingsoon': 'Coming soon',
'clusters.addworker.nvidiaNotes-01':
'If the worker has multiple outbound IP addresses, enter <span class="bold-text">WORKER_IP</span> to ensure that the node uses the desired IP. Please double-check with <span class="bold-text">hostname -I | xargs -n1</span>.',
'clusters.addworker.nvidiaNotes-02':
'If the model directory already exists on the worker, please add the <span class="bold-text">--volume</span> directive to mount it.',
'clusters.addworker.hygonNotes':
'If the <span class="bold-text">/opt/hyhal</span> directory does not exist, please create a symbolic link pointing to the Hygon installed path: <span class="bold-text">/opt/hyhal</span>. Same as <span class="bold-text">/opt/dtk</span> directory.',
'clusters.addworker.corexNotes':
'If the <span class="bold-text">/lib/modules</span> directory does not exist, please create a symbolic link pointing to the Iluvatar installed path: <span class="bold-text">ln -s /path/to/corex /lib/modules</span>. Same as <span class="bold-text">/usr/local/corex</span> directory.',
'clusters.addworker.metaxNotes':
'If the <span class="bold-text">/opt/mxdriver</span> directory does not exist, please create a symbolic link pointing to the MetaX installed path: <span class="bold-text">ln -s /path/to/metax /opt/mxdriver</span>. Same as <span class="bold-text">/opt/maca</span> directory.',
'clusters.addworker.cambriconNotes':
'If the <span class="bold-text">/usr/local/neuware</span> directory does not exist, please create a symbolic link pointing to the Cambricon installed path: <span class="bold-text">ln -s /path/to/neuware /usr/local/neuware</span>.'
}; };
// ========== To-Do: Translate Keys (Remove After Translation) ========== // ========== To-Do: Translate Keys (Remove After Translation) ==========
@@ -92,6 +104,12 @@ export default {
// 40. 'clusters.create.addCommand.tips': ' On the Worker that needs to be added, run the following command to join it to the cluster.', // 40. 'clusters.create.addCommand.tips': ' On the Worker that needs to be added, run the following command to join it to the cluster.',
// 41. 'cluster.create.checkEnv.tips': 'Use the following command to check if the environment is ready', // 41. 'cluster.create.checkEnv.tips': 'Use the following command to check if the environment is ready',
// 42. 'clusters.create.register.tips': ' On the Kubernetes cluster that needs to be added, run the following command to join its nodes to the cluster.', // 42. 'clusters.create.register.tips': ' On the Kubernetes cluster that needs to be added, run the following command to join its nodes to the cluster.',
// 43. 'cluster.provider.comingsoon': 'Coming soon' // 43. 'cluster.provider.comingsoon': 'Coming soon',
// 44. 'clusters.addworker.nvidiaNotes-01': 'If the worker has multiple outbound IP addresses, enter <span class="bold-text">WORKER_IP</span> to ensure that the node uses the desired IP. Please double-check with <span class="bold-text">hostname -I | xargs -n1</span>.',
// 45. 'clusters.addworker.nvidiaNotes-02': 'If the model directory already exists on the worker, please add the <span class="bold-text">--volume</span> directive to mount it.',
// 46. 'clusters.addworker.hygonNotes': 'If the <span class="bold-text">/opt/hyhal</span> directory does not exist, please create a symbolic link pointing to the Hygon installed path: <span class="bold-text">/opt/hyhal</span>. Same as <span class="bold-text">/opt/dtk</span> directory.',
// 47. 'clusters.addworker.corexNotes': 'If the <span class="bold-text">/lib/modules</span> directory does not exist, please create a symbolic link pointing to the Iluvatar installed path: <span class="bold-text">ln -s /path/to/corex /lib/modules</span>. Same as <span class
// 48. 'clusters.addworker.metaxNotes': 'If the <span class="bold-text">/opt/mxdriver</span> directory does not exist, please create a symbolic link pointing to the MetaX installed path: <span class="bold-text">ln -s /path/to/metax /opt/mxdriver</span>. Same as <span class="bold-text">/opt/maca</span> directory.',
// 49. 'clusters.addworker.cambriconNotes': 'If the <span class="bold-text">/usr/local/neuware</span> directory does not exist, please create a symbolic link pointing to the Cambricon installed path: <span class="bold-text">ln -s /path/to/neuware /usr/local/neuware</span>.'
// ========== End of To-Do List ========== // ========== End of To-Do List ==========
src/locales/ja-JP/common.ts
+4 -2
View File
@@ -263,7 +263,8 @@ export default {
'common.button.addItem': 'Add Item', 'common.button.addItem': 'Add Item',
'common.help.default': 'Default: {content}', 'common.help.default': 'Default: {content}',
'common.filter.status': 'Filter by status', 'common.filter.status': 'Filter by status',
'common.form.rule.selectInput': 'Please select or enter a {name}' 'common.form.rule.selectInput': 'Please select or enter a {name}',
'common.tag.experimental': 'Experimental'
}; };
// ========== To-Do: Translate Keys (Remove After Translation) ========== // ========== To-Do: Translate Keys (Remove After Translation) ==========
@@ -292,5 +293,6 @@ export default {
// 23. 'common.button.addItem': 'Add Item', // 23. 'common.button.addItem': 'Add Item',
// 24. 'common.help.default': 'Default: {content}', // 24. 'common.help.default': 'Default: {content}',
// 25. 'common.filter.status': 'Filter by status' // 25. 'common.filter.status': 'Filter by status'
// 26. 'common.form.rule.selectInput': 'Please select or enter a {name}' // 26. 'common.form.rule.selectInput': 'Please select or enter a {name}',
// 27. 'common.tag.experimental': 'Experimental',
// ========== End of To-Do List ========== // ========== End of To-Do List ==========
src/locales/ru-RU/clusters.ts
+29 -7
View File
@@ -36,14 +36,36 @@ export default {
'clusters.create.noImages': 'Нет доступных образов', 'clusters.create.noImages': 'Нет доступных образов',
'clusters.create.noInstanceTypes': 'Нет доступных типов инстансов', 'clusters.create.noInstanceTypes': 'Нет доступных типов инстансов',
'clusters.create.noRegions': 'Нет доступных регионов', 'clusters.create.noRegions': 'Нет доступных регионов',
'clusters.workerpool.batchSize.desc': 'Количество воркеров, создаваемых одновременно в пуле воркеров', 'clusters.workerpool.batchSize.desc':
'clusters.create.addworker.tips': 'Перед выполнением следующей команды убедитесь, что выполнены предварительные требования для <a href={link} target="_blank">{label}</a>.', 'Количество воркеров, создаваемых одновременно в пуле воркеров',
'clusters.create.addCommand.tips': 'На воркере, который необходимо добавить, выполните следующую команду, чтобы присоединить его к кластеру.', 'clusters.create.addworker.tips':
'cluster.create.checkEnv.tips': 'Используйте следующую команду для проверки готовности окружения', 'Перед выполнением следующей команды убедитесь, что выполнены предварительные требования для <a href={link} target="_blank">{label}</a>.',
'clusters.create.register.tips': 'На Kubernetes кластере, который необходимо добавить, выполните следующую команду, чтобы присоединить его узлы к кластеру.', 'clusters.create.addCommand.tips':
'cluster.provider.comingsoon': 'Скоро будет' 'На воркере, который необходимо добавить, выполните следующую команду, чтобы присоединить его к кластеру.',
'cluster.create.checkEnv.tips':
'Используйте следующую команду для проверки готовности окружения',
'clusters.create.register.tips':
'На Kubernetes кластере, который необходимо добавить, выполните следующую команду, чтобы присоединить его узлы к кластеру.',
'cluster.provider.comingsoon': 'Скоро будет',
'clusters.addworker.nvidiaNotes-01':
'If the worker has multiple outbound IP addresses, enter <span class="bold-text">WORKER_IP</span> to ensure that the node uses the desired IP. Please double-check with <span class="bold-text">hostname -I | xargs -n1</span>.',
'clusters.addworker.nvidiaNotes-02':
'If the model directory already exists on the worker, please add the <span class="bold-text">--volume</span> directive to mount it.',
'clusters.addworker.hygonNotes':
'If the <span class="bold-text">/opt/hyhal</span> directory does not exist, please create a symbolic link pointing to the Hygon installed path: <span class="bold-text">/opt/hyhal</span>. Same as <span class="bold-text">/opt/dtk</span> directory.',
'clusters.addworker.corexNotes':
'If the <span class="bold-text">/lib/modules</span> directory does not exist, please create a symbolic link pointing to the Iluvatar installed path: <span class="bold-text">ln -s /path/to/corex /lib/modules</span>. Same as <span class="bold-text">/usr/local/corex</span> directory.',
'clusters.addworker.metaxNotes':
'If the <span class="bold-text">/opt/mxdriver</span> directory does not exist, please create a symbolic link pointing to the MetaX installed path: <span class="bold-text">ln -s /path/to/metax /opt/mxdriver</span>. Same as <span class="bold-text">/opt/maca</span> directory.',
'clusters.addworker.cambriconNotes':
'If the <span class="bold-text">/usr/local/neuware</span> directory does not exist, please create a symbolic link pointing to the Cambricon installed path: <span class="bold-text">ln -s /path/to/neuware /usr/local/neuware</span>.'
}; };
// ========== To-Do: Translate Keys (Remove After Translation) ========== // ========== To-Do: Translate Keys (Remove After Translation) ==========
// 1. 'clusters.addworker.nvidiaNotes-01': 'If the worker has multiple outbound IP addresses, enter <span class="bold-text">WORKER_IP</span> to ensure that the node uses the desired IP. Please double-check with <span class="bold-text">hostname -I | xargs -n1</span>.',
// 2. 'clusters.addworker.nvidiaNotes-02': 'If the model directory already exists on the worker, please add the <span class="bold-text">--volume</span> directive to mount it.',
// 3. 'clusters.addworker.hygonNotes': 'If the <span class="bold-text">/opt/hyhal</span> directory does not exist, please create a symbolic link pointing to the Hygon installed path: <span class="bold-text">/opt/hyhal</span>. Same as <span class="bold-text">/opt/dtk</span> directory.',
// 4. 'clusters.addworker.corexNotes': 'If the <span class="bold-text">/lib/modules</span> directory does not exist, please create a symbolic link pointing to the Iluvatar installed path: <span class="bold-text">ln -s /path/to/corex /lib/modules</span>. Same as <span class="bold-text">/usr/local/corex</span> directory.',
// 5. 'clusters.addworker.metaxNotes': 'If the <span class="bold-text">/opt/mxdriver</span> directory does not exist, please create a symbolic link pointing to the MetaX installed path: <span class="bold-text">ln -s /path/to/metax /opt/mxdriver</span>. Same as <span class="bold-text">/opt/maca</span> directory.',
// 6. 'clusters.addworker.cambriconNotes': 'If the <span class="bold-text">/usr/local/neuware</span> directory does not exist, please create a symbolic link pointing to the Cambricon installed path: <span class="bold-text">ln -s /path/to/neuware /usr/local/neuware</span>.'
// ========== End of To-Do List ========== // ========== End of To-Do List ==========
src/locales/ru-RU/common.ts
+4 -2
View File
@@ -262,10 +262,12 @@ export default {
'common.button.addItem': 'Добавить элемент', 'common.button.addItem': 'Добавить элемент',
'common.help.default': 'По умолчанию: {content}', 'common.help.default': 'По умолчанию: {content}',
'common.filter.status': 'Filter by status', 'common.filter.status': 'Filter by status',
'common.form.rule.selectInput': 'Please select or enter a {name}' 'common.form.rule.selectInput': 'Please select or enter a {name}',
'common.tag.experimental': 'Experimental'
}; };
// ========== To-Do: Translate Keys (Remove After Translation) ========== // ========== To-Do: Translate Keys (Remove After Translation) ==========
// 1. 'common.filter.status': 'Filter by status' // 1. 'common.filter.status': 'Filter by status'
// 2. 'common.form.rule.selectInput': 'Please select or enter a {name}' // 2. 'common.form.rule.selectInput': 'Please select or enter a {name}',
// 3. 'common.tag.experimental': 'Experimental'
// ========== End of To-Do List ========== // ========== End of To-Do List ==========
src/locales/zh-CN/clusters.ts
+13 -1
View File
@@ -44,5 +44,17 @@ export default {
'clusters.create.register.tips': 'clusters.create.register.tips':
' 在需要添加的 Kubernetes 集群上运行以下命令，将其中的节点加入到集群中', ' 在需要添加的 Kubernetes 集群上运行以下命令，将其中的节点加入到集群中',
'cluster.create.checkEnv.tips': '使用以下命令检查环境是否准备妥当', 'cluster.create.checkEnv.tips': '使用以下命令检查环境是否准备妥当',
'cluster.provider.comingsoon': '即将推出' 'cluster.provider.comingsoon': '即将推出',
'clusters.addworker.nvidiaNotes-01':
'如果节点有多个出站 IP 地址，请填写 <span class="bold-text">WORKER_IP</span>，以确保使用指定的 IP。可通过命令 <span class="bold-text">hostname -I | xargs -n1</span> 进行确认。',
'clusters.addworker.nvidiaNotes-02':
'如果模型目录已存在于节点上，请添加 <span class="bold-text">--volume</span> 参数进行挂载。',
'clusters.addworker.hygonNotes':
'如果 <span class="bold-text">/opt/hyhal</span> 目录不存在，请创建指向 Hygon 安装路径的符号链接：<span class="bold-text">/opt/hyhal</span>。与 <span class="bold-text">/opt/dtk</span> 目录相同。',
'clusters.addworker.corexNotes':
'如果 <span class="bold-text">/lib/modules</span> 目录不存在，请创建指向 Iluvatar 安装路径的符号链接：<span class="bold-text">ln -s /path/to/corex /lib/modules</span>。与 <span class="bold-text">/usr/local/corex</span> 目录相同。',
'clusters.addworker.metaxNotes':
'如果 <span class="bold-text">/opt/mxdriver</span> 目录不存在，请创建指向 MetaX 安装路径的符号链接：<span class="bold-text">ln -s /path/to/metax /opt/mxdriver</span>。与 <span class="bold-text">/opt/maca</span> 目录相同。',
'clusters.addworker.cambriconNotes':
'如果 <span class="bold-text">/usr/local/neuware</span> 目录不存在，请创建指向 Cambricon 安装路径的符号链接：<span class="bold-text">ln -s /path/to/neuware /usr/local/neuware</span>。'
}; };
src/locales/zh-CN/common.ts
+2 -1
View File
@@ -255,5 +255,6 @@ export default {
'common.button.addItem': '添加项', 'common.button.addItem': '添加项',
'common.help.default': '默认: {content}', 'common.help.default': '默认: {content}',
'common.filter.status': '按状态筛选', 'common.filter.status': '按状态筛选',
'common.form.rule.selectInput': '请选择或输入{name}' 'common.form.rule.selectInput': '请选择或输入{name}',
'common.tag.experimental': '实验性'
}; };
src/pages/cluster-management/components/add-worker-step.tsx
+58 -8
View File
@@ -1,4 +1,9 @@
import { BulbOutlined } from '@ant-design/icons'; import AlertInfoBlock from '@/components/alert-info/block';
import {
AddWorkerDockerNotes,
GPUDriverMap
} from '@/pages/resources/config/gpu-driver';
import { BulbOutlined, ExclamationCircleFilled } from '@ant-design/icons';
import { useIntl } from '@umijs/max'; import { useIntl } from '@umijs/max';
import { Alert } from 'antd'; import { Alert } from 'antd';
import React from 'react'; import React from 'react';
@@ -9,6 +14,26 @@ import CheckEnvCommand from './check-env-command';
import RegisterClusterInner from './register-cluster-inner'; import RegisterClusterInner from './register-cluster-inner';
import SupportedGPUs from './support-gpus'; import SupportedGPUs from './support-gpus';
const StyledTag = styled.span`
display: inline-flex;
align-items: center;
justify-content: center;
margin-right: 8px;
`;
const NotesWrapper = styled.ol`
display: flex;
flex-direction: column;
gap: 8px;
font-weight: 400;
margin: 0 !important;
padding: 0 !important;
line-height: 1.2;
li {
margin-left: 12px !important;
}
`;
const Title = styled.div` const Title = styled.div`
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
@@ -40,7 +65,6 @@ const Container = styled.div`
.command-info { .command-info {
margin-top: 24px; margin-top: 24px;
margin-bottom: 8px; margin-bottom: 8px;
color: var(--ant-color-text-secondary);
} }
`; `;
@@ -63,16 +87,20 @@ const AddWorkerStep: React.FC<AddModalProps> = ({
registrationInfo registrationInfo
}) => { }) => {
const intl = useIntl(); const intl = useIntl();
const [currentGPU, setCurrentGPU] = React.useState<string>('cuda'); const [currentGPU, setCurrentGPU] = React.useState<string>(
React.useState<string>('cuda'); GPUDriverMap.NVIDIA
);
React.useState<string>(GPUDriverMap.NVIDIA);
const [workerCommand, setWorkerCommand] = React.useState<Record<string, any>>( const [workerCommand, setWorkerCommand] = React.useState<Record<string, any>>(
{ {
label: 'NVIDIA', label: 'NVIDIA',
link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#nvidia-cuda' link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#nvidia-cuda',
notes: AddWorkerDockerNotes[GPUDriverMap.NVIDIA]
} }
); );
const handleSelectProvider = (value: string, item: any) => { const handleSelectProvider = (value: string, item: any) => {
console.log('selected gpu driver:', value, item);
setCurrentGPU(value); setCurrentGPU(value);
setWorkerCommand(item); setWorkerCommand(item);
}; };
@@ -108,22 +136,44 @@ const AddWorkerStep: React.FC<AddModalProps> = ({
</Content> </Content>
<div className="command-info"> <div className="command-info">
1. {intl.formatMessage({ id: 'cluster.create.checkEnv.tips' })} <StyledTag>1.</StyledTag>
{intl.formatMessage({ id: 'cluster.create.checkEnv.tips' })}
</div> </div>
<CheckEnvCommand provider={provider} currentGPU={currentGPU} /> <CheckEnvCommand provider={provider} currentGPU={currentGPU} />
{provider === ProviderValueMap.Kubernetes ? ( {provider === ProviderValueMap.Kubernetes ? (
<> <>
<div className="command-info"> <div className="command-info">
2. {intl.formatMessage({ id: 'clusters.create.register.tips' })} <StyledTag>2.</StyledTag>
{intl.formatMessage({ id: 'clusters.create.register.tips' })}
</div> </div>
<RegisterClusterInner registrationInfo={registrationInfo} /> <RegisterClusterInner registrationInfo={registrationInfo} />
</> </>
) : ( ) : (
<> <>
<div className="command-info"> <div className="command-info">
2. {intl.formatMessage({ id: 'clusters.create.addCommand.tips' })} <StyledTag>2.</StyledTag>
{intl.formatMessage({ id: 'clusters.create.addCommand.tips' })}
</div> </div>
<AlertInfoBlock
style={{ marginBottom: 16 }}
type="warning"
icon={<ExclamationCircleFilled />}
message={
workerCommand.notes?.length > 0 ? (
<NotesWrapper>
{workerCommand.notes.map((note: string, index: number) => (
<li
key={index}
dangerouslySetInnerHTML={{
__html: intl.formatMessage({ id: note })
}}
></li>
))}
</NotesWrapper>
) : null
}
></AlertInfoBlock>
<AddWorkerCommand <AddWorkerCommand
registrationInfo={registrationInfo} registrationInfo={registrationInfo}
currentGPU={currentGPU} currentGPU={currentGPU}
src/pages/cluster-management/components/support-gpus.tsx
+40 -12
View File
@@ -5,10 +5,25 @@ import iluvatarWEBP from '@/assets/logo/Iluvatar.png';
import metaxLogo from '@/assets/logo/metax.png'; import metaxLogo from '@/assets/logo/metax.png';
import moorePNG from '@/assets/logo/moore _threads.png'; import moorePNG from '@/assets/logo/moore _threads.png';
import IconFont from '@/components/icon-font'; import IconFont from '@/components/icon-font';
import { GPUDriverMap } from '@/pages/resources/config/gpu-driver'; import {
AddWorkerDockerNotes,
GPUDriverMap
} from '@/pages/resources/config/gpu-driver';
import { useIntl } from '@umijs/max'; import { useIntl } from '@umijs/max';
import styled from 'styled-components';
import ProviderCatalog from './provider-catalog'; import ProviderCatalog from './provider-catalog';
const Box = styled.div`
.template-card-wrapper {
.template-card-inner {
line-height: 1;
.template-card-content {
font-size: 13px;
}
}
}
`;
const ProviderImage = ({ src, showBg }: { src: string; showBg?: boolean }) => { const ProviderImage = ({ src, showBg }: { src: string; showBg?: boolean }) => {
return ( return (
<img <img
@@ -41,6 +56,7 @@ const SupportedHardware: React.FC<SupportedHardwareProps> = ({
description: '', description: '',
key: GPUDriverMap.NVIDIA, key: GPUDriverMap.NVIDIA,
locale: false, locale: false,
notes: AddWorkerDockerNotes[GPUDriverMap.NVIDIA],
link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#nvidia-cuda', link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#nvidia-cuda',
icon: <IconFont type="icon-nvidia2" style={{ fontSize: 32 }} /> icon: <IconFont type="icon-nvidia2" style={{ fontSize: 32 }} />
}, },
@@ -50,6 +66,7 @@ const SupportedHardware: React.FC<SupportedHardwareProps> = ({
value: GPUDriverMap.AMD, value: GPUDriverMap.AMD,
key: GPUDriverMap.AMD, key: GPUDriverMap.AMD,
locale: false, locale: false,
notes: AddWorkerDockerNotes[GPUDriverMap.AMD],
link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#amd-rocm', link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#amd-rocm',
icon: ( icon: (
<IconFont <IconFont
@@ -64,61 +81,72 @@ const SupportedHardware: React.FC<SupportedHardwareProps> = ({
value: GPUDriverMap.ASCEND, value: GPUDriverMap.ASCEND,
key: GPUDriverMap.ASCEND, key: GPUDriverMap.ASCEND,
locale: false, locale: false,
notes: AddWorkerDockerNotes[GPUDriverMap.ASCEND],
link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#ascend-cann', link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#ascend-cann',
icon: <ProviderImage src={ascendLogo} showBg /> icon: <ProviderImage src={ascendLogo} showBg />
}, },
{ {
label: intl.formatMessage({ id: 'vendor.hygon' }), label: intl.formatMessage({ id: 'vendor.hygon' }),
description: '', description: 'common.tag.experimental',
value: GPUDriverMap.HYGON, value: GPUDriverMap.HYGON,
key: GPUDriverMap.HYGON, key: GPUDriverMap.HYGON,
locale: false, locale: false,
notes: AddWorkerDockerNotes[GPUDriverMap.HYGON],
link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#hygon-dtk', link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#hygon-dtk',
icon: <ProviderImage src={hyponPNG} /> icon: <ProviderImage src={hyponPNG} />
}, },
{ {
label: intl.formatMessage({ id: 'vendor.moorthreads' }), label: intl.formatMessage({ id: 'vendor.moorthreads' }),
description: '', description: 'common.tag.experimental',
value: GPUDriverMap.MOORE_THREADS, value: GPUDriverMap.MOORE_THREADS,
key: GPUDriverMap.MOORE_THREADS, key: GPUDriverMap.MOORE_THREADS,
locale: false, locale: false,
notes: AddWorkerDockerNotes[GPUDriverMap.MOORE_THREADS],
link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#moore-threads-musa', link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#moore-threads-musa',
icon: <ProviderImage src={moorePNG} /> icon: <ProviderImage src={moorePNG} />
}, },
{ {
label: intl.formatMessage({ id: 'vendor.iluvatar' }), label: intl.formatMessage({ id: 'vendor.iluvatar' }),
description: '', description: 'common.tag.experimental',
value: GPUDriverMap.ILUVATAR, value: GPUDriverMap.ILUVATAR,
key: GPUDriverMap.ILUVATAR, key: GPUDriverMap.ILUVATAR,
locale: false, locale: false,
notes: AddWorkerDockerNotes[GPUDriverMap.ILUVATAR],
link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#iluvatar-corex', link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#iluvatar-corex',
icon: <ProviderImage src={iluvatarWEBP} showBg /> icon: <ProviderImage src={iluvatarWEBP} showBg />
}, },
{ {
label: intl.formatMessage({ id: 'vendor.cambricon' }), label: intl.formatMessage({ id: 'vendor.cambricon' }),
description: 'common.tag.experimental',
value: GPUDriverMap.CAMBRICON, value: GPUDriverMap.CAMBRICON,
key: GPUDriverMap.CAMBRICON, key: GPUDriverMap.CAMBRICON,
locale: false, locale: false,
notes: AddWorkerDockerNotes[GPUDriverMap.CAMBRICON],
link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#cambricon-mlu', link: 'https://docs.gpustack.ai/latest/installation/installation-requirements/#cambricon-mlu',
icon: <ProviderImage src={CambriconPNG} /> icon: <ProviderImage src={CambriconPNG} />
}, },
{ {
label: intl.formatMessage({ id: 'vendor.metax' }), label: intl.formatMessage({ id: 'vendor.metax' }),
description: 'common.tag.experimental',
value: GPUDriverMap.METAX, value: GPUDriverMap.METAX,
key: GPUDriverMap.METAX, key: GPUDriverMap.METAX,
locale: false, locale: false,
notes: AddWorkerDockerNotes[GPUDriverMap.METAX],
icon: <ProviderImage src={metaxLogo} showBg /> icon: <ProviderImage src={metaxLogo} showBg />
} }
]; ];
return ( return (
<ProviderCatalog <Box>
onSelect={onSelect} <ProviderCatalog
height={60} onSelect={onSelect}
current={current} height={60}
dataList={supportedHardPlatforms} current={current}
clickable={clickable} dataList={supportedHardPlatforms}
cols={4} clickable={clickable}
/> cols={4}
/>
</Box>
); );
}; };
src/pages/llmodels/forms/advance-config.tsx
+7 -2
View File
@@ -64,8 +64,13 @@ const AdvanceConfig = () => {
options={modelCategories} options={modelCategories}
></SealSelect> ></SealSelect>
</Form.Item> </Form.Item>
{formKey === DeployFormKeyMap.CATALOG && <BackendForm></BackendForm>} {formKey === DeployFormKeyMap.CATALOG && (
<CustomBackend></CustomBackend> <>
<BackendForm></BackendForm>
<CustomBackend></CustomBackend>
</>
)}
<BackendParametersList></BackendParametersList> <BackendParametersList></BackendParametersList>
<Form.Item<FormData> name="env"> <Form.Item<FormData> name="env">
<LabelSelector <LabelSelector
src/pages/llmodels/forms/basic.tsx
+8 -1
View File
@@ -12,6 +12,7 @@ import { DeployFormKeyMap, sourceOptions } from '../config';
import { useFormContext } from '../config/form-context'; import { useFormContext } from '../config/form-context';
import { FormData } from '../config/types'; import { FormData } from '../config/types';
import BackendForm from './backend'; import BackendForm from './backend';
import CustomBackend from './custom-backend';
import LocalPathSource from './local-path-source'; import LocalPathSource from './local-path-source';
import OnlineSource from './online-source'; import OnlineSource from './online-source';
@@ -118,7 +119,13 @@ const BasicForm: React.FC<BasicFormProps> = (props) => {
></SealSelect> ></SealSelect>
} }
</Form.Item> </Form.Item>
{formKey === DeployFormKeyMap.DEPLOYMENT && <BackendForm></BackendForm>} {formKey === DeployFormKeyMap.DEPLOYMENT && (
<>
<BackendForm></BackendForm>
<CustomBackend></CustomBackend>
</>
)}
<Form.Item<FormData> <Form.Item<FormData>
name="replicas" name="replicas"
rules={[ rules={[
src/pages/llmodels/forms/schedule-type.tsx
+5 -4
View File
@@ -71,12 +71,13 @@ const ScheduleTypeForm: React.FC = () => {
const scheduleType = Form.useWatch('scheduleType', form); const scheduleType = Form.useWatch('scheduleType', form);
const workerSelector = Form.useWatch('worker_selector', form); const workerSelector = Form.useWatch('worker_selector', form);
const handleScheduleTypeChange = (value: string) => { const handleScheduleTypeChange = async (value: string) => {
if (value === ScheduleValueMap.Auto) { if (value === ScheduleValueMap.Auto) {
await new Promise((resolve) => {
setTimeout(resolve, 100);
});
onValuesChange?.({}, form.getFieldsValue()); onValuesChange?.({}, form.getFieldsValue());
return; } else if (value === ScheduleValueMap.Manual) {
}
if (value === ScheduleValueMap.Manual) {
form.setFieldValue(['gpu_selector', 'gpus_per_replica'], null); form.setFieldValue(['gpu_selector', 'gpus_per_replica'], null);
} }
}; };
src/pages/resources/config/gpu-driver.ts
+112 -92
View File
@@ -137,20 +137,20 @@ const registerWorker = (params: {
}) => { }) => {
const config = GPUsConfigs[params.gpu]; const config = GPUsConfigs[params.gpu];
return `WORKER_NAME="gpustack-worker" \\ return `WORKER_NAME="gpustack-worker" \\
WORKER_IP="" \\ WORKER_IP="" \\
docker run -d --name \${WORKER_NAME} \\ docker run -d --name \${WORKER_NAME} \\
--restart=unless-stopped \\ --restart=unless-stopped \\
--privileged \\ --privileged \\
--net=host \\ --net=host \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\
-volume /var/run/docker.sock:/var/run/docker.sock \\ --volume /var/run/docker.sock:/var/run/docker.sock \\
--volume gpustack-data:/var/lib/gpustack \\ --volume gpustack-data:/var/lib/gpustack \\
--runtime ${config.runtime} \\ --runtime ${config.runtime} \\
${params.image} \\ ${params.image} \\
--server-url ${params.server} \\ --server-url ${params.server} \\
--token ${params.token} \\ --token ${params.token} \\
--worker-ip \${WORKER_IP}`; --worker-ip \${WORKER_IP}`;
}; };
// avaliable for Ascend // avaliable for Ascend
@@ -163,21 +163,21 @@ const registerAscendWorker = (params: {
}) => { }) => {
const config = GPUsConfigs[params.gpu]; const config = GPUsConfigs[params.gpu];
return `WORKER_NAME="gpustack-worker" \\ return `WORKER_NAME="gpustack-worker" \\
WORKER_IP="" \\ WORKER_IP="" \\
docker run -d --name \${WORKER_NAME} \\ docker run -d --name \${WORKER_NAME} \\
--restart=unless-stopped \\ --restart=unless-stopped \\
--privileged \\ --privileged \\
--net=host \\ --net=host \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\
-volume /var/run/docker.sock:/var/run/docker.sock \\ --volume /var/run/docker.sock:/var/run/docker.sock \\
--volume gpustack-data:/var/lib/gpustack \\ --volume gpustack-data:/var/lib/gpustack \\
--runtime ${config.runtime} \\ --runtime ${config.runtime} \\
--env "ASCEND_VISIBLE_DEVICES=$(npu-smi info -m | tail -n 1 | awk '{print $1}') \\ --env "ASCEND_VISIBLE_DEVICES=$(npu-smi info -m | tail -n 1 | awk '{print $1}') \\
${params.image} \\ ${params.image} \\
--server-url ${params.server} \\ --server-url ${params.server} \\
--token ${params.token} \\ --token ${params.token} \\
--worker-ip \${WORKER_IP}`; --worker-ip \${WORKER_IP}`;
}; };
const registerHygonWorker = (params: { const registerHygonWorker = (params: {
@@ -189,23 +189,23 @@ const registerHygonWorker = (params: {
}) => { }) => {
const config = GPUsConfigs[params.gpu]; const config = GPUsConfigs[params.gpu];
return `WORKER_NAME="gpustack-worker" \\ return `WORKER_NAME="gpustack-worker" \\
WORKER_IP="" \\ WORKER_IP="" \\
docker run -d --name \${WORKER_NAME} \\ docker run -d --name \${WORKER_NAME} \\
--restart=unless-stopped \\ --restart=unless-stopped \\
--privileged \\ --privileged \\
--net=host \\ --net=host \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\
-volume /var/run/docker.sock:/var/run/docker.sock \\ --volume /var/run/docker.sock:/var/run/docker.sock \\
--volume gpustack-data:/var/lib/gpustack \\ --volume gpustack-data:/var/lib/gpustack \\
--runtime ${config.runtime} \\ --runtime ${config.runtime} \\
--volume /opt/hyhal:/opt/hyhal:ro \\ --volume /opt/hyhal:/opt/hyhal:ro \\
--volume /opt/dtk:/opt/dtk:ro \\ --volume /opt/dtk:/opt/dtk:ro \\
--env ROCM_PATH=/opt/dtk \\ --env ROCM_PATH=/opt/dtk \\
${params.image} \\ ${params.image} \\
--server-url ${params.server} \\ --server-url ${params.server} \\
--token ${params.token} \\ --token ${params.token} \\
--worker-ip \${WORKER_IP}`; --worker-ip \${WORKER_IP}`;
}; };
const registerIluvatarWorker = (params: { const registerIluvatarWorker = (params: {
@@ -217,22 +217,22 @@ const registerIluvatarWorker = (params: {
}) => { }) => {
const config = GPUsConfigs[params.gpu]; const config = GPUsConfigs[params.gpu];
return `WORKER_NAME="gpustack-worker" \\ return `WORKER_NAME="gpustack-worker" \\
WORKER_IP="" \\ WORKER_IP="" \\
docker run -d --name \${WORKER_NAME} \\ docker run -d --name \${WORKER_NAME} \\
--restart=unless-stopped \\ --restart=unless-stopped \\
--privileged \\ --privileged \\
--net=host \\ --net=host \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\
-volume /var/run/docker.sock:/var/run/docker.sock \\ --volume /var/run/docker.sock:/var/run/docker.sock \\
--volume gpustack-data:/var/lib/gpustack \\ --volume gpustack-data:/var/lib/gpustack \\
--volume /lib/modules:/lib/modules:ro \\ --volume /lib/modules:/lib/modules:ro \\
--volume /usr/local/corex:/usr/local/corex:ro \\ --volume /usr/local/corex:/usr/local/corex:ro \\
--volume /usr/bin/ixsmi:/usr/bin/ixsmi \\ --volume /usr/bin/ixsmi:/usr/bin/ixsmi \\
${params.image} \\ ${params.image} \\
--server-url ${params.server} \\ --server-url ${params.server} \\
--token ${params.token} \\ --token ${params.token} \\
--worker-ip \${WORKER_IP}`; --worker-ip \${WORKER_IP}`;
}; };
const registerMetaXWorker = (params: { const registerMetaXWorker = (params: {
@@ -244,21 +244,21 @@ const registerMetaXWorker = (params: {
}) => { }) => {
const config = GPUsConfigs[params.gpu]; const config = GPUsConfigs[params.gpu];
return `WORKER_NAME="gpustack-worker" \\ return `WORKER_NAME="gpustack-worker" \\
WORKER_IP="" \\ WORKER_IP="" \\
docker run -d --name \${WORKER_NAME} \\ docker run -d --name \${WORKER_NAME} \\
--restart=unless-stopped \\ --restart=unless-stopped \\
--privileged \\ --privileged \\
--net=host \\ --net=host \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\
-volume /var/run/docker.sock:/var/run/docker.sock \\ --volume /var/run/docker.sock:/var/run/docker.sock \\
--volume gpustack-data:/var/lib/gpustack \\ --volume gpustack-data:/var/lib/gpustack \\
--volume /opt/mxdriver:/opt/mxdriver:ro \\ --volume /opt/mxdriver:/opt/mxdriver:ro \\
--volume /opt/maca:/opt/maca:ro \\ --volume /opt/maca:/opt/maca:ro \\
${params.image} \\ ${params.image} \\
--server-url ${params.server} \\ --server-url ${params.server} \\
--token ${params.token} \\ --token ${params.token} \\
--worker-ip \${WORKER_IP}`; --worker-ip \${WORKER_IP}`;
}; };
const registerCambriconWorker = (params: { const registerCambriconWorker = (params: {
@@ -270,21 +270,21 @@ const registerCambriconWorker = (params: {
}) => { }) => {
const config = GPUsConfigs[params.gpu]; const config = GPUsConfigs[params.gpu];
return `WORKER_NAME="gpustack-worker" \\ return `WORKER_NAME="gpustack-worker" \\
WORKER_IP="" \\ WORKER_IP="" \\
docker run -d --name \${WORKER_NAME} \\ docker run -d --name \${WORKER_NAME} \\
--restart=unless-stopped \\ --restart=unless-stopped \\
--privileged \\ --privileged \\
--net=host \\ --net=host \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_DEPLOYMENT=true" \\
--env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\ --env "GPUSTACK_RUNTIME_DEPLOY_MIRRORED_NAME=\${WORKER_NAME}" \\
-volume /var/run/docker.sock:/var/run/docker.sock \\ --volume /var/run/docker.sock:/var/run/docker.sock \\
--volume gpustack-data:/var/lib/gpustack \\ --volume gpustack-data:/var/lib/gpustack \\
--volume /usr/local/neuware:/usr/local/neuware:ro \\ --volume /usr/local/neuware:/usr/local/neuware:ro \\
--volume /usr/bin/cnmon:/usr/bin/cnmon \\ --volume /usr/bin/cnmon:/usr/bin/cnmon \\
${params.image} \\ ${params.image} \\
--server-url ${params.server} \\ --server-url ${params.server} \\
--token ${params.token} \\ --token ${params.token} \\
--worker-ip \${WORKER_IP}`; --worker-ip \${WORKER_IP}`;
}; };
export const registerAddWokerCommandMap = { export const registerAddWokerCommandMap = {
@@ -297,3 +297,23 @@ export const registerAddWokerCommandMap = {
[GPUDriverMap.METAX]: registerMetaXWorker, [GPUDriverMap.METAX]: registerMetaXWorker,
[GPUDriverMap.MOORE_THREADS]: registerWorker [GPUDriverMap.MOORE_THREADS]: registerWorker
}; };
export const AddWorkerDockerNotes: Record<string, string[]> = {
[GPUDriverMap.NVIDIA]: [
'clusters.addworker.nvidiaNotes-01',
'clusters.addworker.nvidiaNotes-02'
],
[GPUDriverMap.AMD]: [
'clusters.addworker.nvidiaNotes-01',
'clusters.addworker.nvidiaNotes-02'
],
[GPUDriverMap.MOORE_THREADS]: [
'clusters.addworker.nvidiaNotes-01',
'clusters.addworker.nvidiaNotes-02'
],
[GPUDriverMap.ASCEND]: [],
[GPUDriverMap.HYGON]: ['clusters.addworker.hygonNotes'],
[GPUDriverMap.ILUVATAR]: ['clusters.addworker.corexNotes'],
[GPUDriverMap.CAMBRICON]: ['clusters.addworker.cambriconNotes'],
[GPUDriverMap.METAX]: ['clusters.addworker.metaxNotes']
};