From cfbba55cf0e7cf0bfab78d2e4234898c5bd125d6 Mon Sep 17 00:00:00 2001
From: will-jl944 <lujiafeng@baidu.com>
Date: Mon, 29 Mar 2021 20:37:08 +0800
Subject: [PATCH] fis the issue in function _get_shared_memory_size_in_M in the
 case of that there are multiple 'shm' space (#2434)

---
 ppdet/.DS_Store         | Bin 0 -> 6148 bytes
 ppdet/data/shm_utils.py |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 ppdet/.DS_Store

diff --git a/ppdet/.DS_Store b/ppdet/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..eb6f4ec6552b90d5ddb485b105d068bfbc2f05b4
GIT binary patch
literal 6148
zcmeHK%}T>S5T5OiZYyFBf<5Nqt%tN)!GjQLJ$Mr$dQfQ-Qfwe5(j*qGmAr<&kx$_3
zIJ3JgtyPaA?GDU-v$HcB=1bVk003*HULBwU034MtSHj^Np>@&)$th0(k<lLRFur$#
z$i?~lLbP`LM+WHK6~F@r5^!eUpL-wpablVuESE17*VZ{N^YUi-#_mT$J8_aUZaIT1
znw>dG-&OW`6a`b;aWDMduv6JSj>5$8!`?t7`(6)2t}p%2i-xTz4ZT?GW6K53OT5&n
zR7azx*{m7+^~Shnj1C(n+It7%af$Ej){joRcaKk_=kd#{WR>9uC}d0F1m4h?7WiNf
z!XOH7(MRz`NU>}m0*IHj^qCUB6h9$Iqh>%eu!;<*Ba?5eV)43W&46a$R|e>OFi;6C
zg_%Tgbl@Ob07UwY6oNMO5|m>ov=n9%aRr6RR79D|RExo6I{FP2XDQ4i%5-3=`C#hF
zOm!$sJRSEpL^v=@q8>E^nt^!+@^V_C`~T$U{(nA6&ol#?fu&-A720;Yg(a!Gb)h)A
vYYo&cDhb795~nF>h^rW5=_;<G3PHa?2BM`flZYM^{Uab~(1T{+PZ{_GF}ahw

literal 0
HcmV?d00001

diff --git a/ppdet/data/shm_utils.py b/ppdet/data/shm_utils.py
index 67a3962fb..38d8ba66c 100644
--- a/ppdet/data/shm_utils.py
+++ b/ppdet/data/shm_utils.py
@@ -58,10 +58,10 @@ def _get_shared_memory_size_in_M():
         elif len(shm_infos) == 1:
             return _parse_size_in_M(shm_infos[0][3])
         else:
-            shm_infos = [si for si in shm_infos \
-                         if si[-1] == SHM_DEFAULT_MOUNT]
-            if len(shm_infos) == 0:
-                return _parse_size_in_M(shm_infos[0][3])
+            default_mount_infos = [
+                si for si in shm_infos if si[-1] == SHM_DEFAULT_MOUNT
+            ]
+            if default_mount_infos:
+                return _parse_size_in_M(default_mount_infos[0][3])
             else:
-                return max([_parse_size_in_M(si[3]) \
-                                for si in shm_infos])
+                return max([_parse_size_in_M(si[3]) for si in shm_infos])
-- 
GitLab