From d4843b165172a9cffbdc967ec92ec1d60d053903 Mon Sep 17 00:00:00 2001 From: Mikhail Brinskii Date: Tue, 30 Apr 2019 16:49:11 +0300 Subject: [PATCH] SPML/UCS: CR comments p2 Signed-off-by: Mikhail Brinskii --- oshmem/include/shmemx.h | 4 ++-- oshmem/mca/spml/spml.h | 2 +- oshmem/mca/spml/ucx/spml_ucx.c | 4 ++-- oshmem/mca/spml/ucx/spml_ucx_component.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oshmem/include/shmemx.h b/oshmem/include/shmemx.h index 18e6edb7ae..d99ca11533 100644 --- a/oshmem/include/shmemx.h +++ b/oshmem/include/shmemx.h @@ -169,10 +169,10 @@ OSHMEM_DECLSPEC void shmemx_int32_prod_to_all(int32_t *target, const int32_t *so OSHMEM_DECLSPEC void shmemx_int64_prod_to_all(int64_t *target, const int64_t *source, int nreduce, int PE_start, int logPE_stride, int PE_size, int64_t *pWrk, long *pSync); /* shmemx_alltoall_global_nb is a nonblocking collective routine, where each PE - * exchanges “size” bytes of data with all other PEs in the OpenSHMEM job. + * exchanges “size” bytes of data with all other PEs in the OpenSHMEM job. * @param dest A symmetric data object that is large enough to receive - * “size” bytes of data. + * “size” bytes of data from each PE in the OpenSHMEM job. * @param source A symmetric data object that contains “size” bytes of data * for each PE in the OpenSHMEM job. * @param size The number of bytes to be sent to each PE in the job. diff --git a/oshmem/mca/spml/spml.h b/oshmem/mca/spml/spml.h index b4a3024ecf..ca62b5f0bd 100644 --- a/oshmem/mca/spml/spml.h +++ b/oshmem/mca/spml/spml.h @@ -329,7 +329,7 @@ typedef int (*mca_spml_base_module_send_fn_t)(void *buf, * shmemx_alltoall_global calls. * * @param dest A symmetric data object that is large enough to receive - * “size” bytes of data. + * “size” bytes of data from each PE in the OpenSHMEM job. * @param source A symmetric data object that contains “size” bytes of data * for each PE in the OpenSHMEM job. * @param size The number of bytes to be sent to each PE in the job. diff --git a/oshmem/mca/spml/ucx/spml_ucx.c b/oshmem/mca/spml/ucx/spml_ucx.c index 1a7eff3291..fbc30d4e9f 100644 --- a/oshmem/mca/spml/ucx/spml_ucx.c +++ b/oshmem/mca/spml/ucx/spml_ucx.c @@ -840,14 +840,14 @@ static int mca_spml_ucx_create_aux_ctx(void) if (rand_dci_supp) { pthread_mutex_lock(&mca_spml_ucx.ctx_create_mutex); - opal_setenv("UCX_DC_MLX5_TX_POLICY", "rand", 1, &environ); + opal_setenv("UCX_DC_MLX5_TX_POLICY", "rand", 0, &environ); } rc = mca_spml_ucx_ctx_create_common(SHMEM_CTX_PRIVATE, &mca_spml_ucx.aux_ctx); if (rand_dci_supp) { - pthread_mutex_unlock(&mca_spml_ucx.ctx_create_mutex); opal_unsetenv("UCX_DC_MLX5_TX_POLICY", &environ); + pthread_mutex_unlock(&mca_spml_ucx.ctx_create_mutex); } return rc; diff --git a/oshmem/mca/spml/ucx/spml_ucx_component.c b/oshmem/mca/spml/ucx/spml_ucx_component.c index 995db7ea56..273c41a09c 100644 --- a/oshmem/mca/spml/ucx/spml_ucx_component.c +++ b/oshmem/mca/spml/ucx/spml_ucx_component.c @@ -176,7 +176,7 @@ void mca_spml_ucx_async_cb(int fd, short event, void *cbdata) do { count = ucp_worker_progress(mca_spml_ucx.aux_ctx->ucp_worker); - } while(count); + } while (count); pthread_spin_unlock(&mca_spml_ucx.async_lock); }