Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
a2c01db1
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
a2c01db1
编写于
4月 01, 2022
作者:
L
liutiexing
提交者:
GitHub
4月 01, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix mac c++ version (#41172)
* fix mac c++ version * update * fix apple systems
上级
ca259fb9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
38 addition
and
5 deletion
+38
-5
paddle/fluid/framework/new_executor/workqueue/thread_data_registry.h
...d/framework/new_executor/workqueue/thread_data_registry.h
+38
-5
未找到文件。
paddle/fluid/framework/new_executor/workqueue/thread_data_registry.h
浏览文件 @
a2c01db1
...
...
@@ -60,18 +60,51 @@ class ThreadDataRegistry {
}
private:
// types
// types
// Lock types
#if defined(__clang__) || defined(__GNUC__) // CLANG or GCC
#ifndef __APPLE__
#if __cplusplus >= 201703L
using
LockType
=
std
::
shared_mutex
;
using
SharedLockGuardType
=
std
::
shared_lock
<
std
::
shared_mutex
>
;
#elif __cplusplus >= 201402L
using
LockType
=
std
::
shared_timed_mutex
;
using
SharedLockGuardType
=
std
::
shared_lock
<
std
::
shared_timed_mutex
>
;
#else
using
LockType
=
std
::
mutex
;
using
SharedLockGuardType
=
std
::
lock_guard
<
std
::
mutex
>
;
#endif
// Special case : mac. https://github.com/facebook/react-native/issues/31250
#else
using
LockType
=
std
::
mutex
;
using
SharedLockGuardType
=
std
::
lock_guard
<
std
::
mutex
>
;
#endif
#elif defined(_MSC_VER) // MSVC
#if _MSVC_LANG >= 201703L
using
LockType
=
std
::
shared_mutex
;
using
SharedLockGuardType
=
std
::
shared_lock
<
std
::
shared_mutex
>
;
#elif _MSVC_LANG >= 201402L
using
LockType
=
std
::
shared_timed_mutex
;
using
SharedLockGuardType
=
std
::
shared_lock
<
std
::
shared_timed_mutex
>
;
#else
using
LockType
=
std
::
mutex
;
using
SharedLockGuardType
=
std
::
lock_guard
<
std
::
mutex
>
;
#endif
#else // other compilers
using
LockType
=
std
::
mutex
;
using
SharedLockGuardType
=
std
::
lock_guard
<
std
::
mutex
>
;
#endif
class
ThreadDataHolder
;
class
ThreadDataRegistryImpl
{
public:
void
RegisterData
(
uint64_t
tid
,
ThreadDataHolder
*
tls_obj
)
{
std
::
lock_guard
<
LockType
>
lock
(
lock_
);
std
::
lock_guard
<
LockType
>
guard
(
lock_
);
tid_map_
[
tid
]
=
tls_obj
;
}
void
UnregisterData
(
uint64_t
tid
)
{
std
::
lock_guard
<
LockType
>
lock
(
lock_
);
std
::
lock_guard
<
LockType
>
guard
(
lock_
);
tid_map_
.
erase
(
tid
);
}
...
...
@@ -79,7 +112,7 @@ class ThreadDataRegistry {
std
::
is_copy_constructible
<
Alias
>
::
value
>>
std
::
unordered_map
<
uint64_t
,
T
>
GetAllThreadDataByValue
()
{
std
::
unordered_map
<
uint64_t
,
T
>
data_copy
;
std
::
shared_lock
<
LockType
>
lock
(
lock_
);
SharedLockGuardType
guard
(
lock_
);
data_copy
.
reserve
(
tid_map_
.
size
());
for
(
auto
&
kv
:
tid_map_
)
{
data_copy
.
emplace
(
kv
.
first
,
kv
.
second
->
GetData
());
...
...
@@ -90,7 +123,7 @@ class ThreadDataRegistry {
std
::
unordered_map
<
uint64_t
,
std
::
reference_wrapper
<
T
>>
GetAllThreadDataByRef
()
{
std
::
unordered_map
<
uint64_t
,
std
::
reference_wrapper
<
T
>>
data_ref
;
std
::
shared_lock
<
LockType
>
lock
(
lock_
);
SharedLockGuardType
guard
(
lock_
);
data_ref
.
reserve
(
tid_map_
.
size
());
for
(
auto
&
kv
:
tid_map_
)
{
data_ref
.
emplace
(
kv
.
first
,
std
::
ref
(
kv
.
second
->
GetData
()));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录