ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

MCA/COMMON/UCX: minor optimization of build scripts

Просмотр исходного кода 
Signed-off-by: Sergey Oblomov <sergeyo@mellanox.com>
Этот коммит содержится в:
Sergey Oblomov 2018-06-28 12:58:07 +03:00
родитель de8568c822
Коммит 624d59604b
2 изменённых файлов: 6 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
config/ompi_check_ucx.m4
Просмотреть файл

@ -108,17 +108,8 @@ AC_DEFUN([OMPI_CHECK_UCX],[
[AC_DEFINE([HAVE_UCP_TAG_SEND_NBR],[1], [AC_DEFINE([HAVE_UCP_TAG_SEND_NBR],[1],
[have ucp_tag_send_nbr()])], [], [have ucp_tag_send_nbr()])], [],
[#include <ucp/api/ucp.h>]) [#include <ucp/api/ucp.h>])
AC_CHECK_DECLS([ucp_ep_flush_nb], AC_CHECK_DECLS([ucp_ep_flush_nb, ucp_worker_flush_nb, ucp_request_check_status],
[AC_DEFINE([HAVE_UCP_EP_FLUSH_NB],[1], [], [],
[have ucp_ep_flush_nb()])], [],
[#include <ucp/api/ucp.h>])
AC_CHECK_DECLS([ucp_worker_flush_nb],
[AC_DEFINE([HAVE_UCP_WORKER_FLUSH_NB],[1],
[have ucp_worker_flush_nb()])], [],
[#include <ucp/api/ucp.h>])
AC_CHECK_DECLS([ucp_request_check_status],
[AC_DEFINE([HAVE_UCP_REQUEST_CHECK_STATUS],[1],
[have ucp_request_check_status()])], [],
[#include <ucp/api/ucp.h>]) [#include <ucp/api/ucp.h>])
CPPFLAGS=$old_CPPFLAGS CPPFLAGS=$old_CPPFLAGS

8
opal/mca/common/ucx/common_ucx.h
Просмотреть файл

@ -33,7 +33,7 @@ ucs_status_t opal_common_ucx_wait_request(ucs_status_ptr_t request, ucp_worker_h
{ {
ucs_status_t status; ucs_status_t status;
int i; int i;
#ifndef HAVE_UCP_REQUEST_CHECK_STATUS #if !HAVE_DECL_UCP_REQUEST_CHECK_STATUS
ucp_tag_recv_info_t info; ucp_tag_recv_info_t info;
#endif #endif
@ -48,7 +48,7 @@ ucs_status_t opal_common_ucx_wait_request(ucs_status_ptr_t request, ucp_worker_h
/* call UCX progress */ /* call UCX progress */
for (i = 0; i < opal_common_ucx_progress_iterations; i++) { for (i = 0; i < opal_common_ucx_progress_iterations; i++) {
if (UCS_INPROGRESS != (status = if (UCS_INPROGRESS != (status =
#if HAVE_UCP_REQUEST_CHECK_STATUS #if HAVE_DECL_UCP_REQUEST_CHECK_STATUS
ucp_request_check_status(request) ucp_request_check_status(request)
#else #else
ucp_request_test(request, &info) ucp_request_test(request, &info)
@ -68,7 +68,7 @@ ucs_status_t opal_common_ucx_wait_request(ucs_status_ptr_t request, ucp_worker_h
static inline static inline
ucs_status_t opal_common_ucx_ep_flush(ucp_ep_h ep, ucp_worker_h worker) ucs_status_t opal_common_ucx_ep_flush(ucp_ep_h ep, ucp_worker_h worker)
{ {
#if HAVE_UCP_EP_FLUSH_NB #if HAVE_DECL_UCP_EP_FLUSH_NB
ucs_status_ptr_t status; ucs_status_ptr_t status;
status = ucp_ep_flush_nb(ep, 0, opal_common_ucx_empty_complete_cb); status = ucp_ep_flush_nb(ep, 0, opal_common_ucx_empty_complete_cb);
@ -81,7 +81,7 @@ ucs_status_t opal_common_ucx_ep_flush(ucp_ep_h ep, ucp_worker_h worker)
static inline static inline
ucs_status_t opal_common_ucx_worker_flush(ucp_worker_h worker) ucs_status_t opal_common_ucx_worker_flush(ucp_worker_h worker)
{ {
#if HAVE_UCP_WORKER_FLUSH_NB #if HAVE_DECL_UCP_WORKER_FLUSH_NB
ucs_status_ptr_t status; ucs_status_ptr_t status;
status = ucp_worker_flush_nb(worker, 0, opal_common_ucx_empty_complete_cb); status = ucp_worker_flush_nb(worker, 0, opal_common_ucx_empty_complete_cb);