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

Cleanup interface that handles events. No functional changes

Просмотр исходного кода
Этот коммит содержится в:
Rolf vandeVaart 2015-04-28 15:15:13 -04:00
родитель 7fd54dcda1
Коммит b260dc4228
4 изменённых файлов: 13 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
opal/mca/common/cuda/common_cuda.c
Просмотреть файл

@ -1155,7 +1155,7 @@ int cuda_closememhandle(void *reg_data, mca_mpool_base_registration_t *reg)
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }
void mca_common_cuda_construct_event_and_handle(uint64_t **event, void **handle) void mca_common_cuda_construct_event_and_handle(uintptr_t *event, void *handle)
{ {
CUresult result; CUresult result;
@ -1175,7 +1175,7 @@ void mca_common_cuda_construct_event_and_handle(uint64_t **event, void **handle)
} }
void mca_common_cuda_destruct_event(uint64_t *event) void mca_common_cuda_destruct_event(uintptr_t event)
{ {
CUresult result; CUresult result;

6
opal/mca/common/cuda/common_cuda.h
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2006 The Regents of the University of California. * Copyright (c) 2004-2006 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2011 NVIDIA Corporation. All rights reserved. * Copyright (c) 2011-2015 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -72,8 +72,8 @@ OPAL_DECLSPEC int progress_one_cuda_htod_event(struct mca_btl_base_descriptor_t
OPAL_DECLSPEC int mca_common_cuda_memhandle_matches(mca_mpool_common_cuda_reg_t *new_reg, OPAL_DECLSPEC int mca_common_cuda_memhandle_matches(mca_mpool_common_cuda_reg_t *new_reg,
mca_mpool_common_cuda_reg_t *old_reg); mca_mpool_common_cuda_reg_t *old_reg);
OPAL_DECLSPEC void mca_common_cuda_construct_event_and_handle(uint64_t **event, void **handle); OPAL_DECLSPEC void mca_common_cuda_construct_event_and_handle(uintptr_t *event, void *handle);
OPAL_DECLSPEC void mca_common_cuda_destruct_event(uint64_t *event); OPAL_DECLSPEC void mca_common_cuda_destruct_event(uintptr_t event);
OPAL_DECLSPEC int cuda_getmemhandle(void *base, size_t, mca_mpool_base_registration_t *newreg, OPAL_DECLSPEC int cuda_getmemhandle(void *base, size_t, mca_mpool_base_registration_t *newreg,
mca_mpool_base_registration_t *hdrreg); mca_mpool_base_registration_t *hdrreg);

8
opal/mca/mpool/gpusm/mpool_gpusm.h
Просмотреть файл

@ -11,7 +11,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2006 Voltaire. All rights reserved. * Copyright (c) 2006 Voltaire. All rights reserved.
* Copyright (c) 2012 NVIDIA Corporation. All rights reserved. * Copyright (c) 2012-2015 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* *
@ -37,9 +37,9 @@ BEGIN_C_DECLS
#define EVTHANDLE_SIZE 8 #define EVTHANDLE_SIZE 8
struct mca_mpool_gpusm_registration_t { struct mca_mpool_gpusm_registration_t {
mca_mpool_base_registration_t base; mca_mpool_base_registration_t base;
uint64_t memHandle[MEMHANDLE_SIZE]; uint64_t memHandle[MEMHANDLE_SIZE]; /* CUipcMemHandle */
uint64_t evtHandle[EVTHANDLE_SIZE]; uint64_t evtHandle[EVTHANDLE_SIZE]; /* CUipcEventHandle */
uint64_t event; uintptr_t event; /* CUevent */
}; };
typedef struct mca_mpool_gpusm_registration_t mca_mpool_gpusm_registration_t; typedef struct mca_mpool_gpusm_registration_t mca_mpool_gpusm_registration_t;
OPAL_DECLSPEC OBJ_CLASS_DECLARATION(mca_mpool_gpusm_registration_t); OPAL_DECLSPEC OBJ_CLASS_DECLARATION(mca_mpool_gpusm_registration_t);

8
opal/mca/mpool/gpusm/mpool_gpusm_module.c
Просмотреть файл

@ -14,7 +14,7 @@
* Copyright (c) 2006 Voltaire. All rights reserved. * Copyright (c) 2006 Voltaire. All rights reserved.
* Copyright (c) 2007 Mellanox Technologies. All rights reserved. * Copyright (c) 2007 Mellanox Technologies. All rights reserved.
* Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2010 IBM Corporation. All rights reserved.
* Copyright (c) 2012 NVIDIA Corporation. All rights reserved. * Copyright (c) 2012-2015 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* *
@ -48,8 +48,8 @@
*/ */
static void mca_mpool_gpusm_registration_constructor( mca_mpool_gpusm_registration_t *item ) static void mca_mpool_gpusm_registration_constructor( mca_mpool_gpusm_registration_t *item )
{ {
mca_common_cuda_construct_event_and_handle((uint64_t **)&item->event, mca_common_cuda_construct_event_and_handle(&item->event,
(void **)&item->evtHandle); (void *)&item->evtHandle);
} }
/** /**
@ -57,7 +57,7 @@ static void mca_mpool_gpusm_registration_constructor( mca_mpool_gpusm_registrati
*/ */
static void mca_mpool_gpusm_registration_destructor( mca_mpool_gpusm_registration_t *item ) static void mca_mpool_gpusm_registration_destructor( mca_mpool_gpusm_registration_t *item )
{ {
mca_common_cuda_destruct_event((uint64_t *)item->event); mca_common_cuda_destruct_event(item->event);
} }
OBJ_CLASS_INSTANCE(mca_mpool_gpusm_registration_t, mca_mpool_base_registration_t, OBJ_CLASS_INSTANCE(mca_mpool_gpusm_registration_t, mca_mpool_base_registration_t,