diff --git a/react-ui/src/pages/ActiveLearn/components/ActiveLearnBasic/index.tsx b/react-ui/src/pages/ActiveLearn/components/ActiveLearnBasic/index.tsx
index 2ea0cb8f..e8e597e9 100644
--- a/react-ui/src/pages/ActiveLearn/components/ActiveLearnBasic/index.tsx
+++ b/react-ui/src/pages/ActiveLearn/components/ActiveLearnBasic/index.tsx
@@ -89,9 +89,17 @@ function BasicInfo({ info, className, runStatus, isInstance = false }: BasicInfo
label: 'epochs',
value: info.epochs,
},
+ {
+ label: 'batch_size',
+ value: info.batch_size,
+ },
];
const lossInfo = [
+ {
+ label: '学习率',
+ value: info.lr,
+ },
{
label: 'loss文件路径',
value: info.loss_py,
@@ -100,10 +108,6 @@ function BasicInfo({ info, className, runStatus, isInstance = false }: BasicInfo
label: 'loss类名',
value: info.loss_class_name,
},
- {
- label: '学习率',
- value: info.lr,
- },
];
const algorithmInfo = [
@@ -130,12 +134,6 @@ function BasicInfo({ info, className, runStatus, isInstance = false }: BasicInfo
value: info.task_type,
format: formatEnum(autoMLTaskTypeOptions),
},
- {
- label: '框架类型',
- value: info.framework_type,
- format: formatEnum(frameworkTypeOptions),
- },
- ...diffInfo,
{
label: '代码配置',
value: info.code_config,
@@ -164,6 +162,12 @@ function BasicInfo({ info, className, runStatus, isInstance = false }: BasicInfo
value: info.computing_resource_id,
format: getResourceDescription,
},
+ {
+ label: '框架类型',
+ value: info.framework_type,
+ format: formatEnum(frameworkTypeOptions),
+ },
+ ...diffInfo,
{
label: '是否打乱',
value: info.shuffle,
@@ -198,10 +202,6 @@ function BasicInfo({ info, className, runStatus, isInstance = false }: BasicInfo
label: '检查点轮数',
value: info.checkpoint_num,
},
- {
- label: 'batch_size',
- value: info.batch_size,
- },
];
}, [info, getResourceDescription]);
diff --git a/react-ui/src/pages/ActiveLearn/components/CreateForm/ExecuteConfig.tsx b/react-ui/src/pages/ActiveLearn/components/CreateForm/ExecuteConfig.tsx
index b3dd6285..bedbe0f2 100644
--- a/react-ui/src/pages/ActiveLearn/components/CreateForm/ExecuteConfig.tsx
+++ b/react-ui/src/pages/ActiveLearn/components/CreateForm/ExecuteConfig.tsx
@@ -40,6 +40,120 @@ function ExecuteConfig() {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{frameworkType === FrameworkType.Pytorch ? (
<>
+
+
+
+
+
+
+
-
-
-
-
-
-
-
>
) : null}
>
@@ -255,75 +385,8 @@ function ExecuteConfig() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -345,53 +408,6 @@ function ExecuteConfig() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
>
);
}
diff --git a/react-ui/src/pages/AutoML/components/CreateForm/ExecuteConfig.tsx b/react-ui/src/pages/AutoML/components/CreateForm/ExecuteConfig.tsx
index 689deb1b..3f85f5c5 100644
--- a/react-ui/src/pages/AutoML/components/CreateForm/ExecuteConfig.tsx
+++ b/react-ui/src/pages/AutoML/components/CreateForm/ExecuteConfig.tsx
@@ -305,7 +305,7 @@ function ExecuteConfig() {
name="max_models_on_disc"
tooltip="定义在磁盘中保存的模型的最大数量。额外的模型数量将被永久删除,它设置了一个集成可以使用多少个模型的上限。必须是大于等于1的整数,默认50"
>
-
+
diff --git a/react-ui/src/pages/AutoML/components/ExperimentHistory/index.tsx b/react-ui/src/pages/AutoML/components/ExperimentHistory/index.tsx
index 0441a623..f2e9482f 100644
--- a/react-ui/src/pages/AutoML/components/ExperimentHistory/index.tsx
+++ b/react-ui/src/pages/AutoML/components/ExperimentHistory/index.tsx
@@ -93,7 +93,7 @@ function ExperimentHistory({ calcMetrics, fileUrl, isClassification }: Experimen
title: '状态',
dataIndex: 'status',
key: 'status',
- width: 120,
+ width: 150,
render: TrialStatusCell,
},
];
diff --git a/react-ui/src/pages/AutoML/components/ExperimentList/index.tsx b/react-ui/src/pages/AutoML/components/ExperimentList/index.tsx
index 61a814d4..da0a0869 100644
--- a/react-ui/src/pages/AutoML/components/ExperimentList/index.tsx
+++ b/react-ui/src/pages/AutoML/components/ExperimentList/index.tsx
@@ -357,7 +357,7 @@ function ExperimentList({ type }: ExperimentListProps) {
return (
-
+
= {
color: themes.textColor,
icon: '/assets/images/experiment-status/omitted-icon.png',
},
+ [AutoMLTrailStatus.MEMOUT]: {
+ label: '内存溢出',
+ color: themes.errorColor,
+ icon: '/assets/images/experiment-status/fail-icon.png',
+ },
};
function TrialStatusCell(status?: AutoMLTrailStatus | null) {
@@ -58,7 +63,7 @@ function TrialStatusCell(status?: AutoMLTrailStatus | null) {
style={{ color: statusInfo[status] ? statusInfo[status].color : themes.textColor }}
className={styles['trial-status-cell__label']}
>
- {statusInfo[status] ? statusInfo[status].label : status}
+ {statusInfo[status] ? statusInfo[status].label : '未知'}
);
diff --git a/react-ui/src/pages/Dataset/components/VersionCompareModal/index.tsx b/react-ui/src/pages/Dataset/components/VersionCompareModal/index.tsx
index 5e2292f8..a5b37131 100644
--- a/react-ui/src/pages/Dataset/components/VersionCompareModal/index.tsx
+++ b/react-ui/src/pages/Dataset/components/VersionCompareModal/index.tsx
@@ -36,7 +36,7 @@ interface VersionCompareModalProps extends Omit
{
repo_id: number;
}
-const formatDataset = (datasets?: DatasetData[]) => {
+const formatDatasets = (datasets?: DatasetData[]) => {
if (!datasets || datasets.length === 0) {
return undefined;
}
@@ -105,12 +105,12 @@ function VersionCompareModal({
{
key: 'train_datasets',
text: '训练数据集',
- format: formatDataset,
+ format: formatDatasets,
},
{
key: 'test_datasets',
text: '测试数据集',
- format: formatDataset,
+ format: formatDatasets,
},
{
key: 'model_source',
diff --git a/react-ui/src/pages/ModelDeployment/components/VersionBasicInfo/index.tsx b/react-ui/src/pages/ModelDeployment/components/VersionBasicInfo/index.tsx
index 3a2f3280..35916272 100644
--- a/react-ui/src/pages/ModelDeployment/components/VersionBasicInfo/index.tsx
+++ b/react-ui/src/pages/ModelDeployment/components/VersionBasicInfo/index.tsx
@@ -3,7 +3,7 @@ import { ServiceRunStatus } from '@/enums';
import { useComputingResource } from '@/hooks/useComputingResource';
import { ServiceVersionData } from '@/pages/ModelDeployment/types';
import { formatDate } from '@/utils/date';
-import { formatCodeConfig, formatModel } from '@/utils/format';
+import { formatCodeConfig, formatMirror, formatModel } from '@/utils/format';
import { Flex } from 'antd';
import ModelDeployStatusCell from '../ModelDeployStatusCell';
@@ -55,6 +55,7 @@ function VersionBasicInfo({ info }: BasicInfoProps) {
{
label: '镜像',
value: info?.image,
+ format: formatMirror,
},
{
label: '状态',
diff --git a/react-ui/src/pages/ModelDeployment/components/VersionCompareModal/index.tsx b/react-ui/src/pages/ModelDeployment/components/VersionCompareModal/index.tsx
index b38ff770..85faf6a8 100644
--- a/react-ui/src/pages/ModelDeployment/components/VersionCompareModal/index.tsx
+++ b/react-ui/src/pages/ModelDeployment/components/VersionCompareModal/index.tsx
@@ -60,6 +60,9 @@ function VersionCompareModal({ version1, version2, ...rest }: VersionCompareModa
{
key: 'image',
text: '镜像',
+ format: (data: any) => {
+ return data?.path;
+ },
},
{
key: 'code_config',
diff --git a/react-ui/src/pages/Workspace/components/ExperimentTable/index.tsx b/react-ui/src/pages/Workspace/components/ExperimentTable/index.tsx
index 66b10167..c454d170 100644
--- a/react-ui/src/pages/Workspace/components/ExperimentTable/index.tsx
+++ b/react-ui/src/pages/Workspace/components/ExperimentTable/index.tsx
@@ -3,7 +3,7 @@ import { ExperimentStatus, experimentStatusInfo } from '@/pages/Experiment/statu
import { ExperimentInstance } from '@/types';
import { elapsedTime, formatDate } from '@/utils/date';
import { useNavigate } from '@umijs/max';
-import { Button } from 'antd';
+import { Button, Empty } from 'antd';
import styles from './index.less';
type ExperimentTableProps = {
tableData: ExperimentInstance[];
@@ -24,33 +24,40 @@ function ExperimentTable({ tableData = [], style }: ExperimentTableProps) {
开始时间
操作
- {tableData?.map((item) => (
-
-
-

+ {Array.isArray(tableData) && tableData.length > 0 ? (
+ tableData.map((item) => (
+
+
+

+
+
+ {elapsedTime(item.create_time, item.finish_time)}
+
+
{formatDate(item.create_time)}
+
+ }
+ onClick={() => gotoExperiment(item)}
+ >
+ 详情
+
+
-
- {elapsedTime(item.create_time, item.finish_time)}
-
-
{formatDate(item.create_time)}
-
- }
- onClick={() => gotoExperiment(item)}
- >
- 详情
-
-
-
- ))}
+ ))
+ ) : (
+
+ )}
);
}
diff --git a/react-ui/src/utils/downloadfile.ts b/react-ui/src/utils/downloadfile.ts
index 2ee843ab..81692b7d 100644
--- a/react-ui/src/utils/downloadfile.ts
+++ b/react-ui/src/utils/downloadfile.ts
@@ -91,10 +91,3 @@ export function downloadCommonFile(url: string, type: string, fileName: string =
resolveBlob(res, type, fileName);
});
}
-
-/**
- * @deprecated 无效
- */
-export function download(fileName: string) {
- window.location.href = `/api/common/download?fileName=${encodeURI(fileName)}&delete=${true}`;
-}
diff --git a/react-ui/src/utils/format.ts b/react-ui/src/utils/format.ts
index 32e7d7d4..456ae834 100644
--- a/react-ui/src/utils/format.ts
+++ b/react-ui/src/utils/format.ts
@@ -30,7 +30,7 @@ export const formatDatasets = (datasets?: DatasetData[]): BasicInfoLink[] | unde
return undefined;
}
return datasets.map((item) => ({
- value: item.name,
+ value: `${item.name}:${item.version}`,
link: `/dataset/dataset/info/${item.id}?tab=${ResourceInfoTabKeys.Introduction}&version=${item.version}&name=${item.name}&owner=${item.owner}&identifier=${item.identifier}`,
}));
};
@@ -46,7 +46,7 @@ export const formatDataset = (dataset?: DatasetData): BasicInfoLink | undefined
return undefined;
}
return {
- value: dataset.name,
+ value: `${dataset.name}:${dataset.version}`,
link: `/dataset/dataset/info/${dataset.id}?tab=${ResourceInfoTabKeys.Introduction}&version=${dataset.version}&name=${dataset.name}&owner=${dataset.owner}&identifier=${dataset.identifier}`,
};
};
@@ -62,7 +62,7 @@ export const formatModel = (model: ModelData): BasicInfoLink | undefined => {
return undefined;
}
return {
- value: model.name,
+ value: `${model.name}:${model.version}`,
link: `/dataset/model/info/${model.id}?tab=${ResourceInfoTabKeys.Introduction}&version=${model.version}&name=${model.name}&owner=${model.owner}&identifier=${model.identifier}`,
};
};