Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2372: use updated virtual serialization macros #2374

Merged
merged 2 commits into from
Dec 9, 2024
+10 −10
Merged

#2372: use updated virtual serialization macros #2374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7b783b
#2372: use updated virtual serialization macros
cz4rs Nov 29, 2024
0e7662a
#2372: trigger rebuilding of docker images
cz4rs Dec 6, 2024
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
6 changes: 3 additions & 3 deletions ci/docker/alpine-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

ARG arch=amd64
FROM alpine:3.16 as base
FROM alpine:3.16 AS base
Copy link
Contributor Author

@cz4rs cz4rs Dec 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dummy change just to trigger rebuilding of Docker images.

After DARMA-tasking/magistrate#378 was merged, the develop builds after merging #2360 failed (because of new magistrate version with new warnings). This means that updated versions of vt Docker images were not pushed to DockerHub and this caused clang-16 workflow to fail because of missing dependency (Python brotli package for testing LB schema).


ARG proxy=""

Expand Down Expand Up @@ -50,9 +50,9 @@ ENV CC=mpicc \
CXX=mpicxx \
PATH=/usr/lib/ccache/:$PATH

FROM base as build
FROM base AS build
COPY . /vt
RUN /vt/ci/build_cpp.sh /vt /build

FROM build as test
FROM build AS test
RUN /vt/ci/test_cpp.sh /vt /build
4 changes: 2 additions & 2 deletions examples/collection/polymorphic_collection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static constexpr int32_t const default_num_elms = 16;
struct InitialConsTag{};

struct Hello : vt::Collection<Hello, vt::Index1D> {
checkpoint_virtual_serialize_root()
magistrate_virtual_serialize_root()

explicit Hello(InitialConsTag) {}
explicit Hello(checkpoint::SERIALIZE_CONSTRUCT_TAG) {}
Expand All @@ -68,7 +68,7 @@ struct Hello : vt::Collection<Hello, vt::Index1D> {

template <typename T>
struct HelloTyped : Hello {
checkpoint_virtual_serialize_derived_from(Hello)
magistrate_virtual_serialize_derived_from(Hello)

explicit HelloTyped(InitialConsTag);
explicit HelloTyped(checkpoint::SERIALIZE_CONSTRUCT_TAG)
Expand Down
2 changes: 1 addition & 1 deletion src/vt/runtime/component/diagnostic_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ struct DiagnosticSnapshotValues {
template <typename T>
struct DiagnosticValue : DiagnosticBase {
#if !vt_check_enabled(trace_only)
checkpoint_virtual_serialize_derived_from(DiagnosticBase)
magistrate_virtual_serialize_derived_from(DiagnosticBase)
#endif
/**
* \internal \brief Create a new typed diagnostic value
Expand Down
2 changes: 1 addition & 1 deletion src/vt/runtime/component/diagnostic_value_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ namespace vt { namespace runtime { namespace component { namespace detail {
*/
struct DiagnosticBase {
#if !vt_check_enabled(trace_only)
checkpoint_virtual_serialize_root()
magistrate_virtual_serialize_root()
#endif
/**
* \internal \brief Construct a new diagnostic base value
Expand Down
6 changes: 3 additions & 3 deletions src/vt/vrt/collection/types/storage/store_elm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ namespace vt { namespace vrt { namespace collection { namespace storage {
*/
struct StoreElmBase {
/// uses polymorphic serialization
checkpoint_virtual_serialize_root()
magistrate_virtual_serialize_root()

using json = nlohmann::json;

Expand Down Expand Up @@ -214,7 +214,7 @@ struct StoreElm<
> : StoreElmBase
{
/// polymorphic serializer for derived class
checkpoint_virtual_serialize_derived_from(StoreElmBase)
magistrate_virtual_serialize_derived_from(StoreElmBase)

/**
* \brief Construct with value
Expand Down Expand Up @@ -329,7 +329,7 @@ struct StoreElm<
> : StoreElmBase
{
/// polymorphic serializer for derived class
checkpoint_virtual_serialize_derived_from(StoreElmBase)
magistrate_virtual_serialize_derived_from(StoreElmBase)

static_assert(
std::is_trivially_copyable<T>::value and not std::is_pointer<T>::value,
Expand Down
Loading