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

fix: default spec by mode

Browse Source
This commit is contained in:
jialin
2025-11-03 10:14:30 +08:00
parent 7936d0063d
commit 56eba0d4fc
6 changed files with 269 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/llmodels/apis/index.ts
+10 -9
View File
@@ -3,11 +3,11 @@ import { downloadFile, listFiles, listModels } from '@huggingface/hub';
import { PipelineType } from '@huggingface/tasks';
import { request } from '@umijs/max';
import qs from 'query-string';
import testSpecs from '../config/test';
import {
AccessControlFormData,
BackendItem,
CatalogItem,
CatalogSpec,
DraftModelItem,
EvaluateResult,
EvaluateSpec,
@@ -370,14 +370,15 @@ export async function queryCatalogItemSpec(
params: { id: number },
options?: any
) {
return await request<Global.PageResponse<CatalogSpec>>(
`/model-sets/${params.id}/specs`,
{
method: 'GET',
...options,
params
}
);
// return await request<Global.PageResponse<CatalogSpec>>(
// `/model-sets/${params.id}/specs`,
// {
// method: 'GET',
// ...options,
// params
// }
// );
return testSpecs;
}
export async function evaluationsModelSpec(
src/pages/llmodels/components/deploy-builtin-modal.tsx
+84 -32
View File
@@ -25,12 +25,28 @@ import { useCheckCompatibility } from '../hooks';
import useFormInitialValues from '../hooks/use-form-initial-values';
import CompatibilityAlert from './compatible-alert';
const ModesMap: Record<string, string> = {
latency: 'models.form.mode.latency',
reference: 'models.form.mode.reference',
throughput: 'models.form.mode.throughput'
};
const ModesTipsMap: Record<string, string> = {
latency: 'models.form.mode.latency.tips',
reference: 'models.form.mode.reference.tips',
throughput: 'models.form.mode.throughput.tips'
};
const pickFieldsFromSpec = [
'backend_version',
'backend_parameters',
'env',
'size',
'quantization'
'source',
'quantization',
'backend_version',
'backend_parameters',
'backend',
'extended_kv_cache',
'speculative_config'
];
type AddModalProps = {
@@ -115,6 +131,7 @@ const AddModal: React.FC<AddModalProps> = (props) => {
const [quantizationOptions, setQuantizationOptions] = useState<
Global.BaseOption<string>[]
>([]);
const [modeList, setModeList] = useState<Global.BaseOption<string>[]>([]);
const sourceGroupMap = useRef<any>({});
const axiosToken = useRef<any>(null);
const selectSpecRef = useRef<CatalogSpec>({} as CatalogSpec);
@@ -167,32 +184,37 @@ const AddModal: React.FC<AddModalProps> = (props) => {
};
const getModelSpec = (data: {
mode?: string;
backend: string;
size: number;
quantization: string;
}) => {
const spec = _.find(specListRef.current, (item: CatalogSpec) => {
if (data.size && data.quantization) {
return (
item.size === data.size &&
item.backend === data.backend &&
item.quantization === data.quantization
);
}
if (data.size) {
return item.size === data.size && item.backend === data.backend;
}
if (data.quantization) {
return (
item.quantization === data.quantization &&
item.backend === data.backend
);
}
return item.backend === data.backend;
});
selectSpecRef.current = spec;
// const spec = _.find(specListRef.current, (item: CatalogSpec) => {
// if (data.size && data.quantization) {
// return (
// item.size === data.size &&
// item.backend === data.backend &&
// item.quantization === data.quantization
// );
// }
// if (data.size) {
// return item.size === data.size && item.backend === data.backend;
// }
// if (data.quantization) {
// return (
// item.quantization === data.quantization &&
// item.backend === data.backend
// );
// }
// return item.backend === data.backend;
// });
const defaultSpec = _.find(
specListRef.current,
(item: CatalogSpec) => item.mode === data.mode
);
selectSpecRef.current = defaultSpec;
return {
..._.pick(spec, pickFieldsFromSpec),
..._.pick(defaultSpec, pickFieldsFromSpec),
categories: _.get(current, 'categories.0', null)
};
};
@@ -242,6 +264,7 @@ const AddModal: React.FC<AddModalProps> = (props) => {
};
});
const result = _.uniqBy(quantizationList, 'value');
console.log('quantization options:', result);
setQuantizationOptions(result);
return result;
};
@@ -376,6 +399,16 @@ const AddModal: React.FC<AddModalProps> = (props) => {
}
);
const groupList = _.groupBy(res.items, 'source');
const modes = _.groupBy(res.items, 'mode');
const modeDataList = _.map(modes, (item: CatalogSpec, key: string) => {
return {
label: ModesMap[key] || key,
isBuiltIn: ModesMap[key] ? true : false,
value: key,
tips: ModesTipsMap[key] || ''
};
});
sourceGroupMap.current = groupList;
@@ -387,20 +420,21 @@ const AddModal: React.FC<AddModalProps> = (props) => {
const list = _.sortBy(res.items, 'size');
console.log('spec items:', res.items);
hasF16Ref.current = _.some(res.items, (item: CatalogSpec) => {
return AscendNPUQuant_F16.includes(_.toUpper(item.quantization));
});
const defaultSpec =
_.find(list, (item: CatalogSpec) => {
return getDefaultQuant({
category: _.get(current, 'categories.0', ''),
quantOption: item.quantization,
backend: item.backend
});
}) || _.get(res.items, `0`, {});
const defaultSpec = _.find(
list,
(item: CatalogSpec) => item.mode === modeDataList[0]?.value
);
console.log('default spec:', defaultSpec);
selectSpecRef.current = defaultSpec;
setModeList(modeDataList);
setSourceList(sources);
handleSetBackendOptions();
handleSetSizeOptions({
@@ -472,6 +506,22 @@ const AddModal: React.FC<AddModalProps> = (props) => {
handleCheckFormData();
};
const handleOnModeChange = (val: string) => {
const data = getModelSpec({
mode: val,
backend: form.current.getFieldValue('backend'),
size: 0,
quantization: ''
});
console.log('mode change data:', data);
form.current.setFieldsValue({
...data
});
handleCheckFormData();
};
const handleOk = async (values: FormData) => {
const data = {
..._.omit(selectSpecRef.current, ['name']),
@@ -542,6 +592,8 @@ const AddModal: React.FC<AddModalProps> = (props) => {
value={{
sizeOptions: [],
quantizationOptions: [],
modeList: modeList,
onModeChange: handleOnModeChange,
onSizeChange: handleOnSizeChange,
onQuantizationChange: handleOnQuantizationChange
}}
src/pages/llmodels/config/form-context.ts
+2
View File
@@ -30,6 +30,8 @@ interface FormContextProps {
interface CatalogFormContextProps {
sizeOptions: Global.BaseOption<number>[];
quantizationOptions: Global.BaseOption<string>[];
modeList: Global.BaseOption<string & { isBuiltIn: boolean; tips: string }>[];
onModeChange: (val: string) => void;
onSizeChange: (val: number) => void;
onQuantizationChange: (val: string) => void;
}
src/pages/llmodels/config/test.ts
+138
View File
@@ -0,0 +1,138 @@
export default {
items: [
{
source: 'model_scope',
huggingface_repo_id: null,
huggingface_filename: null,
ollama_library_model_name: null,
model_scope_model_id: 'Qwen/Qwen3-30B-A3B-FP8',
model_scope_file_path: null,
local_path: null,
name: null,
description: null,
meta: {},
replicas: 1,
ready_replicas: 0,
categories: [],
embedding_only: false,
image_only: false,
reranker: false,
speech_to_text: false,
text_to_speech: false,
placement_strategy: 'spread',
cpu_offloading: false,
distributed_inference_across_workers: false,
worker_selector: {},
gpu_selector: null,
backend: 'SGLang',
backend_version: null,
backend_parameters: [
'--reasoning-parser=qwen3',
'--tool-call-parser=qwen25'
],
image_name: null,
run_command: null,
env: null,
restart_on_error: true,
distributable: false,
extended_kv_cache: null,
speculative_config: null,
quantization: 'FP8',
mode: 'throughput'
},
{
source: 'model_scope',
huggingface_repo_id: null,
huggingface_filename: null,
ollama_library_model_name: null,
model_scope_model_id: 'Qwen/Qwen3-30B-A3B-FP8',
model_scope_file_path: null,
local_path: null,
name: null,
description: null,
meta: {},
replicas: 1,
ready_replicas: 0,
categories: [],
embedding_only: false,
image_only: false,
reranker: false,
speech_to_text: false,
text_to_speech: false,
placement_strategy: 'spread',
cpu_offloading: false,
distributed_inference_across_workers: false,
worker_selector: {},
gpu_selector: null,
backend: 'SGLang',
backend_version: null,
backend_parameters: [
'--reasoning-parser=qwen3',
'--tool-call-parser=qwen25',
'--speculative-algorithm=EAGLE3',
'--speculative-draft-model-path=Tengyunw/qwen3_30b_moe_eagle3',
'--speculative-num-steps=6',
'--speculative-eagle-topk=10',
'--speculative-num-draft-tokens=32'
],
image_name: null,
run_command: null,
env: null,
restart_on_error: true,
distributable: false,
extended_kv_cache: null,
speculative_config: {
enabled: true,
algorithm: 'eagle3',
draft_model_name: 'Qwen3-30B-A3B-EAGLE3',
num_draft_tokens: 8,
ngram_min_match_length: null,
ngram_max_match_length: null
},
quantization: 'FP8',
mode: 'latency'
},
{
source: 'model_scope',
huggingface_repo_id: null,
huggingface_filename: null,
ollama_library_model_name: null,
model_scope_model_id: 'Qwen/Qwen3-30B-A3B',
model_scope_file_path: null,
local_path: null,
name: null,
description: null,
meta: {},
replicas: 1,
ready_replicas: 0,
categories: [],
embedding_only: false,
image_only: false,
reranker: false,
speech_to_text: false,
text_to_speech: false,
placement_strategy: 'spread',
cpu_offloading: false,
distributed_inference_across_workers: true,
worker_selector: {},
gpu_selector: null,
backend: 'vLLM',
backend_version: null,
backend_parameters: [
'--tool-call-parser=hermes',
'--enable-auto-tool-choice',
'--max-model-len=32768'
],
image_name: null,
run_command: null,
env: null,
restart_on_error: true,
distributable: false,
extended_kv_cache: null,
speculative_config: null,
quantization: 'BF16',
mode: 'reference'
}
],
pagination: { page: 1, perPage: 100, total: 3, totalPage: 1 }
};
src/pages/llmodels/config/types.ts
+15
View File
@@ -198,12 +198,27 @@ export interface CatalogSpec {
categories: any[];
placement_strategy: string;
cpu_offloading: boolean;
mode: string;
distributed_inference_across_workers: boolean;
worker_selector: Record<string, any>;
gpu_selector: {
gpu_ids: string[];
gpus_per_replica: number;
};
extended_kv_cache: {
enabled: boolean;
chunk_size: number;
max_local_cpu_size: number;
remote_url: string;
};
speculative_config: {
enabled: boolean;
algorithm: string;
draft_model_name: string;
num_draft_tokens: number;
ngram_min_match_length: number;
ngram_max_match_length: number;
};
backend: string;
backend_version: string;
backend_parameters: any[];
src/pages/llmodels/forms/performance.tsx
+20 -19
View File
@@ -1,10 +1,11 @@
import AutoTooltip from '@/components/auto-tooltip';
import SealSelect from '@/components/seal-form/seal-select';
import TooltipList from '@/components/tooltip-list';
import { useIntl } from '@umijs/max';
import { Form } from 'antd';
import { Form, Select } from 'antd';
import React from 'react';
import { deployFormKeyMap } from '../config';
import { useFormContext } from '../config/form-context';
import { useCatalogFormContext, useFormContext } from '../config/form-context';
import KVCacheForm from './kv-cache';
import SpeculativeDecode from './speculative-decode';
@@ -36,6 +37,7 @@ const Performance: React.FC = () => {
const intl = useIntl();
const form = Form.useFormInstance();
const { formKey } = useFormContext();
const { modeList, onModeChange } = useCatalogFormContext();
return (
<>
@@ -43,25 +45,24 @@ const Performance: React.FC = () => {
{formKey === deployFormKeyMap.catalog && (
<Form.Item name="mode">
<SealSelect
onChange={onModeChange}
description={<TooltipList list={modeTipsList}></TooltipList>}
label={intl.formatMessage({ id: 'models.form.mode' })}
options={[
{
label: intl.formatMessage({
id: 'models.form.mode.throughput'
}),
value: 'throughput'
},
{
label: intl.formatMessage({ id: 'models.form.mode.latency' }),
value: 'latency'
},
{
label: intl.formatMessage({ id: 'models.form.mode.reference' }),
value: 'reference'
}
]}
></SealSelect>
>
{modeList.map((item: any) => (
<Select.Option key={item.value} value={item.value}>
<AutoTooltip
showTitle={item.isBuiltIn}
ghost
title={intl.formatMessage({ id: item.tips })}
>
{item.isBuiltIn
? intl.formatMessage({ id: item.label })
: item.label}
</AutoTooltip>
</Select.Option>
))}
</SealSelect>
</Form.Item>
)}
<KVCacheForm></KVCacheForm>