Skip to content

Commit cd1ca5f

Browse files
authored
Remove mpi.call.id (LLNL#546)
1 parent 6698683 commit cd1ca5f

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

src/services/mpiwrap/MpiWrap.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Attribute mpifn_attr { Attribute::invalid };
2020
Attribute mpirank_attr { Attribute::invalid };
2121
Attribute mpisize_attr { Attribute::invalid };
2222
Attribute mpicall_attr { Attribute::invalid };
23-
Attribute mpi_call_id_attr { Attribute::invalid };
2423

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

@@ -72,12 +71,6 @@ void mpi_register(Caliper* c, Channel* chn)
7271
c->create_attribute("mpi.world.size", CALI_TYPE_INT,
7372
CALI_ATTR_GLOBAL |
7473
CALI_ATTR_SKIP_EVENTS);
75-
if (mpi_call_id_attr == Attribute::invalid)
76-
mpi_call_id_attr =
77-
c->create_attribute("mpi.call.id", CALI_TYPE_UINT,
78-
CALI_ATTR_SCOPE_THREAD |
79-
CALI_ATTR_ASVALUE |
80-
CALI_ATTR_SKIP_EVENTS);
8174

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

src/services/mpiwrap/Wrapper.w

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace cali
3131
extern Attribute mpifn_attr;
3232
extern Attribute mpirank_attr;
3333
extern Attribute mpisize_attr;
34-
extern Attribute mpi_call_id_attr;
34+
// extern Attribute mpi_call_id_attr;
3535

3636
}
3737

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

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

5757
if (!enabled)
5858
return;
5959

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

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

6969
c->end(mpifn_attr);
70-
c->end(mpi_call_id_attr);
70+
// c->end(mpi_call_id_attr);
7171
}
7272

7373

test/ci_app_tests/test_mpi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def test_mpi_msg_trace(self):
164164
'mpi.comm.is_world' : 'true'
165165
}))
166166
self.assertTrue(cat.has_snapshot_with_keys(
167-
snapshots, { 'region', 'mpi.function', 'mpi.coll.type', 'mpi.call.id'
167+
snapshots, { 'region', 'mpi.function', 'mpi.coll.type'
168168
}))
169169

170170
def test_mpireport_controller(self):

0 commit comments

Comments
 (0)