Skip to content
Open
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
4 changes: 2 additions & 2 deletions docs/source/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PDC container APIs

For developers: currently implemented in `pdc_cont.c`. This function will send a name to server and receive a container id. This function will allocate necessary memories and initialize properties for a container.

.. function:: pdcid_t PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id)
.. function:: pdcid_t PDCcont_create_coll(const char *cont_name, pdcid_t cont_prop_id)

:param cont_name: the name to be assigned to a container. e.g "c1", "c2"
:param cont_prop_id: property ID for inheriting a PDC property for container.
Expand Down Expand Up @@ -201,7 +201,7 @@ PDC object APIs

For developers: see `pdc_obj.c`.

.. function:: pdcid_t PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, MPI_Comm comm)
.. function:: pdcid_t PDCobj_create_coll(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, MPI_Comm comm)

:param cont_id: Container ID, returned from ``PDCcont_create``.
:param obj_name: Name of the object to be created.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/developer-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ No-index Approach

For No-index approach, here are the APIs you can call for different communication models:
* PDC_Client_query_kvtag (point-to-point)
* PDC_Client_query_kvtag_mpi (collective)
* PDC_Client_query_kvtag_coll (collective)

The default PDC kvtags are stored within each object's metadata as a linked list, and any query involves traversing the list in memory.

Expand Down
16 changes: 8 additions & 8 deletions examples/bdcats.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ main(int argc, char **argv)

