Skip to content

Commit 409bb5c

Browse files
luraessluraess
committed
Update figure layout.
1 parent 324a80f commit 409bb5c

File tree

5 files changed

+31
-22
lines changed

5 files changed

+31
-22
lines changed

‎visu/fig_parperf3D_all.png

-2.78 KB
Loading

‎visu/fig_perf23D_stokes_2.png

-4.35 KB
Loading

‎visu/fig_stokes_ve_scale23D.png

3.43 KB
Loading

‎visu/viz_perf_stokes.m

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,16 @@
5151
single_daint_stokes = 210.2;
5252
single_volta_diff = 481.1;
5353
single_volta_stokes = 334.1;
54+
sc = 100; % to get percent
5455

5556
FS = 20;
5657
mylim = [0 870];
57-
ylab = 790;
58+
mylimx = [32 550];
59+
ylab = 780;
5860

59-
mylim2 = [0.959 1.003];
60-
mylimx = [0.8 3.e3];
61-
ylab2 = 0.963;
61+
mylim2 = [0.959 1.003].*sc;
62+
mylimx2 = [0.8 3.e3];
63+
ylab2 = 0.963.*sc;
6264

6365
fig1 = 1;
6466
fig2 = 1;
@@ -71,9 +73,12 @@
7173
%stokes_2D_octo_2(1,:),T_peak_octo*ones(size(stokes_2D_octo_2(1,:))), 'k--',...
7274
semilogx(stokes_2D_volta_2(1,:),stokes_2D_volta_2(end,:), '-o', ...
7375
stokes_2D_daint_2(1,:),stokes_2D_daint_2(end,:), '-o', ...
74-
stokes_2D_octo_2(1,:),T_peak_volta*ones(size(stokes_2D_octo_2(1,:))),'k-.', ...
76+
'linewidth',3, 'MarkerFaceColor','k'), set(gca, 'fontsize',FS, 'linewidth',1.4)
77+
hold on
78+
semilogx(stokes_2D_octo_2(1,:),T_peak_volta*ones(size(stokes_2D_octo_2(1,:))),'k-.', ...
7579
stokes_2D_octo_2(1,:),T_peak_daint*ones(size(stokes_2D_octo_2(1,:))),'k--', ...
76-
'linewidth',3, 'MarkerFaceColor','k'), axis square, set(gca, 'fontsize',FS, 'linewidth',1.4)
80+
'linewidth',1.5, 'MarkerFaceColor','k')
81+
hold off
7782
title({'2D visco-elastic'; 'Stokes'},'fontsize',FS-2)
7883
ylabel({' ';'\bf{T_{eff} [GB/s]}'}, 'fontsize',FS)
7984
ylim(mylim)
@@ -89,20 +94,24 @@
8994
%stokes_3D_volta_2(2,:),T_peak_octo*ones(size(stokes_3D_volta_2(2,:))), 'k--',...
9095
semilogx(stokes_3D_volta_2(2,:),stokes_3D_volta_2(end,:), '-o', ...
9196
stokes_3D_daint_2(2,:),stokes_3D_daint_2(end,:), '-o', ...
92-
stokes_3D_volta_2(2,:),T_peak_volta*ones(size(stokes_3D_volta_2(2,:))),'k-.', ...
97+
'linewidth',3, 'MarkerFaceColor','k'), set(gca, 'fontsize',FS, 'linewidth',1.4)
98+
hold on
99+
semilogx(stokes_3D_volta_2(2,:),T_peak_volta*ones(size(stokes_3D_volta_2(2,:))),'k-.', ...
93100
stokes_3D_volta_2(2,:),T_peak_daint*ones(size(stokes_3D_volta_2(2,:))), 'k--',...
94-
'linewidth',3, 'MarkerFaceColor','k'), axis square, set(gca, 'fontsize',FS, 'linewidth',1.4)
101+
'linewidth',1.5, 'MarkerFaceColor','k')
102+
hold off
95103
title({'3D visco-elastic'; 'Stokes'},'fontsize',FS-2)
96104
lg=legend('Tesla V100 SXM2', 'Tesla P100 PCIe'); set(lg,'box','off')
97105
ylim(mylim)
106+
xlim(mylimx)
98107
set(gca, 'XTick',stokes_3D_volta_2(2,:), 'YTicklabel',[])
99108
xtickangle(45)
100109
set(gca,'fontname','Courier')
101110
xlabel('\bf{nx}', 'fontsize',FS)
102111
text(33,ylab,'(b)','fontsize',FS+2,'fontname','Courier')
103112

