提交 362a05e4 编写于 作者: M mindspore-ci-bot 提交者: Gitee

!546 Add training log path to training panel sub-page and profiling page

Merge pull request !546 from 秦君艳/path
...@@ -20,6 +20,10 @@ limitations under the License. ...@@ -20,6 +20,10 @@ limitations under the License.
:class="{collapse:collapse}"> :class="{collapse:collapse}">
<div class="helper" <div class="helper"
v-show="!collapse"> v-show="!collapse">
<div class="summary-path">
{{$t('trainingDashboard.summaryDirPath')}}
<span>{{ summaryPath}}</span>
</div>
<div class="cur-card"> <div class="cur-card">
<label>{{$t('profiling.curCard')}}</label> <label>{{$t('profiling.curCard')}}</label>
<el-select v-model="curDashboardInfo.curCardNum" <el-select v-model="curDashboardInfo.curCardNum"
...@@ -61,6 +65,7 @@ import RequestService from '../../services/request-service'; ...@@ -61,6 +65,7 @@ import RequestService from '../../services/request-service';
export default { export default {
data() { data() {
return { return {
summaryPath: this.$route.query.summaryPath,
tipsArrayList: [ tipsArrayList: [
'step_trace-iter_interval', 'step_trace-iter_interval',
'minddata_pipeline-general', 'minddata_pipeline-general',
...@@ -331,11 +336,26 @@ export default { ...@@ -331,11 +336,26 @@ export default {
} }
.helper { .helper {
padding: 32px; padding: 32px;
padding-top: 20px;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
margin-left: 24px; margin-left: 24px;
background: #edf0f5; background: #edf0f5;
word-wrap: break-word; word-wrap: break-word;
.summary-path {
line-height: 24px;
font-size: 14px;
overflow: hidden;
font-weight: bold;
padding-bottom: 10px;
word-break: break-all;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
}
.nowrap-style { .nowrap-style {
white-space: nowrap; white-space: nowrap;
} }
......
...@@ -19,7 +19,14 @@ limitations under the License. ...@@ -19,7 +19,14 @@ limitations under the License.
<div class="cl-data-map-manage"> <div class="cl-data-map-manage">
<div class='data-map-p32'> <div class='data-map-p32'>
<div class="cl-title cl-data-map-title"> <div class="cl-title cl-data-map-title">
<div class="cl-title-left">{{$t('dataMap.titleText')}}</div> <div class="cl-title-left">{{$t('dataMap.titleText')}}
<div class="path-message">
<span>{{$t('symbols.leftbracket')}}</span>
<span>{{$t('trainingDashboard.summaryDirPath')}}</span>
<span>{{summaryPath}}</span>
<span>{{$t('symbols.rightbracket')}}</span>
</div>
</div>
<div class="cl-title-right"> <div class="cl-title-right">
<div class="cl-close-btn" <div class="cl-close-btn"
@click="jumpToTrainDashboard"> @click="jumpToTrainDashboard">
...@@ -162,6 +169,7 @@ export default { ...@@ -162,6 +169,7 @@ export default {
trainJobID: '', trainJobID: '',
selectedNode: [], selectedNode: [],
noData: false, noData: false,
summaryPath: this.$route.query.summaryPath,
}; };
}, },
mounted() { mounted() {
...@@ -213,8 +221,9 @@ export default { ...@@ -213,8 +221,9 @@ export default {
if (!data) { if (!data) {
return; return;
} }
const key = `${parentKey ? parentKey + '/' : ''}${data.op_type || const key = `${parentKey ? parentKey + '/' : ''}${
''}_${index}`; data.op_type || ''
}_${index}`;
const obj = { const obj = {
key: key, key: key,
id: '', id: '',
...@@ -329,9 +338,7 @@ export default { ...@@ -329,9 +338,7 @@ export default {
this.graphviz = null; this.graphviz = null;
} }
}, 100); }, 100);
d3.select('#graph') d3.select('#graph').selectAll('title').remove();
.selectAll('title')
.remove();
this.startApp(); this.startApp();
}, },
/** /**
...@@ -631,6 +638,13 @@ export default { ...@@ -631,6 +638,13 @@ export default {
.cl-data-map-title { .cl-data-map-title {
height: 56px; height: 56px;
line-height: 56px; line-height: 56px;
.path-message {
display: inline-block;
line-height: 20px;
padding: 0px 4px 15px 4px;
font-weight: bold;
vertical-align: bottom;
}
} }
.data-map-p32 { .data-map-p32 {
height: 100%; height: 100%;
......
...@@ -59,6 +59,12 @@ limitations under the License. ...@@ -59,6 +59,12 @@ limitations under the License.
<div class="cl-title cl-graph-title"> <div class="cl-title cl-graph-title">
<div class="cl-title-left"> <div class="cl-title-left">
{{ $t('graph.titleText') }} {{ $t('graph.titleText') }}
<div class="path-message">
<span>{{$t('symbols.leftbracket')}}</span>
<span>{{$t('trainingDashboard.summaryDirPath')}}</span>
<span>{{summaryPath}}</span>
<span>{{$t('symbols.rightbracket')}}</span>
</div>
<span @click="showUserGuide" <span @click="showUserGuide"
class="guide"> class="guide">
<i class="guide-icon"></i> <i class="guide-icon"></i>
...@@ -421,6 +427,7 @@ const d3 = {select, selectAll, zoom}; ...@@ -421,6 +427,7 @@ const d3 = {select, selectAll, zoom};
export default { export default {
data() { data() {
return { return {
summaryPath: this.$route.query.summaryPath,
clickScope: {}, // Information about the node that is clicked for the first time. clickScope: {}, // Information about the node that is clicked for the first time.
smallResize: {}, // The container of display area box. smallResize: {}, // The container of display area box.
insideBox: {}, // Basic information about the display area box insideBox: {}, // Basic information about the display area box
...@@ -2968,6 +2975,13 @@ export default { ...@@ -2968,6 +2975,13 @@ export default {
.cl-graph-title { .cl-graph-title {
height: 56px; height: 56px;
line-height: 56px; line-height: 56px;
.path-message {
display: inline-block;
line-height: 20px;
padding: 0px 4px 15px 4px;
font-weight: bold;
vertical-align: bottom;
}
.guide { .guide {
cursor: pointer; cursor: pointer;
margin-left: 10px; margin-left: 10px;
......
...@@ -18,7 +18,14 @@ limitations under the License. ...@@ -18,7 +18,14 @@ limitations under the License.
<div class="histogram-bk"> <div class="histogram-bk">
<!-- Title area --> <!-- Title area -->
<div class="cl-title cl-histogram-title"> <div class="cl-title cl-histogram-title">
<div class="cl-title-left">{{$t('histogram.titleText')}}</div> <div class="cl-title-left">{{$t('histogram.titleText')}}
<div class="path-message">
<span>{{$t('symbols.leftbracket')}}</span>
<span>{{$t('trainingDashboard.summaryDirPath')}}</span>
<span>{{summaryPath}}</span>
<span>{{$t('symbols.rightbracket')}}</span>
</div>
</div>
<div class="cl-title-right"> <div class="cl-title-right">
<div class="cl-close-btn" <div class="cl-close-btn"
@click="jumpToTrainDashboard"> @click="jumpToTrainDashboard">
...@@ -126,6 +133,7 @@ export default { ...@@ -126,6 +133,7 @@ export default {
return { return {
tagList: [], // Tag list. tagList: [], // Tag list.
trainingJobId: this.$route.query.train_id, // ID of the current training job. trainingJobId: this.$route.query.train_id, // ID of the current training job.
summaryPath: this.$route.query.summaryPath,
originDataArr: [], // List of all data. originDataArr: [], // List of all data.
initOver: false, // Indicates whether the initialization is complete. initOver: false, // Indicates whether the initialization is complete.
curAxisName: 0, // Current time type. curAxisName: 0, // Current time type.
...@@ -263,8 +271,11 @@ export default { ...@@ -263,8 +271,11 @@ export default {
document.title = this.$t('histogram.titleText') + '-MindInsight'; document.title = this.$t('histogram.titleText') + '-MindInsight';
return; return;
} }
document.title = decodeURIComponent(this.$route.query.train_id) +'-' + this.$t('histogram.titleText') + document.title =
'-MindInsight'; decodeURIComponent(this.$route.query.train_id) +
'-' +
this.$t('histogram.titleText') +
'-MindInsight';
this.getOriginData(); this.getOriginData();
if (this.isTimeReload) { if (this.isTimeReload) {
this.autoUpdateSamples(); this.autoUpdateSamples();
...@@ -810,25 +821,23 @@ export default { ...@@ -810,25 +821,23 @@ export default {
'.cl-histogram-show-data-content', '.cl-histogram-show-data-content',
).offsetTop; ).offsetTop;
if (height + e.event.y + 20 > screenHeight && screenHeight > height) { if (height + e.event.y + 20 > screenHeight && screenHeight > height) {
document.querySelector('#echartTip').style.top = `${e.event.y + document.querySelector('#echartTip').style.top = `${
scrollTop - e.event.y + scrollTop - height - 20 - offsetTop
height - }px`;
20 -
offsetTop}px`;
} else { } else {
document.querySelector('#echartTip').style.top = `${e.event.y + document.querySelector('#echartTip').style.top = `${
scrollTop + e.event.y + scrollTop + 20 - offsetTop
20 - }px`;
offsetTop}px`;
} }
// Blank area on the right of the chart is 80 // Blank area on the right of the chart is 80
if (width + e.event.x + 80 > screenWidth && screenWidth > width) { if (width + e.event.x + 80 > screenWidth && screenWidth > width) {
document.querySelector('#echartTip').style.left = `${e.event.x - document.querySelector('#echartTip').style.left = `${
width - e.event.x - width - 20
20}px`; }px`;
} else { } else {
document.querySelector('#echartTip').style.left = `${e.event.x + document.querySelector('#echartTip').style.left = `${
20}px`; e.event.x + 20
}px`;
} }
} }
...@@ -1377,6 +1386,13 @@ export default { ...@@ -1377,6 +1386,13 @@ export default {
.cl-histogram-title { .cl-histogram-title {
height: 56px; height: 56px;
line-height: 56px; line-height: 56px;
.path-message {
display: inline-block;
line-height: 20px;
padding: 0px 4px 15px 4px;
font-weight: bold;
vertical-align: bottom;
}
.cl-close-btn { .cl-close-btn {
width: 20px; width: 20px;
height: 20px; height: 20px;
......
...@@ -18,7 +18,14 @@ limitations under the License. ...@@ -18,7 +18,14 @@ limitations under the License.
<div class="cl-image-manage"> <div class="cl-image-manage">
<div class="image-bk"> <div class="image-bk">
<div class="cl-title cl-image-title"> <div class="cl-title cl-image-title">
<div class="cl-title-left">{{$t('images.titleText')}}</div> <div class="cl-title-left">{{$t('images.titleText')}}
<div class="path-message">
<span>{{$t('symbols.leftbracket')}}</span>
<span>{{$t('trainingDashboard.summaryDirPath')}}</span>
<span>{{summaryPath}}</span>
<span>{{$t('symbols.rightbracket')}}</span>
</div>
</div>
<div class="cl-title-right"> <div class="cl-title-right">
<div class="cl-close-btn" <div class="cl-close-btn"
@click="jumpToTrainDashboard"> @click="jumpToTrainDashboard">
...@@ -138,6 +145,7 @@ export default { ...@@ -138,6 +145,7 @@ export default {
brightness: 50, // Brightness brightness: 50, // Brightness
contrast: 50, // Contrast contrast: 50, // Contrast
trainingJobId: this.$route.query.train_id, // ID of the current training job trainingJobId: this.$route.query.train_id, // ID of the current training job
summaryPath: this.$route.query.summaryPath,
multiSelectedTagNames: {}, // Dictionary for storing the name of the selected tags multiSelectedTagNames: {}, // Dictionary for storing the name of the selected tags
curFilterSamples: [], // List of images that meet the current filter criteria curFilterSamples: [], // List of images that meet the current filter criteria
tagOperateList: [], // Tag list tagOperateList: [], // Tag list
...@@ -676,6 +684,13 @@ export default { ...@@ -676,6 +684,13 @@ export default {
.cl-image-title { .cl-image-title {
height: 56px; height: 56px;
line-height: 56px; line-height: 56px;
.path-message {
display: inline-block;
line-height: 20px;
padding: 0px 4px 15px 4px;
font-weight: bold;
vertical-align: bottom;
}
} }
} }
.title { .title {
......
...@@ -211,6 +211,7 @@ export default { ...@@ -211,6 +211,7 @@ export default {
dir: profilerDir, dir: profilerDir,
id: trainId, id: trainId,
path: path, path: path,
summaryPath: row.train_id,
}, },
}); });
window.open(routeUrl.href, '_blank'); window.open(routeUrl.href, '_blank');
......
...@@ -18,7 +18,14 @@ limitations under the License. ...@@ -18,7 +18,14 @@ limitations under the License.
<div class="tensor-bk"> <div class="tensor-bk">
<!-- Title area --> <!-- Title area -->
<div class="cl-title cl-tensor-title"> <div class="cl-title cl-tensor-title">
<div class="cl-title-left">{{$t('tensors.titleText')}}</div> <div class="cl-title-left">{{$t('tensors.titleText')}}
<div class="path-message">
<span>{{$t('symbols.leftbracket')}}</span>
<span>{{$t('trainingDashboard.summaryDirPath')}}</span>
<span>{{summaryPath}}</span>
<span>{{$t('symbols.rightbracket')}}</span>
</div>
</div>
<div class="cl-title-right"> <div class="cl-title-right">
<div class="cl-close-btn" <div class="cl-close-btn"
@click="jumpToTrainDashboard"> @click="jumpToTrainDashboard">
...@@ -183,6 +190,7 @@ export default { ...@@ -183,6 +190,7 @@ export default {
return { return {
tagList: [], // Tag list. tagList: [], // Tag list.
trainingJobId: this.$route.query.train_id, // ID of the current training job. trainingJobId: this.$route.query.train_id, // ID of the current training job.
summaryPath: this.$route.query.summaryPath,
originDataArr: [], // List of all data. originDataArr: [], // List of all data.
initOver: false, // Indicates whether the initialization is complete. initOver: false, // Indicates whether the initialization is complete.
curFullTagDic: {}, // Dictionary that contains all the current tags. curFullTagDic: {}, // Dictionary that contains all the current tags.
...@@ -1092,6 +1100,13 @@ export default { ...@@ -1092,6 +1100,13 @@ export default {
.cl-tensor-title { .cl-tensor-title {
height: 56px; height: 56px;
line-height: 56px; line-height: 56px;
.path-message {
display: inline-block;
line-height: 20px;
padding: 0px 4px 15px 4px;
font-weight: bold;
vertical-align: bottom;
}
.cl-close-btn { .cl-close-btn {
width: 20px; width: 20px;
height: 20px; height: 20px;
......
...@@ -474,6 +474,7 @@ export default { ...@@ -474,6 +474,7 @@ export default {
path: '/train-manage/scalar', path: '/train-manage/scalar',
query: { query: {
train_id: this.trainingJobId, train_id: this.trainingJobId,
summaryPath: this.summaryPath,
}, },
}); });
}, },
...@@ -488,6 +489,7 @@ export default { ...@@ -488,6 +489,7 @@ export default {
path: '/train-manage/histogram', path: '/train-manage/histogram',
query: { query: {
train_id: this.trainingJobId, train_id: this.trainingJobId,
summaryPath: this.summaryPath,
}, },
}); });
}, },
...@@ -522,6 +524,7 @@ export default { ...@@ -522,6 +524,7 @@ export default {
path: '/train-manage/tensor', path: '/train-manage/tensor',
query: { query: {
train_id: this.trainingJobId, train_id: this.trainingJobId,
summaryPath: this.summaryPath,
}, },
}); });
} }
...@@ -538,6 +541,7 @@ export default { ...@@ -538,6 +541,7 @@ export default {
path: '/train-manage/data-map', path: '/train-manage/data-map',
query: { query: {
train_id: this.trainingJobId, train_id: this.trainingJobId,
summaryPath: this.summaryPath,
}, },
}); });
}, },
...@@ -552,6 +556,7 @@ export default { ...@@ -552,6 +556,7 @@ export default {
path: '/train-manage/graph', path: '/train-manage/graph',
query: { query: {
train_id: this.trainingJobId, train_id: this.trainingJobId,
summaryPath: this.summaryPath,
}, },
}); });
}, },
...@@ -1500,6 +1505,7 @@ export default { ...@@ -1500,6 +1505,7 @@ export default {
path: '/train-manage/image', path: '/train-manage/image',
query: { query: {
train_id: this.trainingJobId, train_id: this.trainingJobId,
summaryPath: this.summaryPath,
}, },
}); });
}, },
...@@ -2085,8 +2091,9 @@ export default { ...@@ -2085,8 +2091,9 @@ export default {
.path-message { .path-message {
display: inline-block; display: inline-block;
line-height: 20px; line-height: 20px;
padding: 18px 16px; padding: 21px 4px 0 4px;
font-weight: bold; font-weight: bold;
vertical-align: bottom;
} }
.loading-icon { .loading-icon {
margin-left: 5px; margin-left: 5px;
...@@ -2096,8 +2103,8 @@ export default { ...@@ -2096,8 +2103,8 @@ export default {
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
line-height: 20px; line-height: 56px;
padding: 18px 0; padding: 0;
} }
} }
.cl-dashboard-center { .cl-dashboard-center {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册