// open objects
#ifdef ENABLE_MPI
obj_xx = PDCobj_open_col("obj-var-xx", pdc_id);
obj_xx = PDCobj_open_coll("obj-var-xx", pdc_id);
#else
obj_xx = PDCobj_open("obj-var-xx", pdc_id);
#endif
Expand All @@ -112,7 +112,7 @@ main(int argc, char **argv)
exit(-1);
}
#ifdef ENABLE_MPI
obj_yy = PDCobj_open_col("obj-var-yy", pdc_id);
obj_yy = PDCobj_open_coll("obj-var-yy", pdc_id);
#else
obj_yy = PDCobj_open("obj-var-xx", pdc_id);
#endif
Expand All @@ -121,7 +121,7 @@ main(int argc, char **argv)
exit(-1);
}
#ifdef ENABLE_MPI
obj_zz = PDCobj_open_col("obj-var-zz", pdc_id);
obj_zz = PDCobj_open_coll("obj-var-zz", pdc_id);
#else
obj_zz = PDCobj_open("obj-var-xx", pdc_id);
#endif
Expand All @@ -130,7 +130,7 @@ main(int argc, char **argv)
exit(-1);
}
#ifdef ENABLE_MPI
obj_pxx = PDCobj_open_col("obj-var-pxx", pdc_id);
obj_pxx = PDCobj_open_coll("obj-var-pxx", pdc_id);
#else
obj_pxx = PDCobj_open("obj-var-xx", pdc_id);
#endif
Expand All @@ -139,7 +139,7 @@ main(int argc, char **argv)
exit(-1);
}
#ifdef ENABLE_MPI
obj_pyy = PDCobj_open_col("obj-var-pyy", pdc_id);
obj_pyy = PDCobj_open_coll("obj-var-pyy", pdc_id);
#else
obj_pyy = PDCobj_open("obj-var-xx", pdc_id);
#endif
Expand All @@ -148,7 +148,7 @@ main(int argc, char **argv)
exit(-1);
}
#ifdef ENABLE_MPI
obj_pzz = PDCobj_open_col("obj-var-pzz", pdc_id);
obj_pzz = PDCobj_open_coll("obj-var-pzz", pdc_id);
#else
obj_pzz = PDCobj_open("obj-var-xx", pdc_id);
#endif
Expand All @@ -157,7 +157,7 @@ main(int argc, char **argv)
exit(-1);
}
#ifdef ENABLE_MPI
obj_id11 = PDCobj_open_col("id11", pdc_id);
obj_id11 = PDCobj_open_coll("id11", pdc_id);
#else
obj_id11 = PDCobj_open("obj-var-xx", pdc_id);
#endif
Expand All @@ -166,7 +166,7 @@ main(int argc, char **argv)
exit(-1);
}
#ifdef ENABLE_MPI
obj_id22 = PDCobj_open_col("id22", pdc_id);
obj_id22 = PDCobj_open_coll("id22", pdc_id);
#else
obj_id22 = PDCobj_open("obj-var-xx", pdc_id);
#endif
Expand Down
16 changes: 8 additions & 8 deletions examples/bdcats_batch.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ main(int argc, char **argv)
for (i = 0; i < timestep; ++i) {
sprintf(obj_name, "obj-var-xx %" PRIu64 "", i);
#ifdef ENABLE_MPI
obj_xx[i] = PDCobj_open_col(obj_name, pdc_id);
obj_xx[i] = PDCobj_open_coll(obj_name, pdc_id);
#else
obj_xx[i] = PDCobj_open(obj_name, pdc_id);
#endif
Expand All @@ -185,7 +185,7 @@ main(int argc, char **argv)
}
sprintf(obj_name, "obj-var-yy %" PRIu64 "", i);
#ifdef ENABLE_MPI
obj_yy[i] = PDCobj_open_col(obj_name, pdc_id);
obj_yy[i] = PDCobj_open_coll(obj_name, pdc_id);
#else
obj_yy[i] = PDCobj_open(obj_name, pdc_id);
#endif
Expand All @@ -195,7 +195,7 @@ main(int argc, char **argv)
}
sprintf(obj_name, "obj-var-zz %" PRIu64 "", i);
#ifdef ENABLE_MPI
obj_zz[i] = PDCobj_open_col(obj_name, pdc_id);
obj_zz[i] = PDCobj_open_coll(obj_name, pdc_id);
#else
obj_zz[i] = PDCobj_open(obj_name, pdc_id);
#endif
Expand All @@ -205,7 +205,7 @@ main(int argc, char **argv)
}
sprintf(obj_name, "obj-var-pxx %" PRIu64 "", i);
#ifdef ENABLE_MPI
obj_pxx[i] = PDCobj_open_col(obj_name, pdc_id);
obj_pxx[i] = PDCobj_open_coll(obj_name, pdc_id);
#else
obj_pxx[i] = PDCobj_open(obj_name, pdc_id);
#endif
Expand All @@ -215,7 +215,7 @@ main(int argc, char **argv)
}
sprintf(obj_name, "obj-var-pyy %" PRIu64 "", i);
#ifdef ENABLE_MPI
obj_pyy[i] = PDCobj_open_col(obj_name, pdc_id);
obj_pyy[i] = PDCobj_open_coll(obj_name, pdc_id);
#else
obj_pyy[i] = PDCobj_open(obj_name, pdc_id);
#endif
Expand All @@ -225,7 +225,7 @@ main(int argc, char **argv)
}
sprintf(obj_name, "obj-var-pzz %" PRIu64 "", i);
#ifdef ENABLE_MPI
obj_pzz[i] = PDCobj_open_col(obj_name, pdc_id);
obj_pzz[i] = PDCobj_open_coll(obj_name, pdc_id);
#else
obj_pzz[i] = PDCobj_open(obj_name, pdc_id);
#endif
Expand All @@ -235,7 +235,7 @@ main(int argc, char **argv)
}
sprintf(obj_name, "id11 %" PRIu64 "", i);
#ifdef ENABLE_MPI
obj_id11[i] = PDCobj_open_col(obj_name, pdc_id);
obj_id11[i] = PDCobj_open_coll(obj_name, pdc_id);
#else
obj_id11[i] = PDCobj_open(obj_name, pdc_id);
#endif
Expand All @@ -245,7 +245,7 @@ main(int argc, char **argv)
}
sprintf(obj_name, "id22 %" PRIu64 "", i);
#ifdef ENABLE_MPI
obj_id22[i] = PDCobj_open_col(obj_name, pdc_id);
obj_id22[i] = PDCobj_open_coll(obj_name, pdc_id);
#else
obj_id22[i] = PDCobj_open(obj_name, pdc_id);
#endif
Expand Down
4 changes: 2 additions & 2 deletions examples/haccio.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdc_var
PDCprop_set_obj_user_id(*obj_prop, getuid());
PDCprop_set_obj_app_name(*obj_prop, "HACCIO");

pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, comm);
pdcid_t obj_id = PDCobj_create_coll(cont_id, obj_name, *obj_prop, 0, comm);
if (obj_id == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx");
exit(-1);
Expand Down Expand Up @@ -117,7 +117,7 @@ main(int argc, char **argv)
cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id);

// create a container
cont_id = PDCcont_create_col("c1", cont_prop);
cont_id = PDCcont_create_coll("c1", cont_prop);

uint64_t offset = 0, offset_remote = mpi_rank * NUM_PARTICLES, mysize = NUM_PARTICLES;

Expand Down
4 changes: 2 additions & 2 deletions examples/haccio_v2.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdc_var
PDCprop_set_obj_app_name(*obj_prop, "HACCIO");
PDCprop_set_obj_consistency_semantics(*obj_prop, PDC_CONSISTENCY_POSIX);

pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, comm);
pdcid_t obj_id = PDCobj_create_coll(cont_id, obj_name, *obj_prop, 0, comm);
if (obj_id == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx");
exit(-1);
Expand Down Expand Up @@ -119,7 +119,7 @@ main(int argc, char **argv)
cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id);

// create a container
cont_id = PDCcont_create_col("c1", cont_prop);
cont_id = PDCcont_create_coll("c1", cont_prop);

uint64_t offset = 0, offset_remote = mpi_rank * NUM_PARTICLES, mysize = NUM_PARTICLES;

Expand Down
2 changes: 1 addition & 1 deletion examples/read_write_col_perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ main(int argc, char **argv)
// create first object
sprintf(obj_name1, "o1_%d", i);
#ifdef ENABLE_MPI
obj1 = PDCobj_create_mpi(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD);
obj1 = PDCobj_create_coll(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD);
#else
obj1 = PDCobj_create(cont, obj_name1, obj_prop);
#endif
Expand Down
4 changes: 2 additions & 2 deletions examples/tileio.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdcid_t
PDCprop_set_obj_app_name(*obj_prop, "mpi-tile-io");
PDCprop_set_obj_tags(*obj_prop, "tag0=1");

pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, g_mpi_comm);
pdcid_t obj_id = PDCobj_create_coll(cont_id, obj_name, *obj_prop, 0, g_mpi_comm);
if (obj_id == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx");
exit(-1);
Expand Down Expand Up @@ -112,7 +112,7 @@ main(int argc, char **argv)

// Create containter
cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id);
cont_id = PDCcont_create_col("c1", cont_prop);
cont_id = PDCcont_create_coll("c1", cont_prop);

// Craete object (and its prop)
obj_id = create_pdc_object(pdc_id, cont_id, "tile_io_obj", &obj_prop);
Expand Down
4 changes: 2 additions & 2 deletions examples/tileio_v2.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ create_pdc_object(pdcid_t pdc_id, pdcid_t cont_id, const char *obj_name, pdcid_t
PDCprop_set_obj_app_name(*obj_prop, "mpi-tile-io");
PDCprop_set_obj_tags(*obj_prop, "tag0=1");

pdcid_t obj_id = PDCobj_create_mpi(cont_id, obj_name, *obj_prop, 0, g_mpi_comm);
pdcid_t obj_id = PDCobj_create_coll(cont_id, obj_name, *obj_prop, 0, g_mpi_comm);
if (obj_id == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx");
exit(-1);
Expand Down Expand Up @@ -115,7 +115,7 @@ main(int argc, char **argv)
// Init PDC
pdc_id = PDCinit("pdc");
cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id);
cont_id = PDCcont_create_col("c1", cont_prop);
cont_id = PDCcont_create_coll("c1", cont_prop);
obj_id = create_pdc_object(pdc_id, cont_id, "tile_io_obj", &obj_prop);

// Create region
Expand Down
18 changes: 9 additions & 9 deletions examples/vpicio.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ main(int argc, char **argv)
return 1;
}
// create a container
cont_id = PDCcont_create_col("c1", cont_prop);
cont_id = PDCcont_create_coll("c1", cont_prop);
if (cont_id <= 0) {
LOG_ERROR("Failed to create container");
return 1;
Expand Down Expand Up @@ -152,44 +152,44 @@ main(int argc, char **argv)
obj_prop_id22 = PDCprop_obj_dup(obj_prop_xx);
PDCprop_set_obj_type(obj_prop_id22, PDC_INT);

obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm);
obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, comm);
if (obj_xx == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx");
exit(-1);
}

obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_yy, 0, comm);
obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, comm);
if (obj_yy == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy");
exit(-1);
}
obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_zz, 0, comm);
obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, comm);
if (obj_zz == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz");
exit(-1);
}
obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm);
obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm);
if (obj_pxx == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx");
exit(-1);
}
obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm);
obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm);
if (obj_pyy == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy");
exit(-1);
}
obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm);
obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm);
if (obj_pzz == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz");
exit(-1);
}

obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_id11, 0, comm);
obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, comm);
if (obj_id11 == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11");
exit(-1);
}
obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_id22, 0, comm);
obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, comm);
if (obj_id22 == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22");
exit(-1);
Expand Down
18 changes: 9 additions & 9 deletions examples/vpicio_batch.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ main(int argc, char **argv)
return 1;
}
// create a container
cont_id = PDCcont_create_col("c1", cont_prop);
cont_id = PDCcont_create_coll("c1", cont_prop);
if (cont_id <= 0) {
LOG_ERROR("Failed to create container");
return 1;
Expand Down Expand Up @@ -250,49 +250,49 @@ main(int argc, char **argv)

for (i = 0; i < timestamps; ++i) {
sprintf(obj_name, "obj-var-xx %" PRIu64 "", i);
obj_xx[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_xx, 0, comm);
obj_xx[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_xx, 0, comm);
if (obj_xx[i] == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx");
exit(-1);
}
sprintf(obj_name, "obj-var-yy %" PRIu64 "", i);
obj_yy[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_yy, 0, comm);
obj_yy[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_yy, 0, comm);
if (obj_yy[i] == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-yy");
exit(-1);
}
sprintf(obj_name, "obj-var-zz %" PRIu64 "", i);
obj_zz[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_zz, 0, comm);
obj_zz[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_zz, 0, comm);
if (obj_zz[i] == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-zz");
exit(-1);
}
sprintf(obj_name, "obj-var-pxx %" PRIu64 "", i);
obj_pxx[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_pxx, 0, comm);
obj_pxx[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_pxx, 0, comm);
if (obj_pxx[i] == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pxx");
exit(-1);
}
sprintf(obj_name, "obj-var-pyy %" PRIu64 "", i);
obj_pyy[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_pyy, 0, comm);
obj_pyy[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_pyy, 0, comm);
if (obj_pyy[i] == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pyy");
exit(-1);
}
sprintf(obj_name, "obj-var-pzz %" PRIu64 "", i);
obj_pzz[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_pzz, 0, comm);
obj_pzz[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_pzz, 0, comm);
if (obj_pzz[i] == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-pzz");
exit(-1);
}
sprintf(obj_name, "id11 %" PRIu64 "", i);
obj_id11[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_id11, 0, comm);
obj_id11[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_id11, 0, comm);
if (obj_id11[i] == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id11");
exit(-1);
}
sprintf(obj_name, "id22 %" PRIu64 "", i);
obj_id22[i] = PDCobj_create_mpi(cont_id, obj_name, obj_prop_id22, 0, comm);
obj_id22[i] = PDCobj_create_coll(cont_id, obj_name, obj_prop_id22, 0, comm);
if (obj_id22[i] == 0) {
LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22");
exit(-1);
Expand Down
Loading