diff --git a/CMakeLists.txt b/CMakeLists.txt index dfeb7dc00..036804532 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,10 +358,11 @@ endif() # MPI option #----------------------------------------------------------------------------- option(PDC_ENABLE_MPI "Enable MPI." ON) + if(PDC_ENABLE_MPI) find_package(MPI) if(MPI_FOUND) - set(ENABLE_MPI 1) + add_compile_definitions(ENABLE_MPI=1) endif() endif() diff --git a/docs/source/api.rst b/docs/source/api.rst index 56de98045..71a470145 100644 --- a/docs/source/api.rst +++ b/docs/source/api.rst @@ -40,7 +40,7 @@ PDC container APIs .. function:: pdcid_t PDCcont_create(const char *cont_name, pdcid_t cont_prop_id) - :param cont_name: the name of container. e.g "c1", "c2" + :param cont_name: the name of container. e.g "c1", "c2". :param cont_prop_id: property ID for inheriting a PDC property for container. :returns: pdc_id for future referencing of this container, returned from PDC servers. @@ -48,10 +48,11 @@ 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, MPI_Comm mpi_comm) - :param cont_name: the name to be assigned to a container. e.g "c1", "c2" + :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. + :param mpi_comm: MPI communicator. :returns: pdc_id for future referencing. Exactly the same as ``PDCcont_create``, except all processes must call this function collectively. Create a PDC container for future use collectively. @@ -201,7 +202,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. diff --git a/docs/source/developer-notes.rst b/docs/source/developer-notes.rst index a5bace3ae..283fc915a 100644 --- a/docs/source/developer-notes.rst +++ b/docs/source/developer-notes.rst @@ -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. diff --git a/examples/bdcats.c b/examples/bdcats.c index cd1f1e95f..a5bc96a78 100644 --- a/examples/bdcats.c +++ b/examples/bdcats.c @@ -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, MPI_COMM_WORLD); #else obj_xx = PDCobj_open("obj-var-xx", pdc_id); #endif @@ -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, MPI_COMM_WORLD); #else obj_yy = PDCobj_open("obj-var-xx", pdc_id); #endif @@ -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, MPI_COMM_WORLD); #else obj_zz = PDCobj_open("obj-var-xx", pdc_id); #endif @@ -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, MPI_COMM_WORLD); #else obj_pxx = PDCobj_open("obj-var-xx", pdc_id); #endif @@ -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, MPI_COMM_WORLD); #else obj_pyy = PDCobj_open("obj-var-xx", pdc_id); #endif @@ -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, MPI_COMM_WORLD); #else obj_pzz = PDCobj_open("obj-var-xx", pdc_id); #endif @@ -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, MPI_COMM_WORLD); #else obj_id11 = PDCobj_open("obj-var-xx", pdc_id); #endif @@ -166,9 +166,9 @@ 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, MPI_COMM_WORLD); #else - obj_id22 = PDCobj_open("obj-var-xx", pdc_id); + obj_id22 = PDCobj_open("obj-var-xx", pdc_id, ); #endif if (obj_id22 == 0) { LOG_ERROR("Error when open object %s\n", "id22"); diff --git a/examples/bdcats_batch.c b/examples/bdcats_batch.c index e69aef296..dabae139d 100644 --- a/examples/bdcats_batch.c +++ b/examples/bdcats_batch.c @@ -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, comm); #else obj_xx[i] = PDCobj_open(obj_name, pdc_id); #endif @@ -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, comm); #else obj_yy[i] = PDCobj_open(obj_name, pdc_id); #endif @@ -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, comm); #else obj_zz[i] = PDCobj_open(obj_name, pdc_id); #endif @@ -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, comm); #else obj_pxx[i] = PDCobj_open(obj_name, pdc_id); #endif @@ -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, comm); #else obj_pyy[i] = PDCobj_open(obj_name, pdc_id); #endif @@ -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, comm); #else obj_pzz[i] = PDCobj_open(obj_name, pdc_id); #endif @@ -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, comm); #else obj_id11[i] = PDCobj_open(obj_name, pdc_id); #endif @@ -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, comm); #else obj_id22[i] = PDCobj_open(obj_name, pdc_id); #endif diff --git a/examples/haccio.c b/examples/haccio.c index 81d06271a..3636dbc66 100644 --- a/examples/haccio.c +++ b/examples/haccio.c @@ -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); @@ -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, comm); uint64_t offset = 0, offset_remote = mpi_rank * NUM_PARTICLES, mysize = NUM_PARTICLES; diff --git a/examples/haccio_v2.c b/examples/haccio_v2.c index 2c444aba0..93c752a6b 100644 --- a/examples/haccio_v2.c +++ b/examples/haccio_v2.c @@ -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, MPI_COMM_WORLD); if (obj_id == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); @@ -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, MPI_COMM_WORLD); uint64_t offset = 0, offset_remote = mpi_rank * NUM_PARTICLES, mysize = NUM_PARTICLES; diff --git a/examples/read_write_col_perf.c b/examples/read_write_col_perf.c index 7aa15998a..f6e7283cd 100644 --- a/examples/read_write_col_perf.c +++ b/examples/read_write_col_perf.c @@ -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 diff --git a/examples/tileio.c b/examples/tileio.c index c73695390..068d24feb 100644 --- a/examples/tileio.c +++ b/examples/tileio.c @@ -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); @@ -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, MPI_COMM_WORLD); // Craete object (and its prop) obj_id = create_pdc_object(pdc_id, cont_id, "tile_io_obj", &obj_prop); diff --git a/examples/tileio_v2.c b/examples/tileio_v2.c index eef86d332..d2983588c 100644 --- a/examples/tileio_v2.c +++ b/examples/tileio_v2.c @@ -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); @@ -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, g_mpi_comm); obj_id = create_pdc_object(pdc_id, cont_id, "tile_io_obj", &obj_prop); // Create region diff --git a/examples/vpicio.c b/examples/vpicio.c index b55603924..94d26251d 100644 --- a/examples/vpicio.c +++ b/examples/vpicio.c @@ -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, comm); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return 1; @@ -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); diff --git a/examples/vpicio_batch.c b/examples/vpicio_batch.c index 216627791..feeb50d7c 100644 --- a/examples/vpicio_batch.c +++ b/examples/vpicio_batch.c @@ -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, comm); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return 1; @@ -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); diff --git a/examples/vpicio_old.c b/examples/vpicio_old.c index 30c7e2316..3099cb092 100644 --- a/examples/vpicio_old.c +++ b/examples/vpicio_old.c @@ -113,7 +113,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, comm); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return 1; @@ -149,44 +149,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); diff --git a/src/api/include/pdc_client_connect.h b/src/api/include/pdc_client_connect.h index e8999ab2f..8fef376ac 100644 --- a/src/api/include/pdc_client_connect.h +++ b/src/api/include/pdc_client_connect.h @@ -233,12 +233,7 @@ int PDC_Client_get_var_type_size(pdc_var_type_t dtype); perr_t PDC_Client_transfer_request_all(hg_bulk_t *bulk_handle, int n_objs, pdc_access_t access_type, uint32_t data_server_id, char *bulk_buf, hg_size_t bulk_size, - uint64_t *metadata_id, -#ifdef ENABLE_MPI - MPI_Comm comm); -#else - int comm); -#endif + uint64_t *metadata_id); perr_t PDC_Client_transfer_request_metadata_query(hg_bulk_t *bulk_handle, char *buf, uint64_t total_buf_size, int n_objs, uint32_t metadata_server_id, uint8_t is_write, @@ -604,7 +599,7 @@ perr_t PDC_Client_query_container_name(const char *cont_name, uint64_t *cont_met * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Client_query_container_name_col(const char *cont_name, uint64_t *cont_meta_id); +perr_t PDC_Client_query_container_name_coll(const char *cont_name, uint64_t *cont_meta_id); /** * Async request send to server to read a region and put it in users buffer @@ -675,7 +670,7 @@ perr_t PDC_Client_create_cont_id(const char *cont_name, pdcid_t cont_create_prop * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Client_create_cont_id_mpi(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id); +perr_t PDC_Client_create_cont_id_coll(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id); /** * Client sends query requests to server @@ -688,7 +683,6 @@ perr_t PDC_Client_create_cont_id_mpi(const char *cont_name, pdcid_t cont_create_ */ perr_t PDC_Client_query_kvtag(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids); -#ifdef ENABLE_MPI /** * Client sends query requests to server (used by MPI mode), all clients get the same aggregated * query results, currently assumes MPI_COMM_WORLD @@ -699,7 +693,11 @@ perr_t PDC_Client_query_kvtag(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **p * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Client_query_kvtag_mpi(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, MPI_Comm comm); +perr_t PDC_Client_query_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, +#ifdef ENABLE_MPI + MPI_Comm comm); +#else + int comm); #endif /** @@ -951,7 +949,7 @@ perr_t PDC_Client_add_objects_to_container(int nobj, pdcid_t *local_obj_ids, pdc * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Client_create_cont_id_mpi(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id); +perr_t PDC_Client_create_cont_id_coll(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id); /** * Query and read a number of objects with their obj name @@ -1079,7 +1077,6 @@ void dart_retrieve_server_info_cb(dart_server *target_server); perr_t PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char *query_string, dart_object_ref_type_t ref_type, int *n_res, uint64_t **out); -#ifdef ENABLE_MPI /** * Search through dart index with key-value pair. * This is an MPI version of the search function. Multiple ranks can call this function, but only one rank @@ -1093,9 +1090,13 @@ perr_t PDC_Client_search_obj_ref_through_dart(dart_hash_algo_t hash_algo, char * * \param n_res [OUT] Number of object IDs * \param out [OUT] Object IDs */ -perr_t PDC_Client_search_obj_ref_through_dart_mpi(dart_hash_algo_t hash_algo, char *query_string, - dart_object_ref_type_t ref_type, int *n_res, uint64_t **out, - MPI_Comm comm); +perr_t PDC_Client_search_obj_ref_through_dart_coll(dart_hash_algo_t hash_algo, char *query_string, + dart_object_ref_type_t ref_type, int *n_res, + uint64_t **out, +#ifdef ENABLE_MPI + MPI_Comm comm); +#else + int comm); #endif /** diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c index ca2cb7ff2..87a74d2cd 100644 --- a/src/api/pdc_client_connect.c +++ b/src/api/pdc_client_connect.c @@ -2544,7 +2544,7 @@ PDC_Client_create_cont_id(const char *cont_name, pdcid_t cont_create_prop ATTRIB // Only one rand sends the request, others wait for MPI broadcast perr_t -PDC_Client_create_cont_id_mpi(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id) +PDC_Client_create_cont_id_coll(const char *cont_name, pdcid_t cont_create_prop, pdcid_t *cont_id) { FUNC_ENTER(NULL); @@ -2983,12 +2983,7 @@ PDC_Client_flush_obj_all() perr_t PDC_Client_transfer_request_all(hg_bulk_t *bulk_handle, int n_objs, pdc_access_t access_type, uint32_t data_server_id, char *bulk_buf, hg_size_t bulk_size, - uint64_t *metadata_id, -#ifdef ENABLE_MPI - MPI_Comm comm) -#else - int comm) -#endif + uint64_t *metadata_id) { FUNC_ENTER(NULL); @@ -3034,11 +3029,6 @@ PDC_Client_transfer_request_all(hg_bulk_t *bulk_handle, int n_objs, pdc_access_t hg_ret = HG_Forward(client_send_transfer_request_all_handle, client_send_transfer_request_all_rpc_cb, &transfer_args, &in); -#ifdef ENABLE_MPI - if (comm != 0) - MPI_Barrier(comm); -#endif - PDC_Client_transfer_pthread_create(); #ifdef PDC_TIMING @@ -3057,8 +3047,8 @@ PDC_Client_transfer_request_all(hg_bulk_t *bulk_handle, int n_objs, pdc_access_t PDC_Client_wait_pthread_progress(); #ifdef ENABLE_MPI - if (comm != 0) - MPI_Barrier(comm); + if (PDC_CLIENT_COMM_WORLD_g != 0) + MPI_Barrier(PDC_CLIENT_COMM_WORLD_g); #endif #ifdef PDC_TIMING @@ -5010,7 +5000,7 @@ PDC_Client_query_container_name(const char *cont_name, uint64_t *cont_meta_id) } perr_t -PDC_Client_query_container_name_col(const char *cont_name, uint64_t *cont_meta_id) +PDC_Client_query_container_name_coll(const char *cont_name, uint64_t *cont_meta_id) { FUNC_ENTER(NULL); @@ -5882,7 +5872,7 @@ PDC_Client_query_multi_storage_info(int nobj, char **obj_names, region_storage_m #if defined(ENABLE_MPI) && defined(ENABLE_TIMING) perr_t -PDC_get_io_stats_mpi(double read_time, double query_time, int nfopen) +PDC_get_io_stats_coll(double read_time, double query_time, int nfopen) { FUNC_ENTER(NULL); @@ -5960,7 +5950,7 @@ PDC_Client_query_name_read_entire_obj_client(int nobj, char **obj_names, void ** read_time = PDC_get_elapsed_time_double(&pdc_timer2, &pdc_timer1); read_time_g += read_time; #ifdef ENABLE_MPI - PDC_get_io_stats_mpi(read_time, query_time, nfopen_g); + PDC_get_io_stats_coll(read_time, query_time, nfopen_g); #endif #endif @@ -6082,7 +6072,7 @@ PDC_Client_query_name_read_entire_obj_client_agg(int my_nobj, char **my_obj_name read_time = PDC_get_elapsed_time_double(&pdc_timer2, &pdc_timer1); read_time_g += read_time; #ifdef ENABLE_MPI - PDC_get_io_stats_mpi(read_time, query_time, nfopen_g); + PDC_get_io_stats_coll(read_time, query_time, nfopen_g); #endif #endif @@ -6795,7 +6785,7 @@ PDCcont_put(const char *cont_name, pdcid_t pdc) #ifdef ENABLE_MPI - ret_value = PDC_Client_create_cont_id_mpi(cont_name, cont_prop, &cont_id); + ret_value = PDC_Client_create_cont_id_coll(cont_name, cont_prop, &cont_id); #else ret_value = PDC_Client_create_cont_id(cont_name, cont_prop, &cont_id); #endif @@ -8015,7 +8005,6 @@ PDC_Client_insert_obj_ref_into_dart(dart_hash_algo_t hash_algo, char *attr_key, /******************** Collective Object Selection Query Starts *******************************/ -// #define ENABLE_MPI #ifdef ENABLE_MPI void @@ -8069,8 +8058,8 @@ PDC_assign_server(int32_t *my_server_start, int32_t *my_server_end, int32_t *my_ } // All clients collectively query all servers, each client gets partial results -perr_t -PDC_Client_query_kvtag_col(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, int *query_sent) +static perr_t +PDC_Client_query_partial_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, int *query_sent) { FUNC_ENTER(NULL); @@ -8177,7 +8166,7 @@ _customized_all_gather_result(int query_sent, int *n_res, uint64_t **pdc_ids, MP int sub_n_obj_len = n_sent_ranks + 1; // the last element is the first rank who sent the query. int *sub_n_obj_arr = (int *)PDC_calloc(sub_n_obj_len, sizeof(int)); // FIXME: how to get the global rank number of the first rank who sent the query? - // currently, we use 0, since each time when PDC_Client_query_kvtag_col runs, it is always using the + // currently, we use 0, since each time when PDC_Client_query_kvtag_coll runs, it is always using the // first N ranks to send the query, where N is the number of servers. sub_n_obj_arr[sub_n_obj_len - 1] = 0; @@ -8229,7 +8218,7 @@ _customized_all_gather_result(int query_sent, int *n_res, uint64_t **pdc_ids, MP // All clients collectively query all servers, all clients get all results perr_t -PDC_Client_query_kvtag_mpi(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, MPI_Comm world_comm) +PDC_Client_query_kvtag_coll(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ids, MPI_Comm world_comm) { FUNC_ENTER(NULL); @@ -8242,7 +8231,7 @@ PDC_Client_query_kvtag_mpi(const pdc_kvtag_t *kvtag, int *n_res, uint64_t **pdc_ MPI_Barrier(world_comm); stime = MPI_Wtime(); - ret_value = PDC_Client_query_kvtag_col(kvtag, n_res, pdc_ids, &query_sent); + ret_value = PDC_Client_query_partial_kvtag_coll(kvtag, n_res, pdc_ids, &query_sent); MPI_Barrier(world_comm); duration = MPI_Wtime() - stime; @@ -8388,9 +8377,13 @@ _customized_bcast_result(int first_sender_global_rank, int num_groups, int sende } perr_t -PDC_Client_search_obj_ref_through_dart_mpi(dart_hash_algo_t hash_algo, char *query_string, - dart_object_ref_type_t ref_type, int *n_res, uint64_t **out, - MPI_Comm world_comm) +PDC_Client_search_obj_ref_through_dart_coll(dart_hash_algo_t hash_algo, char *query_string, + dart_object_ref_type_t ref_type, int *n_res, uint64_t **out, +#ifdef ENABLE_MPI + MPI_Comm world_comm) +#else + int world_comm) +#endif { FUNC_ENTER(NULL); diff --git a/src/api/pdc_meta/pdc_metadata_client.c b/src/api/pdc_meta/pdc_metadata_client.c index 4a65de931..0c71df4ce 100644 --- a/src/api/pdc_meta/pdc_metadata_client.c +++ b/src/api/pdc_meta/pdc_metadata_client.c @@ -93,8 +93,8 @@ send_query_condition_get_separate_result(char conditions[][CONDITION_LENGTH], in // if this is collective mode, each client will send a different condition to a different server perr_t rst; if (world_comm != NULL) { - rst = PDC_Client_search_obj_ref_through_dart_mpi(DART_HASH, condition, REF_PRIMARY_ID, &n_res, - &out, world_comm); + rst = PDC_Client_search_obj_ref_through_dart_coll(DART_HASH, condition, REF_PRIMARY_ID, &n_res, + &out, world_comm); } int n_res; uint64_t *out; diff --git a/src/api/pdc_obj/include/pdc_cont.h b/src/api/pdc_obj/include/pdc_cont.h index 9bdb22149..1eca38f8c 100644 --- a/src/api/pdc_obj/include/pdc_cont.h +++ b/src/api/pdc_obj/include/pdc_cont.h @@ -27,6 +27,10 @@ #include "pdc_public.h" +#ifdef ENABLE_MPI +#include "mpi.h" +#endif + typedef struct _pdc_id_info cont_handle; /**************************/ @@ -62,7 +66,12 @@ pdcid_t PDCcont_create(const char *cont_name, pdcid_t cont_create_prop); * * \return Container id on success/Zero on failure */ -pdcid_t PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id); +pdcid_t PDCcont_create_coll(const char *cont_name, pdcid_t cont_prop_id, +#ifdef ENABLE_MPI + MPI_Comm comm); +#else + int comm); +#endif /** * Open a container @@ -82,7 +91,12 @@ pdcid_t PDCcont_open(const char *cont_name, pdcid_t pdc_id); * * \return Container id on success/Zero on failure */ -pdcid_t PDCcont_open_col(const char *cont_name, pdcid_t pdc_id); +pdcid_t PDCcont_open_coll(const char *cont_name, pdcid_t pdc_id, +#ifdef ENABLE_MPI + MPI_Comm comm); +#else + int comm); +#endif /** * Close a container diff --git a/src/api/pdc_obj/include/pdc_mpi.h b/src/api/pdc_obj/include/pdc_mpi.h index 5a4341c90..3ddda8c79 100644 --- a/src/api/pdc_obj/include/pdc_mpi.h +++ b/src/api/pdc_obj/include/pdc_mpi.h @@ -41,7 +41,11 @@ * * \return Object ID on success/Zero on failure */ -pdcid_t PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_create_prop, int rank_id, - MPI_Comm comm); +pdcid_t PDCobj_create_coll(pdcid_t cont_id, const char *obj_name, pdcid_t obj_create_prop, int rank_id, +#ifdef ENABLE_MPI + MPI_Comm comm); +#else + int comm); +#endif #endif /* PDC_MPI_H */ diff --git a/src/api/pdc_obj/include/pdc_obj.h b/src/api/pdc_obj/include/pdc_obj.h index af334a46d..5dcaadec9 100644 --- a/src/api/pdc_obj/include/pdc_obj.h +++ b/src/api/pdc_obj/include/pdc_obj.h @@ -26,6 +26,9 @@ #define PDC_OBJ_H #include "pdc_public.h" +#ifdef ENABLE_MPI +#include "mpi.h" +#endif /*******************/ /* Public Typedefs */ @@ -99,7 +102,12 @@ pdcid_t PDCobj_open(const char *obj_name, pdcid_t pdc_id); * * \return Object id on success/Zero on failure */ -pdcid_t PDCobj_open_col(const char *obj_name, pdcid_t pdc_id); +pdcid_t PDCobj_open_coll(const char *obj_name, pdcid_t pdc_id, +#ifdef ENABLE_MPI + MPI_Comm comm); +#else + int comm); +#endif /** diff --git a/src/api/pdc_obj/pdc_cont.c b/src/api/pdc_obj/pdc_cont.c index 18c4396cf..9e5059e35 100644 --- a/src/api/pdc_obj/pdc_cont.c +++ b/src/api/pdc_obj/pdc_cont.c @@ -30,6 +30,9 @@ #include "pdc_interface.h" #include "pdc_query.h" #include "pdc_client_connect.h" +#ifdef ENABLE_MPI +#include "mpi.h" +#endif #include static perr_t PDC_cont_close(struct _pdc_cont_info *cp); @@ -99,7 +102,12 @@ PDCcont_create(const char *cont_name, pdcid_t cont_prop_id) } pdcid_t -PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id) +PDCcont_create_coll(const char *cont_name, pdcid_t cont_prop_id, +#ifdef ENABLE_MPI + MPI_Comm comm) +#else + int comm) +#endif { FUNC_ENTER(NULL); @@ -136,7 +144,7 @@ PDCcont_create_col(const char *cont_name, pdcid_t cont_prop_id) p->cont_pt->pdc->name = strdup(cont_prop->pdc->name); p->cont_pt->pdc->local_id = cont_prop->pdc->local_id; - ret = PDC_Client_create_cont_id_mpi(cont_name, cont_prop_id, &(p->cont_info_pub->meta_id)); + ret = PDC_Client_create_cont_id_coll(cont_name, cont_prop_id, &(p->cont_info_pub->meta_id)); if (ret == FAIL) PGOTO_ERROR(0, "Unable to create container object on server"); @@ -284,7 +292,12 @@ PDCcont_open(const char *cont_name, pdcid_t pdc) } pdcid_t -PDCcont_open_col(const char *cont_name, pdcid_t pdc) +PDCcont_open_coll(const char *cont_name, pdcid_t pdc, +#ifdef ENABLE_MPI + MPI_Comm comm) +#else + int comm) +#endif { FUNC_ENTER(NULL); @@ -293,7 +306,7 @@ PDCcont_open_col(const char *cont_name, pdcid_t pdc) pdcid_t cont_id; pdcid_t cont_meta_id; - ret = PDC_Client_query_container_name_col(cont_name, &cont_meta_id); + ret = PDC_Client_query_container_name_coll(cont_name, &cont_meta_id); if (ret == FAIL) PGOTO_ERROR(0, "Query container name failed"); cont_id = PDC_cont_create_local(pdc, cont_name, cont_meta_id); diff --git a/src/api/pdc_obj/pdc_mpi.c b/src/api/pdc_obj/pdc_mpi.c index 1e5fa38f1..9d19e5386 100644 --- a/src/api/pdc_obj/pdc_mpi.c +++ b/src/api/pdc_obj/pdc_mpi.c @@ -30,16 +30,24 @@ #include "pdc_mpi.h" pdcid_t -PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, MPI_Comm comm) +PDCobj_create_coll(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, int rank_id, +#ifdef ENABLE_MPI + MPI_Comm comm) +#else + int comm) +#endif { FUNC_ENTER(NULL); struct _pdc_obj_info *p = NULL; struct _pdc_id_info * id_info = NULL; - int rank; + int rank = 0; pdcid_t ret_value; +#ifdef ENABLE_MPI MPI_Comm_rank(comm, &rank); +#endif + if (rank == rank_id) { ret_value = PDC_obj_create(cont_id, obj_name, obj_prop_id, PDC_OBJ_GLOBAL); } @@ -53,10 +61,12 @@ PDCobj_create_mpi(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, in p = (struct _pdc_obj_info *)(id_info->obj_ptr); +#ifdef ENABLE_MPI MPI_Bcast(&(p->obj_info_pub->meta_id), 1, MPI_LONG_LONG, rank_id, comm); MPI_Bcast(&(p->obj_info_pub->metadata_server_id), 1, MPI_UINT32_T, rank_id, comm); MPI_Bcast(&(((pdc_metadata_t *)p->metadata)->data_server_id), 1, MPI_UINT32_T, rank_id, comm); MPI_Bcast(&(((pdc_metadata_t *)p->metadata)->region_partition), 1, MPI_UINT8_T, rank_id, comm); +#endif done: FUNC_LEAVE(ret_value); diff --git a/src/api/pdc_obj/pdc_obj.c b/src/api/pdc_obj/pdc_obj.c index c32e9272a..145aa883f 100644 --- a/src/api/pdc_obj/pdc_obj.c +++ b/src/api/pdc_obj/pdc_obj.c @@ -531,7 +531,12 @@ PDCobj_open(const char *obj_name, pdcid_t pdc) } pdcid_t -PDCobj_open_col(const char *obj_name, pdcid_t pdc) +PDCobj_open_coll(const char *obj_name, pdcid_t pdc, +#ifdef ENABLE_MPI + MPI_Comm comm) +#else + int comm) +#endif { FUNC_ENTER(NULL); diff --git a/src/api/pdc_region/include/pdc_region.h b/src/api/pdc_region/include/pdc_region.h index 1a273a9f4..19c174559 100644 --- a/src/api/pdc_region/include/pdc_region.h +++ b/src/api/pdc_region/include/pdc_region.h @@ -152,7 +152,12 @@ perr_t PDCregion_transfer_start_all(pdcid_t *transfer_request_id, int size); * * \return Non-negative on success/Negative on failure */ -perr_t PDCregion_transfer_start_mpi(pdcid_t transfer_request_id, MPI_Comm comm); +perr_t PDCregion_transfer_start_coll(pdcid_t transfer_request_id, +#ifdef ENABLE_MPI + MPI_Comm comm); +#else + int comm); +#endif /** * Start several region transfer requests (asynchronously), MPI collective version for better performance at @@ -164,7 +169,12 @@ perr_t PDCregion_transfer_start_mpi(pdcid_t transfer_request_id, MPI_Comm comm); * * \return Non-negative on success/Negative on failure */ -perr_t PDCregion_transfer_start_all_mpi(pdcid_t *transfer_request_id, int size, MPI_Comm comm); +perr_t PDCregion_transfer_start_all_coll(pdcid_t *transfer_request_id, int size, +#ifdef ENABLE_MPI + MPI_Comm comm); +#else + int comm); +#endif #endif /** diff --git a/src/api/pdc_region/pdc_region_transfer.c b/src/api/pdc_region/pdc_region_transfer.c index 539ed1d52..fecdd38db 100644 --- a/src/api/pdc_region/pdc_region_transfer.c +++ b/src/api/pdc_region/pdc_region_transfer.c @@ -1279,7 +1279,7 @@ PDC_Client_pack_all_requests(int n_objs, pdc_transfer_request_start_all_pkg **tr } static perr_t -PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requests, int size, MPI_Comm comm) +PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requests, int size) { FUNC_ENTER(NULL); @@ -1310,7 +1310,7 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ bulk_buf_ref[0] = n_objs; PDC_Client_transfer_request_all( &bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, - transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); + transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index); PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); for (j = index; j < i; ++j) { // All requests share the same bulk buffer, reference counter is also shared among all @@ -1338,7 +1338,7 @@ PDC_Client_start_all_requests(pdc_transfer_request_start_all_pkg **transfer_requ bulk_buf_ref[0] = n_objs; PDC_Client_transfer_request_all( &bulk_handle, n_objs, transfer_requests[index]->transfer_request->access_type, - transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index, comm); + transfer_requests[index]->data_server_id, bulk_buf, bulk_buf_size, metadata_id + index); PDCregion_transfer_add_bulk_handle(transfer_requests[index]->transfer_request, bulk_handle); for (j = index; j < size; ++j) { @@ -1458,10 +1458,11 @@ merge_transfer_request_ids(pdcid_t *transfer_request_id, int size, pdcid_t *merg } perr_t +PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, #ifdef ENABLE_MPI -PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, MPI_Comm comm) + MPI_Comm comm) #else -PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, int comm) + int comm) #endif { FUNC_ENTER(NULL); @@ -1495,10 +1496,10 @@ PDCregion_transfer_start_all_common(pdcid_t *transfer_request_id, int size, int // Start write requests if (write_size > 0) - PDC_Client_start_all_requests(write_transfer_requests, write_size, comm); + PDC_Client_start_all_requests(write_transfer_requests, write_size); // Start read requests if (read_size > 0) - PDC_Client_start_all_requests(read_transfer_requests, read_size, comm); + PDC_Client_start_all_requests(read_transfer_requests, read_size); // For POSIX consistency, we block here until the data is received by the server if (posix_size > 0) { @@ -1530,7 +1531,7 @@ PDCregion_transfer_start_all(pdcid_t *transfer_request_id, int size) #ifdef ENABLE_MPI perr_t -PDCregion_transfer_start_all_mpi(pdcid_t *transfer_request_id, int size, MPI_Comm comm) +PDCregion_transfer_start_all_coll(pdcid_t *transfer_request_id, int size, MPI_Comm comm) { FUNC_ENTER(NULL); @@ -1546,7 +1547,7 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, #ifdef ENABLE_MPI MPI_Comm comm) #else - int comm) + int comm) #endif { FUNC_ENTER(NULL); @@ -1572,7 +1573,7 @@ PDCregion_transfer_start_common(pdcid_t transfer_request_id, if (transfer_request->region_partition == PDC_REGION_DYNAMIC || transfer_request->region_partition == PDC_REGION_LOCAL) { #ifdef ENABLE_MPI - PDCregion_transfer_start_all_mpi(&transfer_request_id, 1, comm); + PDCregion_transfer_start_all_coll(&transfer_request_id, 1, comm); #else PDCregion_transfer_start_all(&transfer_request_id, 1); #endif @@ -1668,7 +1669,7 @@ PDCregion_transfer_start(pdcid_t transfer_request_id) #ifdef ENABLE_MPI perr_t -PDCregion_transfer_start_mpi(pdcid_t transfer_request_id, MPI_Comm comm) +PDCregion_transfer_start_coll(pdcid_t transfer_request_id, MPI_Comm comm) { FUNC_ENTER(NULL); diff --git a/src/commons/utils/include/pdc_linkedlist.h b/src/commons/utils/include/pdc_linkedlist.h index a9de691b0..9fe4c5caf 100644 --- a/src/commons/utils/include/pdc_linkedlist.h +++ b/src/commons/utils/include/pdc_linkedlist.h @@ -43,8 +43,6 @@ #ifndef PDC_LINKEDLIST_H #define PDC_LINKEDLIST_H -// #include "pdc_cont_pkg.h" -// #include "pdc_cont.h" #include "mercury_thread_mutex.h" #include diff --git a/src/server/pdc_server_region/include/pdc_server_data.h b/src/server/pdc_server_region/include/pdc_server_data.h index a204aa437..cd1c95f4d 100644 --- a/src/server/pdc_server_region/include/pdc_server_data.h +++ b/src/server/pdc_server_region/include/pdc_server_data.h @@ -638,7 +638,7 @@ hg_return_t PDC_Server_query_read_names_cb(const struct hg_cb_info *callback_inf * * \return Non-negative on success/Negative on failure */ -perr_t PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data); +perr_t PDC_Server_update_region_storage_meta_bulk_coll(bulk_xfer_data_t *bulk_data); /** * Close the shared memory diff --git a/src/server/pdc_server_region/pdc_server_data.c b/src/server/pdc_server_region/pdc_server_data.c index 53fdf1e84..58a611866 100644 --- a/src/server/pdc_server_region/pdc_server_data.c +++ b/src/server/pdc_server_region/pdc_server_data.c @@ -2230,7 +2230,7 @@ PDC_Server_count_write_check_update_storage_meta_cb(const struct hg_cb_info *cal // Note: one request region can spread across multiple regions in storage // Need to allocate **overlap_region_loc with PDC_MAX_OVERLAP_REGION_NUM before calling this static perr_t -PDC_Server_get_storage_location_of_region_mpi(region_list_t *regions_head) +PDC_Server_get_storage_location_of_region_coll(region_list_t *regions_head) { FUNC_ENTER(NULL); @@ -3158,7 +3158,7 @@ update_storage_meta_bulk_rpc_cb(const struct hg_cb_info *callback_info) } perr_t -PDC_Server_update_region_storage_meta_bulk_mpi(bulk_xfer_data_t *bulk_data) +PDC_Server_update_region_storage_meta_bulk_coll(bulk_xfer_data_t *bulk_data) { FUNC_ENTER(NULL); @@ -3650,7 +3650,7 @@ PDC_Server_posix_one_file_io(region_list_t *region_list_head) if (region_elt->is_io_done == 1) continue; - ret_value = PDC_Server_get_storage_location_of_region_mpi(region_elt); + ret_value = PDC_Server_get_storage_location_of_region_coll(region_elt); if (ret_value != SUCCEED) { PGOTO_ERROR(FAIL, "Error with PDC_Server_get_storage_location_of_region"); } diff --git a/src/tests/cont/cont_getid.c b/src/tests/cont/cont_getid.c index 8c9240568..1b6c5a992 100644 --- a/src/tests/cont/cont_getid.c +++ b/src/tests/cont/cont_getid.c @@ -54,13 +54,17 @@ main(int argc, char **argv) } TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); - // create a container - TASSERT((cont_id = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); #ifdef ENABLE_MPI + // create a container + TASSERT((cont_id = PDCcont_create_coll("c1", cont_prop, MPI_COMM_WORLD)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); MPI_Barrier(MPI_COMM_WORLD); +#else + TASSERT((cont_id = PDCcont_create("c1", cont_prop)) != 0, "Call to PDCcont_create succeeded", + "Call to PDCcont_create failed"); #endif + TASSERT((cont_id2 = PDCcont_open("c1", pdc_id)) > 0, "Call to PDCcont_open succeeded", "Call to PDCcont_open failed"); #ifdef ENABLE_MPI diff --git a/src/tests/cont/create_cont_coll.c b/src/tests/cont/create_cont_coll.c index 6dd48327c..14c1e3359 100644 --- a/src/tests/cont/create_cont_coll.c +++ b/src/tests/cont/create_cont_coll.c @@ -49,8 +49,8 @@ main(int argc, char **argv) TASSERT((create_prop = PDCprop_create(PDC_CONT_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont = PDCcont_create_col("c1", create_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll("c1", create_prop, MPI_COMM_WORLD)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); // close a container TASSERT(PDCcont_close(cont) >= 0, "Call to PDCcont_close succeeded", "Call to PDCcont_close failed"); // close a container property diff --git a/src/tests/cont/open_cont.c b/src/tests/cont/open_cont.c index 7fdcd0a72..7a2562507 100644 --- a/src/tests/cont/open_cont.c +++ b/src/tests/cont/open_cont.c @@ -51,10 +51,13 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont_id = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); #ifdef ENABLE_MPI + TASSERT((cont_id = PDCcont_create_coll("c1", cont_prop, MPI_COMM_WORLD)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); MPI_Barrier(MPI_COMM_WORLD); +#else + TASSERT((cont_id = PDCcont_create("c1", cont_prop)) != 0, "Call to PDCcont_create succeeded", + "Call to PDCcont_create failed"); #endif TASSERT((cont_id2 = PDCcont_open("c1", pdc_id)) > 0, "Call to PDCcont_open succeeded", diff --git a/src/tests/dart/dart_attr_dist_test.c b/src/tests/dart/dart_attr_dist_test.c index bb0c48997..adf22312c 100644 --- a/src/tests/dart/dart_attr_dist_test.c +++ b/src/tests/dart/dart_attr_dist_test.c @@ -10,8 +10,6 @@ #include "timer_utils.h" #include "dart_core.h" -// #define ENABLE_MPI 1 - #ifdef ENABLE_MPI #include "mpi.h" #endif diff --git a/src/tests/dart/dart_func_test.c b/src/tests/dart/dart_func_test.c index ff5317a82..4e1399ee2 100644 --- a/src/tests/dart/dart_func_test.c +++ b/src/tests/dart/dart_func_test.c @@ -10,8 +10,6 @@ #include "timer_utils.h" #include "dart_core.h" -// #define ENABLE_MPI 1 - #ifdef ENABLE_MPI #include "mpi.h" #endif diff --git a/src/tests/dart/dart_test.c b/src/tests/dart/dart_test.c index 4bbf49e6f..21e13ad53 100644 --- a/src/tests/dart/dart_test.c +++ b/src/tests/dart/dart_test.c @@ -9,8 +9,6 @@ #include "string_utils.h" #include "timer_utils.h" -// #define ENABLE_MPI 1 - #ifdef ENABLE_MPI #include "mpi.h" #endif diff --git a/src/tests/deprecated/blocked_lock.c b/src/tests/deprecated/blocked_lock.c index 3d1381471..fb563c546 100644 --- a/src/tests/deprecated/blocked_lock.c +++ b/src/tests/deprecated/blocked_lock.c @@ -89,7 +89,7 @@ main(int argc, char **argv) PDCprop_set_obj_app_name(obj_prop2, "VPICIO"); PDCprop_set_obj_tags(obj_prop2, "tag0=1"); - obj2 = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop2, 0); + obj2 = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop2, 0, MPI_COMM_WORLD); if (obj2 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj-var-xx"); exit(-1); diff --git a/src/tests/deprecated/buf_map_mpi_v2.c b/src/tests/deprecated/buf_map_mpi_v2.c index db965755c..c7b5690ec 100644 --- a/src/tests/deprecated/buf_map_mpi_v2.c +++ b/src/tests/deprecated/buf_map_mpi_v2.c @@ -105,7 +105,7 @@ main(int argc, char **argv) obj2 = PDCobj_open("obj-var-xx", pdc_id); if (obj2 == 0) { #ifdef ENABLE_MPI - obj2 = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop2, 0, comm); + obj2 = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop2, 0, comm); #else obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); #endif diff --git a/src/tests/deprecated/buf_obj_map_mpi.c b/src/tests/deprecated/buf_obj_map_mpi.c index 8e71b6401..a101f0cd1 100644 --- a/src/tests/deprecated/buf_obj_map_mpi.c +++ b/src/tests/deprecated/buf_obj_map_mpi.c @@ -94,7 +94,7 @@ main(int argc, char **argv) PDCprop_set_obj_tags(obj_prop2, "tag0=1"); #ifdef ENABLE_MPI - obj2 = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop2, 0, comm); + obj2 = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop2, 0, comm); #else obj2 = PDCobj_create(cont_id, "obj-var-xx", obj_prop2); #endif diff --git a/src/tests/deprecated/obj_transformation.c b/src/tests/deprecated/obj_transformation.c index ebba0f16d..61fac94b1 100644 --- a/src/tests/deprecated/obj_transformation.c +++ b/src/tests/deprecated/obj_transformation.c @@ -140,43 +140,43 @@ main(int argc, char **argv) PDCprop_set_obj_type(obj_prop_id22, PDC_INT); #ifdef ENABLE_MPI - obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, MPI_COMM_WORLD); + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, MPI_COMM_WORLD); 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, MPI_COMM_WORLD); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, MPI_COMM_WORLD); 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, MPI_COMM_WORLD); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, MPI_COMM_WORLD); 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, MPI_COMM_WORLD); + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, MPI_COMM_WORLD); 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, MPI_COMM_WORLD); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, MPI_COMM_WORLD); 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, MPI_COMM_WORLD); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, MPI_COMM_WORLD); 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, MPI_COMM_WORLD); + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, MPI_COMM_WORLD); 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, MPI_COMM_WORLD); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, MPI_COMM_WORLD); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); diff --git a/src/tests/deprecated/vpicio_old.c b/src/tests/deprecated/vpicio_old.c index fe2786b52..6b64af141 100644 --- a/src/tests/deprecated/vpicio_old.c +++ b/src/tests/deprecated/vpicio_old.c @@ -113,7 +113,11 @@ main(int argc, char **argv) return 1; } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); +#ifdef ENABLE_MPI + cont_id = PDCcont_create_coll("c1", cont_prop, comm); +#else + cont_id = PDCcont_create("c1", cont_prop); +#endif if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return 1; @@ -149,44 +153,58 @@ 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); +#ifdef ENABLE_MPI + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, comm); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, comm); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, comm); + + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm); + + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, comm); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, comm); +#else + obj_xx = PDCobj_create(cont_id, "obj-var-xx", obj_prop_xx); + obj_yy = PDCobj_create(cont_id, "obj-var-yy", obj_prop_yy); + obj_zz = PDCobj_create(cont_id, "obj-var-zz", obj_prop_zz); + + obj_pxx = PDCobj_create(cont_id, "obj-var-pxx", obj_prop_pxx); + obj_pyy = PDCobj_create(cont_id, "obj-var-pyy", obj_prop_pyy); + obj_pzz = PDCobj_create(cont_id, "obj-var-pzz", obj_prop_pzz); + + obj_id11 = PDCobj_create(cont_id, "id11", obj_prop_id11); + obj_id22 = PDCobj_create(cont_id, "id22", obj_prop_id22); +#endif + 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); 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); 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); 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); 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); 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); 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); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server, exit...\n", "obj_id22"); exit(-1); diff --git a/src/tests/deprecated/vpicio_v2.c b/src/tests/deprecated/vpicio_v2.c index d540a881f..58d5bf141 100644 --- a/src/tests/deprecated/vpicio_v2.c +++ b/src/tests/deprecated/vpicio_v2.c @@ -108,7 +108,7 @@ main(int argc, char **argv) LOG_ERROR("Failed to create container property"); // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop, comm); if (cont_id <= 0) LOG_ERROR("Failed to create container"); @@ -144,44 +144,44 @@ main(int argc, char **argv) PDCprop_set_obj_type(obj_prop_id22, PDC_INT); #ifdef ENABLE_MPI - 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); diff --git a/src/tests/misc/idioms_ci_test.c b/src/tests/misc/idioms_ci_test.c index 1826d3f7c..906f9f19d 100644 --- a/src/tests/misc/idioms_ci_test.c +++ b/src/tests/misc/idioms_ci_test.c @@ -328,6 +328,9 @@ main(int argc, char *argv[]) MPI_Init(&argc, &argv); MPI_Comm_size(MPI_COMM_WORLD, &world_size); MPI_Comm_rank(MPI_COMM_WORLD, &world_rank); +#else + world_size = 1; + world_rank = 0; #endif int rank = world_rank; diff --git a/src/tests/misc/llsm_idioms_bench.c b/src/tests/misc/llsm_idioms_bench.c index 8fb8dff18..86a6d6d50 100644 --- a/src/tests/misc/llsm_idioms_bench.c +++ b/src/tests/misc/llsm_idioms_bench.c @@ -370,8 +370,8 @@ perform_search(int is_using_dart, int query_type, int comm_type, int iter_round) ret_value = (comm_type == 0) ? PDC_Client_search_obj_ref_through_dart(DART_HASH, query_string, REF_PRIMARY_ID, &nres, &pdc_ids) - : PDC_Client_search_obj_ref_through_dart_mpi(DART_HASH, query_string, REF_PRIMARY_ID, - &nres, &pdc_ids, MPI_COMM_WORLD); + : PDC_Client_search_obj_ref_through_dart_coll(DART_HASH, query_string, REF_PRIMARY_ID, + &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_search_obj_ref_through_dart(DART_HASH, query_string, REF_PRIMARY_ID, &nres, &pdc_ids); @@ -383,7 +383,7 @@ perform_search(int is_using_dart, int query_type, int comm_type, int iter_round) #ifdef ENABLE_MPI ret_value = (comm_type == 0) ? PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) - : PDC_Client_query_kvtag_mpi(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); + : PDC_Client_query_kvtag_coll(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids); #endif diff --git a/src/tests/misc/producer_waitall.c b/src/tests/misc/producer_waitall.c index 6315bc4f9..7b99bd4b0 100644 --- a/src/tests/misc/producer_waitall.c +++ b/src/tests/misc/producer_waitall.c @@ -155,7 +155,11 @@ main(int argc, char **argv) LOG_ERROR("Failed to create container property"); } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); +#ifdef ENABLE_MPI + cont_id = PDCcont_create_coll("c1", cont_prop, mpi_comm); +#else + cont_id = PDCcont_create("c1", cont_prop); +#endif if (cont_id <= 0) { LOG_ERROR("Failed to create container"); } diff --git a/src/tests/misc/read_write_col_perf.c b/src/tests/misc/read_write_col_perf.c index cec102f72..bcce2786e 100644 --- a/src/tests/misc/read_write_col_perf.c +++ b/src/tests/misc/read_write_col_perf.c @@ -175,7 +175,7 @@ main(int argc, char **argv) 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 @@ -194,17 +194,25 @@ main(int argc, char **argv) ret_value = 1; } +#ifdef ENABLE_MPI start = MPI_Wtime(); - ret = PDCregion_transfer_start(transfer_request); +#endif + ret = PDCregion_transfer_start(transfer_request); +#ifdef ENABLE_MPI write_reg_transfer_start_time += MPI_Wtime() - start; +#endif if (ret != SUCCEED) { LOG_INFO("PDCregion_transfer_start failed"); ret_value = 1; } +#ifdef ENABLE_MPI start = MPI_Wtime(); - ret = PDCregion_transfer_wait(transfer_request); +#endif + ret = PDCregion_transfer_wait(transfer_request); +#ifdef ENABLE_MPI write_reg_transfer_wait_time += MPI_Wtime() - start; +#endif if (ret != SUCCEED) { LOG_INFO("PDCregion_transfer_wait failed"); ret_value = 1; @@ -254,18 +262,26 @@ main(int argc, char **argv) ret_value = 1; } +#ifdef ENABLE_MPI start = MPI_Wtime(); - ret = PDCregion_transfer_start(transfer_request); +#endif + ret = PDCregion_transfer_start(transfer_request); +#ifdef ENABLE_MPI read_reg_transfer_start_time += MPI_Wtime() - start; +#endif if (ret != SUCCEED) { LOG_ERROR("PDCregion_transfer_start failed"); exit(-1); } +#ifdef ENABLE_MPI start = MPI_Wtime(); - ret = PDCregion_transfer_wait(transfer_request); +#endif + ret = PDCregion_transfer_wait(transfer_request); +#ifdef ENABLE_MPI read_reg_transfer_wait_time += MPI_Wtime() - start; +#endif if (ret != SUCCEED) { LOG_ERROR("PDCregion_transfer_wait failed"); diff --git a/src/tests/misc/read_write_perf.c b/src/tests/misc/read_write_perf.c index 152140d5f..b9bd33f5c 100644 --- a/src/tests/misc/read_write_perf.c +++ b/src/tests/misc/read_write_perf.c @@ -183,18 +183,26 @@ main(int argc, char **argv) ret_value = 1; } +#ifdef ENABLE_MPI start = MPI_Wtime(); - ret = PDCregion_transfer_start(transfer_request); +#endif + ret = PDCregion_transfer_start(transfer_request); +#ifdef ENABLE_MPI write_reg_transfer_start_time += MPI_Wtime() - start; +#endif if (ret != SUCCEED) { LOG_ERROR("PDCregion_transfer_start failed"); ret_value = 1; } +#ifdef ENABLE_MPI start = MPI_Wtime(); - ret = PDCregion_transfer_wait(transfer_request); +#endif + ret = PDCregion_transfer_wait(transfer_request); +#ifdef ENABLE_MPI write_reg_transfer_wait_time += MPI_Wtime() - start; +#endif if (ret != SUCCEED) { LOG_ERROR("PDCregion_transfer_wait failed"); @@ -246,18 +254,26 @@ main(int argc, char **argv) ret_value = 1; } +#ifdef ENABLE_MPI start = MPI_Wtime(); - ret = PDCregion_transfer_start(transfer_request); +#endif + ret = PDCregion_transfer_start(transfer_request); +#ifdef ENABLE_MPI read_reg_transfer_start_time += MPI_Wtime() - start; +#endif if (ret != SUCCEED) { LOG_INFO("PDCregion_transfer_start failed"); exit(-1); } +#ifdef ENABLE_MPI start = MPI_Wtime(); - ret = PDCregion_transfer_wait(transfer_request); +#endif + ret = PDCregion_transfer_wait(transfer_request); +#ifdef ENABLE_MPI read_reg_transfer_wait_time += MPI_Wtime() - start; +#endif if (ret != SUCCEED) { LOG_ERROR("PDCregion_transfer_wait failed"); diff --git a/src/tests/misc/vpicio.c b/src/tests/misc/vpicio.c index 130cdc8bf..6fac3e291 100644 --- a/src/tests/misc/vpicio.c +++ b/src/tests/misc/vpicio.c @@ -114,8 +114,8 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc_id)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont_id = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont_id = PDCcont_create_coll("c1", cont_prop, comm)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); // create an object property TASSERT((obj_prop_xx = PDCprop_create(PDC_OBJ_CREATE, pdc_id)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); @@ -227,25 +227,43 @@ main(int argc, char **argv) #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); t0 = MPI_Wtime(); + TASSERT((obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_xx, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_yy, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_zz, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_id11, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + TASSERT((obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_id22, 0, comm)) != 0, + "Call to PDCobj_create_coll succeeded", "Call to PDCobj_create_coll failed"); + MPI_Barrier(MPI_COMM_WORLD); + t0 = MPI_Wtime(); +#else + TASSERT((obj_xx = PDCobj_create(cont_id, "obj-var-xx", obj_prop_xx)) != 0, + "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); + TASSERT((obj_yy = PDCobj_create(cont_id, "obj-var-yy", obj_prop_yy)) != 0, + "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); + TASSERT((obj_zz = PDCobj_create(cont_id, "obj-var-zz", obj_prop_zz)) != 0, + "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); + TASSERT((obj_pxx = PDCobj_create(cont_id, "obj-var-pxx", obj_prop_pxx)) != 0, + "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); + TASSERT((obj_pyy = PDCobj_create(cont_id, "obj-var-pyy", obj_prop_pyy)) != 0, + "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); + TASSERT((obj_pzz = PDCobj_create(cont_id, "obj-var-pzz", obj_prop_pzz)) != 0, + "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); + TASSERT((obj_id11 = PDCobj_create(cont_id, "id11", obj_prop_id11)) != 0, + "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); + TASSERT((obj_id22 = PDCobj_create(cont_id, "id22", obj_prop_id22)) != 0, + "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); #endif - TASSERT((obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_xx, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_yy, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_zz, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_pxx, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_pyy, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_pzz, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_id11, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - TASSERT((obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_id22, 0, comm)) != 0, - "Call to PDCobj_create_mpi succeeded", "Call to PDCobj_create_mpi failed"); - #ifdef ENABLE_MPI MPI_Barrier(MPI_COMM_WORLD); t1 = MPI_Wtime(); diff --git a/src/tests/misc/vpicio_mts.c b/src/tests/misc/vpicio_mts.c index dff272985..07bbf799d 100644 --- a/src/tests/misc/vpicio_mts.c +++ b/src/tests/misc/vpicio_mts.c @@ -112,7 +112,7 @@ main(int argc, char **argv) return FAIL; } // create a container - cont_id = PDCcont_create_col("c1", cont_prop); + cont_id = PDCcont_create_coll("c1", cont_prop, comm); if (cont_id <= 0) { LOG_ERROR("Failed to create container"); return FAIL; @@ -161,44 +161,59 @@ main(int argc, char **argv) PDCprop_set_obj_time_step(obj_prop_float, iter); PDCprop_set_obj_time_step(obj_prop_int, iter); - obj_xx = PDCobj_create_mpi(cont_id, "obj-var-xx", obj_prop_float, 0, comm); +#ifdef ENABLE_MPI + obj_xx = PDCobj_create_coll(cont_id, "obj-var-xx", obj_prop_float, 0, comm); + obj_yy = PDCobj_create_coll(cont_id, "obj-var-yy", obj_prop_float, 0, comm); + obj_zz = PDCobj_create_coll(cont_id, "obj-var-zz", obj_prop_float, 0, comm); + + obj_pxx = PDCobj_create_coll(cont_id, "obj-var-pxx", obj_prop_float, 0, comm); + obj_pyy = PDCobj_create_coll(cont_id, "obj-var-pyy", obj_prop_float, 0, comm); + obj_pzz = PDCobj_create_coll(cont_id, "obj-var-pzz", obj_prop_float, 0, comm); + + obj_id11 = PDCobj_create_coll(cont_id, "id11", obj_prop_int, 0, comm); + obj_id22 = PDCobj_create_coll(cont_id, "id22", obj_prop_int, 0, comm); +#else + obj_xx = PDCobj_create(cont_id, "obj-var-xx", obj_prop_float); + obj_yy = PDCobj_create(cont_id, "obj-var-yy", obj_prop_float); + obj_zz = PDCobj_create(cont_id, "obj-var-zz", obj_prop_float); + + obj_pxx = PDCobj_create(cont_id, "obj-var-pxx", obj_prop_float); + obj_pyy = PDCobj_create(cont_id, "obj-var-pyy", obj_prop_float); + obj_pzz = PDCobj_create(cont_id, "obj-var-pzz", obj_prop_float); + + obj_id11 = PDCobj_create(cont_id, "id11", obj_prop_int); + obj_id22 = PDCobj_create(cont_id, "id22", obj_prop_int); +#endif + + // Check all objects if (obj_xx == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "x"); return FAIL; } - - obj_yy = PDCobj_create_mpi(cont_id, "obj-var-yy", obj_prop_float, 0, comm); if (obj_yy == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "y"); return FAIL; } - obj_zz = PDCobj_create_mpi(cont_id, "obj-var-zz", obj_prop_float, 0, comm); if (obj_zz == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "z"); return FAIL; } - obj_pxx = PDCobj_create_mpi(cont_id, "obj-var-pxx", obj_prop_float, 0, comm); if (obj_pxx == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "px"); return FAIL; } - obj_pyy = PDCobj_create_mpi(cont_id, "obj-var-pyy", obj_prop_float, 0, comm); if (obj_pyy == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "py"); return FAIL; } - obj_pzz = PDCobj_create_mpi(cont_id, "obj-var-pzz", obj_prop_float, 0, comm); if (obj_pzz == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "pz"); return FAIL; } - - obj_id11 = PDCobj_create_mpi(cont_id, "id11", obj_prop_int, 0, comm); if (obj_id11 == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "id1"); return FAIL; } - obj_id22 = PDCobj_create_mpi(cont_id, "id22", obj_prop_int, 0, comm); if (obj_id22 == 0) { LOG_ERROR("Error getting an object id of %s from server\n", "id2"); return FAIL; @@ -270,7 +285,7 @@ main(int argc, char **argv) #endif #ifdef ENABLE_MPI - if (PDCregion_transfer_start_all_mpi(transfer_requests, 8, MPI_COMM_WORLD) != SUCCEED) { + if (PDCregion_transfer_start_all_coll(transfer_requests, 8, MPI_COMM_WORLD) != SUCCEED) { #else if (PDCregion_transfer_start_all(transfer_requests, 8) != SUCCEED) { #endif diff --git a/src/tests/obj/create_obj_coll.c b/src/tests/obj/create_obj_coll.c index cdcf8cbb4..32117a7cb 100644 --- a/src/tests/obj/create_obj_coll.c +++ b/src/tests/obj/create_obj_coll.c @@ -58,7 +58,7 @@ main(int argc, char **argv) // create first object sprintf(obj_name1, "o1"); #ifdef ENABLE_MPI - TASSERT((obj1 = PDCobj_create_mpi(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD)) != 0, + TASSERT((obj1 = PDCobj_create_coll(cont, obj_name1, obj_prop, 0, MPI_COMM_WORLD)) != 0, "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); #else TASSERT((obj1 = PDCobj_create(cont, obj_name1, obj_prop)) != 0, "Call to PDCobj_create succeeded", @@ -68,7 +68,7 @@ main(int argc, char **argv) // create second object sprintf(obj_name2, "o2"); #ifdef ENABLE_MPI - TASSERT((obj2 = PDCobj_create_mpi(cont, obj_name2, obj_prop, 0, MPI_COMM_WORLD)) != 0, + TASSERT((obj2 = PDCobj_create_coll(cont, obj_name2, obj_prop, 0, MPI_COMM_WORLD)) != 0, "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); #else TASSERT((obj2 = PDCobj_create(cont, obj_name2, obj_prop)) != 0, "Call to PDCobj_create succeeded", diff --git a/src/tests/obj/create_obj_scale.c b/src/tests/obj/create_obj_scale.c index 131d84a94..d296d44de 100644 --- a/src/tests/obj/create_obj_scale.c +++ b/src/tests/obj/create_obj_scale.c @@ -123,8 +123,8 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll("c1", cont_prop, MPI_COMM_WORLD)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); char *cont_tags = "cont_tags0=123"; if (rank == 0) { diff --git a/src/tests/obj/obj_life.c b/src/tests/obj/obj_life.c index b2b4e125a..8106835c5 100644 --- a/src/tests/obj/obj_life.c +++ b/src/tests/obj/obj_life.c @@ -46,8 +46,13 @@ main(int argc, char **argv) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); +#ifdef ENABLE_MPI + TASSERT((cont = PDCcont_create_coll("c1", cont_prop, MPI_COMM_WORLD)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); +#else + TASSERT((cont = PDCcont_create("c1", cont_prop)) != 0, "Call to PDCcont_create succeeded", + "Call to PDCcont_create failed"); +#endif // close a container TASSERT(PDCcont_close(cont) >= 0, "Call to PDCcont_close succeeded", "Call to PDCcont_close failed"); // close a container property diff --git a/src/tests/obj/obj_round_robin_io.c b/src/tests/obj/obj_round_robin_io.c index b6836fd98..e22e49286 100644 --- a/src/tests/obj/obj_round_robin_io.c +++ b/src/tests/obj/obj_round_robin_io.c @@ -122,8 +122,13 @@ main(int argc, char **argv) "Call to PDCprop_create failed"); // create a container sprintf(cont_name, "c"); - TASSERT((cont = PDCcont_create_col(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); +#ifdef ENABLE_MPI + TASSERT((cont = PDCcont_create_coll(cont_name, cont_prop, MPI_COMM_WORLD)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); +#else + TASSERT((cont = PDCcont_create(cont_name, cont_prop)) != 0, "Call to PDCcont_create succeeded", + "Call to PDCcont_create failed"); +#endif // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); diff --git a/src/tests/obj/obj_round_robin_io_all.c b/src/tests/obj/obj_round_robin_io_all.c index 418f685aa..c17c01b37 100644 --- a/src/tests/obj/obj_round_robin_io_all.c +++ b/src/tests/obj/obj_round_robin_io_all.c @@ -127,8 +127,13 @@ main(int argc, char **argv) "Call to PDCprop_create failed"); // create a container sprintf(cont_name, "c"); - TASSERT((cont = PDCcont_create_col(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); +#ifdef ENABLE_MPI + TASSERT((cont = PDCcont_create_coll(cont_name, cont_prop, MPI_COMM_WORLD)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); +#else + TASSERT((cont = PDCcont_create(cont_name, cont_prop)) != 0, "Call to PDCcont_create succeeded", + "Call to PDCcont_create failed"); +#endif // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); diff --git a/src/tests/obj/open_obj_round_robin.c b/src/tests/obj/open_obj_round_robin.c index 3a13d8d16..bc1f07dc1 100644 --- a/src/tests/obj/open_obj_round_robin.c +++ b/src/tests/obj/open_obj_round_robin.c @@ -64,7 +64,7 @@ main(int argc, char **argv) } // create a container sprintf(cont_name, "c"); - cont = PDCcont_create_col(cont_name, cont_prop); + cont = PDCcont_create_coll(cont_name, cont_prop, MPI_COMM_WORLD); // cont = PDCcont_create(cont_name, cont_prop); if (cont > 0) { LOG_INFO("Rank %d Create a container %s\n", rank, cont_name); diff --git a/src/tests/obj/read_obj.c b/src/tests/obj/read_obj.c index 1e751c29a..c035fe7f7 100644 --- a/src/tests/obj/read_obj.c +++ b/src/tests/obj/read_obj.c @@ -117,8 +117,8 @@ main(int argc, char **argv) "Call to PDCprop_create failed"); // create a container sprintf(cont_name, "c%d", rank); - TASSERT((cont = PDCcont_create_col(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll(cont_name, cont_prop, comm)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); @@ -143,7 +143,7 @@ main(int argc, char **argv) // Create a object #ifdef ENABLE_MPI - global_obj = PDCobj_create_mpi(cont, obj_name, obj_prop, 0, comm); + global_obj = PDCobj_create_coll(cont, obj_name, obj_prop, 0, comm); #else global_obj = PDCobj_create(cont, obj_name, obj_prop); #endif diff --git a/src/tests/obj/read_obj_shared.c b/src/tests/obj/read_obj_shared.c index f617e12f9..45a58584f 100644 --- a/src/tests/obj/read_obj_shared.c +++ b/src/tests/obj/read_obj_shared.c @@ -114,8 +114,8 @@ main(int argc, char **argv) // create a container /* sprintf(cont_name, "c%d", rank); */ sprintf(cont_name, "c"); - TASSERT((cont = PDCcont_create_col(cont_name, cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); + TASSERT((cont = PDCcont_create_coll(cont_name, cont_prop, comm)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); @@ -140,7 +140,7 @@ main(int argc, char **argv) // Create a object #ifdef ENABLE_MPI - TASSERT((global_obj = PDCobj_create_mpi(cont, obj_name, obj_prop, 0, comm)) != 0, + TASSERT((global_obj = PDCobj_create_coll(cont, obj_name, obj_prop, 0, comm)) != 0, "Call to PDCobj_create succeeded", "Call to PDCobj_create failed"); #else TASSERT((global_obj = PDCobj_create(cont, obj_name, obj_prop)) != 0, "Call to PDCobj_create succeeded", diff --git a/src/tests/obj/write_obj_shared.c b/src/tests/obj/write_obj_shared.c index bc2fb18da..bf533c6fe 100644 --- a/src/tests/obj/write_obj_shared.c +++ b/src/tests/obj/write_obj_shared.c @@ -148,7 +148,7 @@ main(int argc, char **argv) PDCprop_set_obj_tags(obj_prop, "tag0=1"); // Create a object - global_obj = PDCobj_create_mpi(cont, obj_name, obj_prop, 0, comm); + global_obj = PDCobj_create_coll(cont, obj_name, obj_prop, 0, comm); // global_obj = PDCobj_create(cont, obj_name, obj_prop); if (global_obj <= 0) { diff --git a/src/tests/tags/kvtag_affix_query_scale.c b/src/tests/tags/kvtag_affix_query_scale.c index c153650fb..755aa19a6 100644 --- a/src/tests/tags/kvtag_affix_query_scale.c +++ b/src/tests/tags/kvtag_affix_query_scale.c @@ -293,7 +293,7 @@ main(int argc, char *argv[]) ret_value = (comm_type == 0) ? PDC_Client_search_obj_ref_through_dart(hash_algo, query_string, ref_type, &nres, &pdc_ids) - : PDC_Client_search_obj_ref_through_dart_mpi( + : PDC_Client_search_obj_ref_through_dart_coll( hash_algo, query_string, ref_type, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_search_obj_ref_through_dart(hash_algo, query_string, ref_type, @@ -308,7 +308,7 @@ main(int argc, char *argv[]) #ifdef ENABLE_MPI ret_value = (comm_type == 0) ? PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) - : PDC_Client_query_kvtag_mpi(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); + : PDC_Client_query_kvtag_coll(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids); #endif diff --git a/src/tests/tags/kvtag_query.c b/src/tests/tags/kvtag_query.c index 8470d6f6d..c2d7f71ef 100644 --- a/src/tests/tags/kvtag_query.c +++ b/src/tests/tags/kvtag_query.c @@ -113,8 +113,13 @@ main(int argc, char *argv[]) TASSERT((cont_prop = PDCprop_create(PDC_CONT_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); // create a container - TASSERT((cont = PDCcont_create_col("c1", cont_prop)) != 0, "Call to PDCcont_create_col succeeded", - "Call to PDCcont_create_col failed"); +#ifdef ENABLE_MPI + TASSERT((cont = PDCcont_create_coll("c1", cont_prop, MPI_COMM_WORLD)) != 0, + "Call to PDCcont_create_coll succeeded", "Call to PDCcont_create_coll failed"); +#else + TASSERT((cont = PDCcont_create("c1", cont_prop)) != 0, "Call to PDCcont_create succeeded", + "Call to PDCcont_create failed"); +#endif // create an object property TASSERT((obj_prop = PDCprop_create(PDC_OBJ_CREATE, pdc)) != 0, "Call to PDCprop_create succeeded", "Call to PDCprop_create failed"); @@ -183,8 +188,8 @@ main(int argc, char *argv[]) sprintf(value, "%ld", v); sprintf(exact_query, "%s=%s", kvtag.name, value); #ifdef ENABLE_MPI - if (PDC_Client_search_obj_ref_through_dart_mpi(hash_algo, exact_query, ref_type, &nres, &pdc_ids, - MPI_COMM_WORLD) < 0) { + if (PDC_Client_search_obj_ref_through_dart_coll(hash_algo, exact_query, ref_type, &nres, &pdc_ids, + MPI_COMM_WORLD) < 0) { #else if (PDC_Client_search_obj_ref_through_dart(hash_algo, exact_query, ref_type, &nres, &pdc_ids) < 0) { @@ -195,7 +200,7 @@ main(int argc, char *argv[]) } else { #ifdef ENABLE_MPI - if (PDC_Client_query_kvtag_mpi(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD) < 0) { + if (PDC_Client_query_kvtag_coll(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD) < 0) { #else if (PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) < 0) { #endif diff --git a/src/tests/tags/kvtag_range_query_scale.c b/src/tests/tags/kvtag_range_query_scale.c index da9cec14d..cee0fa6d8 100644 --- a/src/tests/tags/kvtag_range_query_scale.c +++ b/src/tests/tags/kvtag_range_query_scale.c @@ -306,7 +306,7 @@ main(int argc, char *argv[]) ret_value = (comm_type == 0) ? PDC_Client_search_obj_ref_through_dart(hash_algo, query_string, ref_type, &nres, &pdc_ids) - : PDC_Client_search_obj_ref_through_dart_mpi( + : PDC_Client_search_obj_ref_through_dart_coll( hash_algo, query_string, ref_type, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_search_obj_ref_through_dart(hash_algo, query_string, ref_type, @@ -319,7 +319,7 @@ main(int argc, char *argv[]) #ifdef ENABLE_MPI ret_value = (comm_type == 0) ? PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids) - : PDC_Client_query_kvtag_mpi(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); + : PDC_Client_query_kvtag_coll(&kvtag, &nres, &pdc_ids, MPI_COMM_WORLD); #else ret_value = PDC_Client_query_kvtag(&kvtag, &nres, &pdc_ids); #endif diff --git a/src/tools/pdc_access_eqsim.c b/src/tools/pdc_access_eqsim.c index 902a46fce..75f8dbef7 100644 --- a/src/tools/pdc_access_eqsim.c +++ b/src/tools/pdc_access_eqsim.c @@ -47,7 +47,7 @@ main(int argc, char **argv) pdc = PDCinit("pdc"); - obj = PDCobj_open_col("run1", pdc); + obj = PDCobj_open_coll("run1", pdc, MPI_COMM_WORLD); if (obj <= 0) LOG_ERROR("Failed to open object"); diff --git a/src/tools/pdc_export.c b/src/tools/pdc_export.c index bbe5039b4..2f65b5444 100644 --- a/src/tools/pdc_export.c +++ b/src/tools/pdc_export.c @@ -9,8 +9,6 @@ #include "hdf5.h" #include "pdc_generic.h" -// #define ENABLE_MPI 1 - #ifdef ENABLE_MPI #include "mpi.h" #endif diff --git a/src/tools/pdc_import.c b/src/tools/pdc_import.c index 25488baad..c47cf5d8a 100644 --- a/src/tools/pdc_import.c +++ b/src/tools/pdc_import.c @@ -4,16 +4,12 @@ #include #include -// #define ENABLE_MPI 1 - #ifdef ENABLE_MPI #include "mpi.h" #endif #include "hdf5.h" #include "pdc.h" -// #include "pdc_client_server_common.h" -// #include "pdc_client_connect.h" #define MAX_NAME 1024 #define MAX_FILES 2500 diff --git a/src/tools/pdc_import_eqsim.c b/src/tools/pdc_import_eqsim.c index a2ddae19c..e612f50ef 100644 --- a/src/tools/pdc_import_eqsim.c +++ b/src/tools/pdc_import_eqsim.c @@ -146,7 +146,7 @@ main(int argc, char **argv) PDCprop_set_obj_app_name(obj_prop, "EQSIM"); PDCprop_set_obj_transfer_region_type(obj_prop, PDC_REGION_LOCAL); - obj = PDCobj_create_mpi(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); + obj = PDCobj_create_coll(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); if (obj <= 0) LOG_ERROR("Failed to create object"); diff --git a/src/tools/pdc_query_eqsim.c b/src/tools/pdc_query_eqsim.c index 233249255..ee442c0ff 100644 --- a/src/tools/pdc_query_eqsim.c +++ b/src/tools/pdc_query_eqsim.c @@ -139,7 +139,7 @@ main(int argc, char **argv) PDCprop_set_obj_app_name(obj_prop, "EQSIM"); /* PDCprop_set_obj_transfer_region_type(obj_prop, PDC_REGION_LOCAL); */ - obj = PDCobj_create_mpi(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); + obj = PDCobj_create_coll(cont, "run1", obj_prop, 0, MPI_COMM_WORLD); /* obj = PDCobj_create(cont, "run1", obj_prop); */ if (obj <= 0) LOG_ERROR("Failed to create object\n");