diff --git a/mindinsight/ui/src/common/common-property.js b/mindinsight/ui/src/common/common-property.js
index 6acce84d..bc6da133 100644
--- a/mindinsight/ui/src/common/common-property.js
+++ b/mindinsight/ui/src/common/common-property.js
@@ -138,11 +138,11 @@ export default {
dataMapDownloadStyle: '',
+ '.Repeat > polygon { stroke: #fdca5a; fill: #fff2d4; }' +
+ '.Shuffle > polygon { stroke: #e37d29; fill: #ffd0a6; }' +
+ '.Batch > polygon { stroke: #de504e; fill: #ffbcba; }' +
+ '.edge path { stroke: rgb(167, 167, 167); }' +
+ '.edge polygon { fill: rgb(167, 167, 167); stroke: rgb(167, 167, 167); }',
};
diff --git a/mindinsight/ui/src/views/train-manage/data-map.vue b/mindinsight/ui/src/views/train-manage/data-map.vue
index a2083af6..b03cc586 100644
--- a/mindinsight/ui/src/views/train-manage/data-map.vue
+++ b/mindinsight/ui/src/views/train-manage/data-map.vue
@@ -255,19 +255,23 @@ export default {
'ShuffleDataset',
'RepeatDataset',
'MapDataset',
+ 'Batch',
+ 'Shuffle',
+ 'Repeat',
+ 'Map',
];
let nodeStr = '';
let edgeStr = '';
Object.keys(this.allGraphData).forEach((key) => {
const node = this.allGraphData[key];
- if (node.op_type === 'MapDataset') {
+ if (node.op_type.startsWith('Map')) {
nodeStr += this.packageSubGraph(key);
} else {
node.id = key;
nodeStr +=
`<${node.key}>[id="${node.key}";label="${node.op_type}";` +
`class=${
- nodeType.includes(node.op_type) ? node.op_type : 'CreatDataset'
+ nodeType.includes(node.op_type) ? node.op_type.replace('Dataset', '') : 'Create'
};shape=rect;fillcolor="#9cc3e5";];`;
}
});
@@ -277,12 +281,8 @@ export default {
node.children.forEach((k) => {
const child = this.allGraphData[k];
edgeStr += `<${child.id}>-><${node.id}>[${
- child.op_type === 'MapDataset'
- ? `ltail=;`
- : ''
- }${
- node.op_type === 'MapDataset' ? `lhead=;` : ''
- }];`;
+ child.op_type.startsWith('Map') ? `ltail=;` : ''
+ }${node.op_type.startsWith('Map') ? `lhead=;` : ''}];`;
});
});
const initSetting =
@@ -692,7 +692,7 @@ export default {
stroke: red !important;
stroke-width: 2px;
}
-.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .CreatDataset > polygon,
+.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .Create > polygon,
.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .Operator > ellipse {
stroke: #4ea6e6;
fill: #b8e0ff;
@@ -701,15 +701,15 @@ export default {
fill: #8df1f2;
stroke: #00a5a7;
}
-.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .RepeatDataset > polygon {
+.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .Repeat > polygon {
stroke: #fdca5a;
fill: #fff2d4;
}
-.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .ShuffleDataset > polygon {
+.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .Shuffle > polygon {
stroke: #e37d29;
fill: #ffd0a6;
}
-.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .BatchDataset > polygon {
+.cl-data-map-manage #data-maps .cl-data-map .data-map-container #graph .Batch > polygon {
stroke: #de504e;
fill: #ffbcba;
}
diff --git a/mindinsight/ui/src/views/train-manage/training-dashboard.vue b/mindinsight/ui/src/views/train-manage/training-dashboard.vue
index 917ff29e..4d154cc4 100644
--- a/mindinsight/ui/src/views/train-manage/training-dashboard.vue
+++ b/mindinsight/ui/src/views/train-manage/training-dashboard.vue
@@ -2011,19 +2011,23 @@ export default {
'ShuffleDataset',
'RepeatDataset',
'MapDataset',
+ 'Batch',
+ 'Shuffle',
+ 'Repeat',
+ 'Map',
];
let nodeStr = '';
let edgeStr = '';
Object.keys(this.allDatasetGraphData).forEach((key) => {
const node = this.allDatasetGraphData[key];
- if (node.op_type === 'MapDataset') {
+ if (node.op_type.startsWith('Map')) {
nodeStr += this.packageSubGraph(key);
} else {
node.id = key;
nodeStr +=
`<${node.key}>[id="${node.key}";label="${node.op_type}";` +
`class=${
- nodeType.includes(node.op_type) ? node.op_type : 'CreatDataset'
+ nodeType.includes(node.op_type) ? node.op_type.replace('Dataset', '') : 'Create'
};shape=rect;fillcolor="#9cc3e5";];`;
}
});
@@ -2033,12 +2037,8 @@ export default {
node.children.forEach((k) => {
const child = this.allDatasetGraphData[k];
edgeStr += `<${child.id}>-><${node.id}>[${
- child.op_type === 'MapDataset'
- ? `ltail=;`
- : ''
- }${
- node.op_type === 'MapDataset' ? `lhead=;` : ''
- }];`;
+ child.op_type.startsWith('Map') ? `ltail=;` : ''
+ }${node.op_type.startsWith('Map') ? `lhead=;` : ''}];`;
});
});
const initSetting =
@@ -2345,7 +2345,7 @@ export default {
white-space: nowrap;
overflow: hidden;
}
-.cl-dashboard #dataMapGraph .CreatDataset > polygon,
+.cl-dashboard #dataMapGraph .Create > polygon,
.cl-dashboard #dataMapGraph .Operator > ellipse {
stroke: #4ea6e6;
fill: #b8e0ff;
@@ -2354,15 +2354,15 @@ export default {
fill: #8df1f2;
stroke: #00a5a7;
}
-.cl-dashboard #dataMapGraph .RepeatDataset > polygon {
+.cl-dashboard #dataMapGraph .Repeat > polygon {
stroke: #fdca5a;
fill: #fff2d4;
}
-.cl-dashboard #dataMapGraph .ShuffleDataset > polygon {
+.cl-dashboard #dataMapGraph .Shuffle > polygon {
stroke: #e37d29;
fill: #ffd0a6;
}
-.cl-dashboard #dataMapGraph .BatchDataset > polygon {
+.cl-dashboard #dataMapGraph .Batch > polygon {
stroke: #de504e;
fill: #ffbcba;
}