Update GGL to fix one Torch build issue

Change-Id: I95a2a335902e3c368ed29f075ac72eabbb64c97e


[ROCm/hip commit: d067c884be]
このコミットが含まれているのは:
Sun, Peng
2017-03-29 09:02:39 -05:00
コミット 381a67f256
2個のファイルの変更167行の追加5行の削除
+162 -2
ファイルの表示
@@ -210,6 +210,166 @@ namespace hip_impl
// TODO: these are temporary, they need to be completely removed once we
// enable C++14 support and can have proper generic, variadic lambdas.
#define make_kernel_lambda_hip_26(\
kernel_name,\
p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15,\
p16, p17, p18, p19, p20, p21, p22, p23, p24)\
[](const std::decay_t<decltype(p0)>& _p0_,\
const std::decay_t<decltype(p1)>& _p1_,\
const std::decay_t<decltype(p2)>& _p2_,\
const std::decay_t<decltype(p3)>& _p3_,\
const std::decay_t<decltype(p4)>& _p4_,\
const std::decay_t<decltype(p5)>& _p5_,\
const std::decay_t<decltype(p6)>& _p6_,\
const std::decay_t<decltype(p7)>& _p7_,\
const std::decay_t<decltype(p8)>& _p8_,\
const std::decay_t<decltype(p9)>& _p9_,\
const std::decay_t<decltype(p10)>& _p10_,\
const std::decay_t<decltype(p11)>& _p11_,\
const std::decay_t<decltype(p12)>& _p12_,\
const std::decay_t<decltype(p13)>& _p13_,\
const std::decay_t<decltype(p14)>& _p14_,\
const std::decay_t<decltype(p15)>& _p15_,\
const std::decay_t<decltype(p16)>& _p16_,\
const std::decay_t<decltype(p17)>& _p17_,\
const std::decay_t<decltype(p18)>& _p18_,\
const std::decay_t<decltype(p19)>& _p19_,\
const std::decay_t<decltype(p20)>& _p20_,\
const std::decay_t<decltype(p21)>& _p21_,\
const std::decay_t<decltype(p22)>& _p22_,\
const std::decay_t<decltype(p23)>& _p23_,\
const std::decay_t<decltype(p24)>& _p24_) [[hc]] {\
kernel_name(\
_p0_, _p1_, _p2_, _p3_, _p4_, _p5_, _p6_, _p7_, _p8_,\
_p9_, _p10_, _p11_, _p12_, _p13_, _p14_, _p15_, _p16_, _p17_,\
_p18_, _p19_, _p20_, _p21_, _p22_, _p23_, _p24_);\
}
#define make_kernel_lambda_hip_25(\
kernel_name,\
p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15,\
p16, p17, p18, p19, p20, p21, p22, p23)\
[](const std::decay_t<decltype(p0)>& _p0_,\
const std::decay_t<decltype(p1)>& _p1_,\
const std::decay_t<decltype(p2)>& _p2_,\
const std::decay_t<decltype(p3)>& _p3_,\
const std::decay_t<decltype(p4)>& _p4_,\
const std::decay_t<decltype(p5)>& _p5_,\
const std::decay_t<decltype(p6)>& _p6_,\
const std::decay_t<decltype(p7)>& _p7_,\
const std::decay_t<decltype(p8)>& _p8_,\
const std::decay_t<decltype(p9)>& _p9_,\
const std::decay_t<decltype(p10)>& _p10_,\
const std::decay_t<decltype(p11)>& _p11_,\
const std::decay_t<decltype(p12)>& _p12_,\
const std::decay_t<decltype(p13)>& _p13_,\
const std::decay_t<decltype(p14)>& _p14_,\
const std::decay_t<decltype(p15)>& _p15_,\
const std::decay_t<decltype(p16)>& _p16_,\
const std::decay_t<decltype(p17)>& _p17_,\
const std::decay_t<decltype(p18)>& _p18_,\
const std::decay_t<decltype(p19)>& _p19_,\
const std::decay_t<decltype(p20)>& _p20_,\
const std::decay_t<decltype(p21)>& _p21_,\
const std::decay_t<decltype(p22)>& _p22_,\
const std::decay_t<decltype(p23)>& _p23_) [[hc]] {\
kernel_name(\
_p0_, _p1_, _p2_, _p3_, _p4_, _p5_, _p6_, _p7_, _p8_,\
_p9_, _p10_, _p11_, _p12_, _p13_, _p14_, _p15_, _p16_, _p17_,\
_p18_, _p19_, _p20_, _p21_, _p22_, _p23_);\
}
#define make_kernel_lambda_hip_24(\
kernel_name,\
p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15,\
p16, p17, p18, p19, p20, p21, p22)\
[](const std::decay_t<decltype(p0)>& _p0_,\
const std::decay_t<decltype(p1)>& _p1_,\
const std::decay_t<decltype(p2)>& _p2_,\
const std::decay_t<decltype(p3)>& _p3_,\
const std::decay_t<decltype(p4)>& _p4_,\
const std::decay_t<decltype(p5)>& _p5_,\
const std::decay_t<decltype(p6)>& _p6_,\
const std::decay_t<decltype(p7)>& _p7_,\
const std::decay_t<decltype(p8)>& _p8_,\
const std::decay_t<decltype(p9)>& _p9_,\
const std::decay_t<decltype(p10)>& _p10_,\
const std::decay_t<decltype(p11)>& _p11_,\
const std::decay_t<decltype(p12)>& _p12_,\
const std::decay_t<decltype(p13)>& _p13_,\
const std::decay_t<decltype(p14)>& _p14_,\
const std::decay_t<decltype(p15)>& _p15_,\
const std::decay_t<decltype(p16)>& _p16_,\
const std::decay_t<decltype(p17)>& _p17_,\
const std::decay_t<decltype(p18)>& _p18_,\
const std::decay_t<decltype(p19)>& _p19_,\
const std::decay_t<decltype(p20)>& _p20_,\
const std::decay_t<decltype(p21)>& _p21_,\
const std::decay_t<decltype(p22)>& _p22_) [[hc]] {\
kernel_name(\
_p0_, _p1_, _p2_, _p3_, _p4_, _p5_, _p6_, _p7_, _p8_,\
_p9_, _p10_, _p11_, _p12_, _p13_, _p14_, _p15_, _p16_, _p17_,\
_p18_, _p19_, _p20_, _p21_, _p22_);\
}
#define make_kernel_lambda_hip_23(\
kernel_name,\
p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15,\
p16, p17, p18, p19, p20, p21)\
[](const std::decay_t<decltype(p0)>& _p0_,\
const std::decay_t<decltype(p1)>& _p1_,\
const std::decay_t<decltype(p2)>& _p2_,\
const std::decay_t<decltype(p3)>& _p3_,\
const std::decay_t<decltype(p4)>& _p4_,\
const std::decay_t<decltype(p5)>& _p5_,\
const std::decay_t<decltype(p6)>& _p6_,\
const std::decay_t<decltype(p7)>& _p7_,\
const std::decay_t<decltype(p8)>& _p8_,\
const std::decay_t<decltype(p9)>& _p9_,\
const std::decay_t<decltype(p10)>& _p10_,\
const std::decay_t<decltype(p11)>& _p11_,\
const std::decay_t<decltype(p12)>& _p12_,\
const std::decay_t<decltype(p13)>& _p13_,\
const std::decay_t<decltype(p14)>& _p14_,\
const std::decay_t<decltype(p15)>& _p15_,\
const std::decay_t<decltype(p16)>& _p16_,\
const std::decay_t<decltype(p17)>& _p17_,\
const std::decay_t<decltype(p18)>& _p18_,\
const std::decay_t<decltype(p19)>& _p19_,\
const std::decay_t<decltype(p20)>& _p20_,\
const std::decay_t<decltype(p21)>& _p21_) [[hc]] {\
kernel_name(\
_p0_, _p1_, _p2_, _p3_, _p4_, _p5_, _p6_, _p7_, _p8_,\
_p9_, _p10_, _p11_, _p12_, _p13_, _p14_, _p15_, _p16_, _p17_,\
_p18_, _p19_, _p20_, _p21_);\
}
#define make_kernel_lambda_hip_22(\
kernel_name,\
p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15,\
p16, p17, p18, p19, p20)\
[](const std::decay_t<decltype(p0)>& _p0_,\
const std::decay_t<decltype(p1)>& _p1_,\
const std::decay_t<decltype(p2)>& _p2_,\
const std::decay_t<decltype(p3)>& _p3_,\
const std::decay_t<decltype(p4)>& _p4_,\
const std::decay_t<decltype(p5)>& _p5_,\
const std::decay_t<decltype(p6)>& _p6_,\
const std::decay_t<decltype(p7)>& _p7_,\
const std::decay_t<decltype(p8)>& _p8_,\
const std::decay_t<decltype(p9)>& _p9_,\
const std::decay_t<decltype(p10)>& _p10_,\
const std::decay_t<decltype(p11)>& _p11_,\
const std::decay_t<decltype(p12)>& _p12_,\
const std::decay_t<decltype(p13)>& _p13_,\
const std::decay_t<decltype(p14)>& _p14_,\
const std::decay_t<decltype(p15)>& _p15_,\
const std::decay_t<decltype(p16)>& _p16_,\
const std::decay_t<decltype(p17)>& _p17_,\
const std::decay_t<decltype(p18)>& _p18_,\
const std::decay_t<decltype(p19)>& _p19_,\
const std::decay_t<decltype(p20)>& _p20_) [[hc]] {\
kernel_name(\
_p0_, _p1_, _p2_, _p3_, _p4_, _p5_, _p6_, _p7_, _p8_,\
_p9_, _p10_, _p11_, _p12_, _p13_, _p14_, _p15_, _p16_, _p17_,\
_p18_, _p19_, _p20_);\
}
#define make_kernel_lambda_hip_21(\
kernel_name,\
p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15,\
@@ -237,7 +397,7 @@ namespace hip_impl
kernel_name(\
_p0_, _p1_, _p2_, _p3_, _p4_, _p5_, _p6_, _p7_, _p8_,\
_p9_, _p10_, _p11_, _p12_, _p13_, _p14_, _p15_, _p16_, _p17_,\
_p18_, _p19_);\
_p18_, _p19_);\
}
#define make_kernel_lambda_hip_20(\
kernel_name,\
@@ -265,7 +425,7 @@ namespace hip_impl
kernel_name(\
_p0_, _p1_, _p2_, _p3_, _p4_, _p5_, _p6_, _p7_, _p8_,\
_p9_, _p10_, _p11_, _p12_, _p13_, _p14_, _p15_, _p16_, _p17_,\
_p18_);\
_p18_);\
}
#define make_kernel_lambda_hip_19(\
kernel_name,\
+5 -3
ファイルの表示
@@ -127,11 +127,13 @@ namespace // Only for documentation, macros ignore namespaces.
{
#define count_macro_args_impl_hip_(\
_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15,\
_16, _17, _18, _19, _20, _21, _n, ...) _n
_16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29,\
_30, _31, _n, ...)\
_n
#define count_macro_args_hip_(...)\
count_macro_args_impl_hip_(\
, ##__VA_ARGS__, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9,\
8, 7, 6, 5, 4, 3, 2, 1, 0)
, ##__VA_ARGS__, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19,\
18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
#define overloaded_macro_expand_hip_(macro, arg_cnt) macro##arg_cnt
#define overload_macro_impl_hip_(macro, arg_cnt)\