mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-16 00:16:30 +00:00
Code Issues Projects Releases Wiki Activity

[flang-rt][NFC] Work around CTK12.8 compilation failure. (#133833)

Browse Source 
It happened in https://lab.llvm.org/buildbot/#/builders/152/builds/1131
when the buildbot was switched from CTK12.3 to CTK12.8.
The logs are gone by now, so the above link is useless.

The error was:
error: ‘auto’ not permitted in template argument

This workaround helps, but I also reported the issue to NVCC devs.
This commit is contained in:
Slava Zakharin 2025-04-01 08:04:45 -07:00 committed by GitHub
parent 4e6c48f1e7
commit 1ab3a4f234
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flang-rt/lib/runtime/matmul-transpose.cpp
View File

@ -331,6 +331,7 @@ template <bool IS_ALLOCATING, TypeCategory XCAT, int XKIND, TypeCategory YCAT,
struct MatmulTransposeHelper {
using ResultDescriptor =
std::conditional_t<IS_ALLOCATING, Descriptor, const Descriptor>;
using ResultTy = Fortran::common::optional<std::pair<TypeCategory, int>>;
RT_API_ATTRS void operator()(ResultDescriptor &result, const Descriptor &x,
const Descriptor &y, const char *sourceFile, int line) const {
Terminator terminator{sourceFile, line};
@ -339,7 +340,7 @@ struct MatmulTransposeHelper {
RUNTIME_CHECK(terminator, xCatKind.has_value() && yCatKind.has_value());
RUNTIME_CHECK(terminator, xCatKind->first == XCAT);
RUNTIME_CHECK(terminator, yCatKind->first == YCAT);
if constexpr (constexpr auto resultType{
if constexpr (constexpr ResultTy resultType{
GetResultType(XCAT, XKIND, YCAT, YKIND)}) {
return DoMatmulTranspose<IS_ALLOCATING, resultType->first,
resultType->second, CppTypeFor<XCAT, XKIND>, CppTypeFor<YCAT, YKIND>>(

3
flang-rt/lib/runtime/matmul.cpp
View File

@ -424,6 +424,7 @@ static inline RT_API_ATTRS void DoMatmul(
template <bool IS_ALLOCATING, TypeCategory XCAT, int XKIND, TypeCategory YCAT,
int YKIND>
struct MatmulHelper {
using ResultTy = Fortran::common::optional<std::pair<TypeCategory, int>>;
using ResultDescriptor =
std::conditional_t<IS_ALLOCATING, Descriptor, const Descriptor>;
RT_API_ATTRS void operator()(ResultDescriptor &result, const Descriptor &x,
@ -439,7 +440,7 @@ struct MatmulHelper {
xCatKind->first == TypeCategory::Unsigned) &&
(yCatKind->first == TypeCategory::Integer ||
yCatKind->first == TypeCategory::Unsigned))));
if constexpr (constexpr auto resultType{
if constexpr (constexpr ResultTy resultType{
GetResultType(XCAT, XKIND, YCAT, YKIND)}) {
return DoMatmul<IS_ALLOCATING, resultType->first, resultType->second,
CppTypeFor<XCAT, XKIND>, CppTypeFor<YCAT, YKIND>>(