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

Remove mpi.call.id #546

Merged
merged 1 commit into from
Mar 28, 2024
Merged

Remove mpi.call.id #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions src/services/mpiwrap/MpiWrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Attribute mpifn_attr { Attribute::invalid };
Attribute mpirank_attr { Attribute::invalid };
Attribute mpisize_attr { Attribute::invalid };
Attribute mpicall_attr { Attribute::invalid };
Attribute mpi_call_id_attr { Attribute::invalid };

extern void mpiwrap_init(Caliper* c, Channel* chn, cali::ConfigSet& cfg);

Expand Down Expand Up @@ -72,12 +71,6 @@ void mpi_register(Caliper* c, Channel* chn)
c->create_attribute("mpi.world.size", CALI_TYPE_INT,
CALI_ATTR_GLOBAL |
CALI_ATTR_SKIP_EVENTS);
if (mpi_call_id_attr == Attribute::invalid)
mpi_call_id_attr =
c->create_attribute("mpi.call.id", CALI_TYPE_UINT,
CALI_ATTR_SCOPE_THREAD |
CALI_ATTR_ASVALUE |
CALI_ATTR_SKIP_EVENTS);

ConfigSet cfg = services::init_config_from_spec(chn->config(), mpi_service_spec);

Expand Down
8 changes: 4 additions & 4 deletions src/services/mpiwrap/Wrapper.w
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace cali
extern Attribute mpifn_attr;
extern Attribute mpirank_attr;
extern Attribute mpisize_attr;
extern Attribute mpi_call_id_attr;
// extern Attribute mpi_call_id_attr;

}

Expand All @@ -52,12 +52,12 @@ int {{foo}}_wrap_count = 0;

inline void push_mpifn(Caliper* c, bool enabled, const char* fname)
{
static std::atomic<uint64_t> call_id { 0 };
// static std::atomic<uint64_t> call_id { 0 };

if (!enabled)
return;

c->begin(mpi_call_id_attr, Variant(cali_make_variant_from_uint(++call_id)));
// c->begin(mpi_call_id_attr, Variant(cali_make_variant_from_uint(++call_id)));
c->begin(mpifn_attr, Variant(fname));
}

Expand All @@ -67,7 +67,7 @@ inline void pop_mpifn(Caliper* c, bool enabled)
return;

c->end(mpifn_attr);
c->end(mpi_call_id_attr);
// c->end(mpi_call_id_attr);
}


Expand Down
2 changes: 1 addition & 1 deletion test/ci_app_tests/test_mpi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def test_mpi_msg_trace(self):
'mpi.comm.is_world' : 'true'
}))
self.assertTrue(cat.has_snapshot_with_keys(
snapshots, { 'region', 'mpi.function', 'mpi.coll.type', 'mpi.call.id'
snapshots, { 'region', 'mpi.function', 'mpi.coll.type'
}))

def test_mpireport_controller(self):
Expand Down
Loading