104-
pos1 = get(sp1,'position'); set(sp1,'position',[pos1(1)*0.97 pos1(2)*1.15 pos1(3)*1 pos1(4)*1])
105-
pos2 = get(sp2,'position'); set(sp2,'position',[pos2(1)*0.97 pos2(2)*1.15 pos2(3)*1 pos2(4)*1])
113+
pos1 = get(sp1,'position'); set(sp1,'position',[pos1(1)*0.97 pos1(2)*2 pos1(3)*1.12 pos1(4)*0.8])
114+
pos2 = get(sp2,'position'); set(sp2,'position',[pos2(1)*0.97 pos2(2)*2 pos2(3)*1.12 pos2(4)*0.8])
106115
fig = gcf;
107116
fig.PaperPositionMode = 'auto';
108117
% print('fig_perf23D_stokes_2','-dpng','-r300')
@@ -112,14 +121,14 @@
112121
figure(2),clf,set(gcf,'color','white','pos',[1400 10 800 400])
113122
sp1 = subplot(121);
114123
% diff_3D_mxpu_octo_2(1,:),diff_3D_mxpu_octo_2(end,:)./diff_3D_mxpu_octo_2(end,1), '-o', ...
115-
semilogx(diff_3D_mxpu_volta_2(1,:),diff_3D_mxpu_volta_2(end,:)./single_volta_diff, '-o', ...
116-
diff_3D_mxpu_daint_2(1,:),diff_3D_mxpu_daint_2(end,:)./single_daint_diff, '-o', ...
117-
'linewidth',3, 'MarkerFaceColor','k'), axis square, set(gca, 'fontsize',FS, 'linewidth',1.4)
124+
semilogx(diff_3D_mxpu_volta_2(1,:),diff_3D_mxpu_volta_2(end,:)./single_volta_diff.*sc, '-o', ...
125+
diff_3D_mxpu_daint_2(1,:),diff_3D_mxpu_daint_2(end,:)./single_daint_diff.*sc, '-o', ...
126+
'linewidth',3, 'MarkerFaceColor','k'), set(gca, 'fontsize',FS, 'linewidth',1.4)
118127
title({'3D nonlinear'; 'diffusion'},'fontsize',FS-2)
119-
ylabel({' ';'\bf{E}'}, 'fontsize',FS)
128+
ylabel({' ';'\bf{E} [%]'}, 'fontsize',FS)
120129
% lg=legend('Titan Xm', 'Tesla V100 SXM2'); set(lg,'box','off')
121130
ylim(mylim2)
122-
xlim(mylimx)
131+
xlim(mylimx2)
123132
set(gca, 'XTick',diff_3D_mxpu_daint_2(1,:))
124133
xtickangle(45)
125134
set(gca,'fontname','Courier')
@@ -128,22 +137,22 @@
128137

129138
sp2 = subplot(122);
130139
% stokes_3D_mxpu_octo_2(1,:),stokes_3D_mxpu_octo_2(end,:)./stokes_3D_mxpu_octo_2(end,1), '-o', ...
131-
semilogx(stokes_3D_mxpu_volta_2(1,:),stokes_3D_mxpu_volta_2(end,:)./single_volta_stokes, '-o', ...
132-
stokes_3D_mxpu_daint_2(1,:),stokes_3D_mxpu_daint_2(end,:)./single_daint_stokes, '-o', ...
133-
'linewidth',3, 'MarkerFaceColor','k'), axis square, set(gca, 'fontsize',FS, 'linewidth',1.4)
140+
semilogx(stokes_3D_mxpu_volta_2(1,:),stokes_3D_mxpu_volta_2(end,:)./single_volta_stokes.*sc, '-o', ...
141+
stokes_3D_mxpu_daint_2(1,:),stokes_3D_mxpu_daint_2(end,:)./single_daint_stokes.*sc, '-o', ...
142+
'linewidth',3, 'MarkerFaceColor','k'), set(gca, 'fontsize',FS, 'linewidth',1.4)
134143
title({'3D visco-elastic'; 'Stokes'},'fontsize',FS-2)
135144
% ylabel({' ';'\bf{E}'}, 'fontsize',FS)
136145
lg=legend('Tesla V100 SXM2', 'Tesla P100 PCIe'); set(lg,'box','off')
137146
ylim(mylim2)
138-
xlim(mylimx)
147+
xlim(mylimx2)
139148
set(gca, 'XTick',stokes_3D_mxpu_daint_2(1,:), 'YTicklabel',[])
140149
xtickangle(45)
141150
set(gca,'fontname','Courier')
142151
xlabel('\bf{P (GPUs)}', 'fontsize',FS)
143152
text(1.1,ylab2,'(b)','fontsize',FS+2,'fontname','Courier')
144153

145-
pos1 = get(sp1,'position'); set(sp1,'position',[pos1(1)*1.04 pos1(2)*1.2 pos1(3)*1 pos1(4)*1])
146-
pos2 = get(sp2,'position'); set(sp2,'position',[pos2(1)*0.96 pos2(2)*1.2 pos2(3)*1 pos2(4)*1])
154+
pos1 = get(sp1,'position'); set(sp1,'position',[pos1(1)*1.04 pos1(2)*2 pos1(3)*1.1 pos1(4)*0.8])
155+
pos2 = get(sp2,'position'); set(sp2,'position',[pos2(1)*0.96 pos2(2)*2 pos2(3)*1.1 pos2(4)*0.8])
147156

148157
fig = gcf;
149158
fig.PaperPositionMode = 'auto';

‎visu/viz_scaling_stokes.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
semilogx(Stokes_2D(1,2:end), Stokes_2D(3,2:end)./Stokes_2D(1,2:end)./Stokes_2D(4,2:end),'-o', ...
2929
Stokes_3D(1,1:end), Stokes_3D(4,1:end)./Stokes_3D(1,1:end)./Stokes_3D(5,1:end),'-o', ...
30-
'linewidth',3, 'MarkerFaceColor','k'), axis square, set(gca, 'fontsize',FS, 'linewidth',1.4)
30+
'linewidth',3, 'MarkerFaceColor','k'), set(gca, 'fontsize',FS, 'linewidth',1.4)
3131
ylabel({' ';'\bf{iter_{tot}/nt/nx}'}, 'fontsize',FS)
3232
ylim([15 20]) % ylim([3 15])
3333
lg=legend('2D', '3D'); set(lg,'box','off')

0 commit comments

Comments
 (0)