Skip to content

Commit

Permalink
avoid no_unique_address with nvcc
Browse files Browse the repository at this point in the history
  • Loading branch information
bernhardmgruber committed Jul 6, 2021
1 parent 11c5fe4 commit 42960a3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion include/llama/View.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,10 @@ namespace llama
return {ArrayDimsIndexRange<ArrayDims::rank>{mapping.arrayDims()}.end(), this};
}

[[no_unique_address]] Mapping mapping;
#ifndef __NVCC__
[[no_unique_address]] // nvcc 11.x ICE
#endif
Mapping mapping;
Array<BlobType, Mapping::blobCount> storageBlobs;

private:
Expand Down
5 changes: 4 additions & 1 deletion include/llama/VirtualRecord.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,10 @@ namespace llama
using ArrayDims = typename View::Mapping::ArrayDims;
using RecordDim = typename View::Mapping::RecordDim;

[[no_unique_address]] const ArrayDims arrayDimsCoord;
#ifndef __NVCC__
[[no_unique_address]] // nvcc 11.x ICE
#endif
const ArrayDims arrayDimsCoord;
std::conditional_t<OwnView, View, View&> view;

public:
Expand Down

0 comments on commit 42960a3

Please sign in to comment.