Skip to content

Commit

Permalink
Replace hasAnyComputedField in dumping code by view's version
Browse files Browse the repository at this point in the history
  • Loading branch information
bernhardmgruber committed Sep 19, 2023
1 parent 3e57727 commit 5445f92
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions include/llama/DumpMapping.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@ namespace llama
{
namespace internal
{
template<typename Mapping>
constexpr auto hasAnyComputedField() -> bool
{
bool computed = false;
forEachLeafCoord<typename Mapping::RecordDim>([&](auto rc)
{ computed |= llama::isComputed<Mapping, decltype(rc)>; });
return computed;
}

inline auto color(std::string_view recordCoordTags) -> std::size_t
{
auto c = std::hash<std::string_view>{}(recordCoordTags) &std::size_t{0xFFFFFF};
Expand Down Expand Up @@ -187,7 +178,7 @@ namespace llama
std::vector<FieldBox<typename Mapping::ArrayExtents::Index>> infos;

std::optional<decltype(allocView(mapping))> view;
if constexpr(hasAnyComputedField<Mapping>())
if constexpr(hasAnyComputedField<Mapping>)
view = allocView(mapping);

using RecordDim = typename Mapping::RecordDim;
Expand Down Expand Up @@ -262,8 +253,7 @@ namespace llama

std::string svg;

constexpr auto hasAnyComputedField = internal::hasAnyComputedField<Mapping>();
std::array<int, Mapping::blobCount + hasAnyComputedField + 1> blobYOffset{};
std::array<int, Mapping::blobCount + hasAnyComputedField<Mapping> + 1> blobYOffset{};
auto writeBlobHeader = [&](std::size_t i, std::size_t size, std::string_view name)
{
const auto blobRows = (size + wrapByteCount - 1) / wrapByteCount;
Expand Down Expand Up @@ -378,7 +368,7 @@ namespace llama
)";
}

if(hasAnyComputedField)
if(hasAnyComputedField<Mapping>)
{
writeBlobHeader(Mapping::blobCount, computedSizeSoFar, "Comp.");

Expand Down

0 comments on commit 5445f92

Please sign in to comment.