Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/nvexec/detail/variant.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ namespace nv::execution
}

union_t storage_;
index_t index_;
index_t index_{detail::npos<index_t>()};
};
} // namespace nv::execution

Expand Down
31 changes: 31 additions & 0 deletions test/nvexec/variant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
#include <cuda/std/tuple>
#include <thrust/universal_vector.h>

#include <cstddef>
#include <new>

#include "common.cuh"
#include "nvexec/detail/variant.cuh"

Expand All @@ -31,6 +34,19 @@ using nvexec::visit;

namespace
{
int variant_destructor_calls = 0;

struct variant_destructor_probe
{
STDEXEC_ATTRIBUTE(host, device)
variant_destructor_probe() = default;

STDEXEC_ATTRIBUTE(host, device)
~variant_destructor_probe()
{
NV_IF_TARGET(NV_IS_HOST, (++variant_destructor_calls;));
}
};

TEST_CASE("nvexec variant max size is correct", "[cuda][stream][containers][variant]")
{
Expand All @@ -57,6 +73,21 @@ namespace
STATIC_REQUIRE(variant_t<char, int, double>::size == 3);
}

TEST_CASE("nvexec variant initializes its index before constructing the first alternative",
"[cuda][stream][containers][variant]")
{
using variant_type = variant_t<variant_destructor_probe>;

alignas(variant_type) std::byte storage[sizeof(variant_type)]{};
variant_destructor_calls = 0;

auto* variant = ::new (storage) variant_type;
CHECK(variant_destructor_calls == 0);

variant->~variant_type();
CHECK(variant_destructor_calls == 1);
}

TEST_CASE("nvexec variant emplaces alternative from CPU", "[cuda][stream][containers][variant]")
{
variant_t<int, double> v;
Expand Down
Loading