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

osc: do not cast way the const modifier when this is not necessary

Просмотр исходного кода 
update the osc framework and mpi c bindings
Этот коммит содержится в:
Gilles Gouaillardet 2015-08-28 13:07:20 +09:00
родитель 21b1e7f8c5
Коммит 21642a2407
13 изменённых файлов: 52 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
ompi/mca/osc/osc.h
Просмотреть файл

@ -203,7 +203,7 @@ typedef int (*ompi_osc_base_module_win_detach_fn_t)(struct ompi_win_t *win, cons
typedef int (*ompi_osc_base_module_free_fn_t)(struct ompi_win_t *win);
typedef int (*ompi_osc_base_module_put_fn_t)(void *origin_addr,
typedef int (*ompi_osc_base_module_put_fn_t)(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -223,7 +223,7 @@ typedef int (*ompi_osc_base_module_get_fn_t)(void *origin_addr,
struct ompi_win_t *win);
typedef int (*ompi_osc_base_module_accumulate_fn_t)(void *origin_addr,
typedef int (*ompi_osc_base_module_accumulate_fn_t)(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -262,7 +262,7 @@ typedef int (*ompi_osc_base_module_get_accumulate_fn_t)(const void *origin_addr,
struct ompi_op_t *op,
struct ompi_win_t *win);
typedef int (*ompi_osc_base_module_rput_fn_t)(void *origin_addr,
typedef int (*ompi_osc_base_module_rput_fn_t)(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -294,7 +294,7 @@ typedef int (*ompi_osc_base_module_raccumulate_fn_t)(const void *origin_addr,
struct ompi_win_t *win,
struct ompi_request_t **request);
typedef int (*ompi_osc_base_module_rget_accumulate_fn_t)(void *origin_addr,
typedef int (*ompi_osc_base_module_rget_accumulate_fn_t)(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_datatype,
void *result_addr,

8
ompi/mca/osc/portals4/osc_portals4.h
Просмотреть файл

@ -122,7 +122,7 @@ int ompi_osc_portals4_detach(struct ompi_win_t *win, const void *base);
int ompi_osc_portals4_free(struct ompi_win_t *win);
int ompi_osc_portals4_put(void *origin_addr,
int ompi_osc_portals4_put(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -140,7 +140,7 @@ int ompi_osc_portals4_get(void *origin_addr,
struct ompi_datatype_t *target_dt,
struct ompi_win_t *win);
int ompi_osc_portals4_accumulate(void *origin_addr,
int ompi_osc_portals4_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -179,7 +179,7 @@ int ompi_osc_portals4_get_accumulate(const void *origin_addr,
struct ompi_op_t *op,
struct ompi_win_t *win);
int ompi_osc_portals4_rput(void *origin_addr,
int ompi_osc_portals4_rput(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -210,7 +210,7 @@ int ompi_osc_portals4_raccumulate(const void *origin_addr,
struct ompi_win_t *win,
struct ompi_request_t **request);
int ompi_osc_portals4_rget_accumulate(void *origin_addr,
int ompi_osc_portals4_rget_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_datatype,
void *result_addr,

8
ompi/mca/osc/portals4/osc_portals4_comm.c
Просмотреть файл

@ -182,7 +182,7 @@ ompi_osc_portals4_get_dt(struct ompi_datatype_t *dt, ptl_datatype_t *ptl_dt)
int
ompi_osc_portals4_rput(void *origin_addr,
ompi_osc_portals4_rput(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -417,7 +417,7 @@ ompi_osc_portals4_raccumulate(const void *origin_addr,
int
ompi_osc_portals4_rget_accumulate(void *origin_addr,
ompi_osc_portals4_rget_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
void *result_addr,
@ -582,7 +582,7 @@ ompi_osc_portals4_rget_accumulate(void *origin_addr,
int
ompi_osc_portals4_put(void *origin_addr,
ompi_osc_portals4_put(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -694,7 +694,7 @@ ompi_osc_portals4_get(void *origin_addr,
int
ompi_osc_portals4_accumulate(void *origin_addr,
ompi_osc_portals4_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,

8
ompi/mca/osc/pt2pt/osc_pt2pt.h
Просмотреть файл

@ -252,7 +252,7 @@ int ompi_osc_pt2pt_detach(struct ompi_win_t *win, const void *base);
int ompi_osc_pt2pt_free(struct ompi_win_t *win);
int ompi_osc_pt2pt_put(void *origin_addr,
int ompi_osc_pt2pt_put(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -261,7 +261,7 @@ int ompi_osc_pt2pt_put(void *origin_addr,
struct ompi_datatype_t *target_dt,
struct ompi_win_t *win);
int ompi_osc_pt2pt_accumulate(void *origin_addr,
int ompi_osc_pt2pt_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -309,7 +309,7 @@ int ompi_osc_pt2pt_get_accumulate(const void *origin_addr,
struct ompi_op_t *op,
struct ompi_win_t *win);
int ompi_osc_pt2pt_rput(void *origin_addr,
int ompi_osc_pt2pt_rput(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -340,7 +340,7 @@ int ompi_osc_pt2pt_raccumulate(const void *origin_addr,
struct ompi_win_t *win,
struct ompi_request_t **request);
int ompi_osc_pt2pt_rget_accumulate(void *origin_addr,
int ompi_osc_pt2pt_rget_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_datatype,
void *result_addr,

14
ompi/mca/osc/pt2pt/osc_pt2pt_comm.c
Просмотреть файл

@ -82,7 +82,7 @@ static int ompi_osc_pt2pt_dt_send_complete (ompi_request_t *request)
}
/* self communication optimizations */
static inline int ompi_osc_pt2pt_put_self (void *source, int source_count, ompi_datatype_t *source_datatype,
static inline int ompi_osc_pt2pt_put_self (const void *source, int source_count, ompi_datatype_t *source_datatype,
OPAL_PTRDIFF_TYPE target_disp, int target_count, ompi_datatype_t *target_datatype,
ompi_osc_pt2pt_module_t *module, ompi_osc_pt2pt_request_t *request)
{
@ -103,7 +103,7 @@ static inline int ompi_osc_pt2pt_put_self (void *source, int source_count, ompi_
return OMPI_ERR_RMA_SYNC;
}
ret = ompi_datatype_sndrcv (source, source_count, source_datatype,
ret = ompi_datatype_sndrcv ((void *)source, source_count, source_datatype,
target, target_count, target_datatype);
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
return ret;
@ -286,7 +286,7 @@ static inline int ompi_osc_pt2pt_gacc_self (const void *source, int source_count
}
/* end: self communication optimizations */
static inline int ompi_osc_pt2pt_put_w_req (void *origin_addr, int origin_count,
static inline int ompi_osc_pt2pt_put_w_req (const void *origin_addr, int origin_count,
struct ompi_datatype_t *origin_dt,
int target, OPAL_PTRDIFF_TYPE target_disp,
int target_count, struct ompi_datatype_t *target_dt,
@ -450,7 +450,7 @@ static inline int ompi_osc_pt2pt_put_w_req (void *origin_addr, int origin_count,
}
int
ompi_osc_pt2pt_put(void *origin_addr, int origin_count,
ompi_osc_pt2pt_put(const void *origin_addr, int origin_count,
struct ompi_datatype_t *origin_dt,
int target, OPAL_PTRDIFF_TYPE target_disp,
int target_count,
@ -635,7 +635,7 @@ ompi_osc_pt2pt_accumulate_w_req (const void *origin_addr, int origin_count,
}
int
ompi_osc_pt2pt_accumulate(void *origin_addr, int origin_count,
ompi_osc_pt2pt_accumulate(const void *origin_addr, int origin_count,
struct ompi_datatype_t *origin_dt,
int target, OPAL_PTRDIFF_TYPE target_disp,
int target_count,
@ -746,7 +746,7 @@ int ompi_osc_pt2pt_fetch_and_op(const void *origin_addr, void *result_addr,
target, target_disp, 1, dt, op, win);
}
int ompi_osc_pt2pt_rput(void *origin_addr, int origin_count,
int ompi_osc_pt2pt_rput(const void *origin_addr, int origin_count,
struct ompi_datatype_t *origin_dt,
int target, OPAL_PTRDIFF_TYPE target_disp,
int target_count, struct ompi_datatype_t *target_dt,
@ -1205,7 +1205,7 @@ int ompi_osc_pt2pt_get_accumulate(const void *origin_addr, int origin_count,
}
int ompi_osc_pt2pt_rget_accumulate(void *origin_addr, int origin_count,
int ompi_osc_pt2pt_rget_accumulate(const void *origin_addr, int origin_count,
struct ompi_datatype_t *origin_dt,
void *result_addr, int result_count,
struct ompi_datatype_t *result_dt,

8
ompi/mca/osc/sm/osc_sm.h
Просмотреть файл

@ -91,7 +91,7 @@ int ompi_osc_sm_detach(struct ompi_win_t *win, const void *base);
int ompi_osc_sm_free(struct ompi_win_t *win);
int ompi_osc_sm_put(void *origin_addr,
int ompi_osc_sm_put(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -109,7 +109,7 @@ int ompi_osc_sm_get(void *origin_addr,
struct ompi_datatype_t *target_dt,
struct ompi_win_t *win);
int ompi_osc_sm_accumulate(void *origin_addr,
int ompi_osc_sm_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -148,7 +148,7 @@ int ompi_osc_sm_get_accumulate(const void *origin_addr,
struct ompi_op_t *op,
struct ompi_win_t *win);
int ompi_osc_sm_rput(void *origin_addr,
int ompi_osc_sm_rput(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -179,7 +179,7 @@ int ompi_osc_sm_raccumulate(const void *origin_addr,
struct ompi_win_t *win,
struct ompi_request_t **request);
int ompi_osc_sm_rget_accumulate(void *origin_addr,
int ompi_osc_sm_rget_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_datatype,
void *result_addr,

16
ompi/mca/osc/sm/osc_sm_comm.c
Просмотреть файл

@ -21,7 +21,7 @@
#include "osc_sm.h"
int
ompi_osc_sm_rput(void *origin_addr,
ompi_osc_sm_rput(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -45,7 +45,7 @@ ompi_osc_sm_rput(void *origin_addr,
remote_address = ((char*) (module->bases[target])) + module->disp_units[target] * target_disp;
ret = ompi_datatype_sndrcv(origin_addr, origin_count, origin_dt,
ret = ompi_datatype_sndrcv((void *)origin_addr, origin_count, origin_dt,
remote_address, target_count, target_dt);
if (OMPI_SUCCESS != ret) {
return ret;
@ -149,7 +149,7 @@ ompi_osc_sm_raccumulate(const void *origin_addr,
int
ompi_osc_sm_rget_accumulate(void *origin_addr,
ompi_osc_sm_rget_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
void *result_addr,
@ -185,7 +185,7 @@ ompi_osc_sm_rget_accumulate(void *origin_addr,
if (OMPI_SUCCESS != ret || op == &ompi_mpi_op_no_op.op) goto done;
if (op == &ompi_mpi_op_replace.op) {
ret = ompi_datatype_sndrcv(origin_addr, origin_count, origin_dt,
ret = ompi_datatype_sndrcv((void *)origin_addr, origin_count, origin_dt,
remote_address, target_count, target_dt);
} else {
ret = ompi_osc_base_sndrcv_op(origin_addr, origin_count, origin_dt,
@ -206,7 +206,7 @@ ompi_osc_sm_rget_accumulate(void *origin_addr,
int
ompi_osc_sm_put(void *origin_addr,
ompi_osc_sm_put(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -229,7 +229,7 @@ ompi_osc_sm_put(void *origin_addr,
remote_address = ((char*) (module->bases[target])) + module->disp_units[target] * target_disp;
ret = ompi_datatype_sndrcv(origin_addr, origin_count, origin_dt,
ret = ompi_datatype_sndrcv((void *)origin_addr, origin_count, origin_dt,
remote_address, target_count, target_dt);
return ret;
@ -268,7 +268,7 @@ ompi_osc_sm_get(void *origin_addr,
int
ompi_osc_sm_accumulate(void *origin_addr,
ompi_osc_sm_accumulate(const void *origin_addr,
int origin_count,
struct ompi_datatype_t *origin_dt,
int target,
@ -295,7 +295,7 @@ ompi_osc_sm_accumulate(void *origin_addr,
opal_atomic_lock(&module->node_states[target].accumulate_lock);
if (op == &ompi_mpi_op_replace.op) {
ret = ompi_datatype_sndrcv(origin_addr, origin_count, origin_dt,
ret = ompi_datatype_sndrcv((void *)origin_addr, origin_count, origin_dt,
remote_address, target_count, target_dt);
} else {
ret = ompi_osc_base_sndrcv_op(origin_addr, origin_count, origin_dt,

5
ompi/mpi/c/accumulate.c
Просмотреть файл

@ -13,6 +13,8 @@
* Copyright (c) 2009 Sun Microsystmes, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -126,8 +128,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origi
OPAL_CR_ENTER_LIBRARY();
/* XXX -- CONST -- do not cast away const -- update mca/osc */
rc = ompi_win->w_osc_module->osc_accumulate((void *) origin_addr,
rc = ompi_win->w_osc_module->osc_accumulate(origin_addr,
origin_count,
origin_datatype,
target_rank,

5
ompi/mpi/c/get_accumulate.c
Просмотреть файл

@ -14,6 +14,8 @@
* Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -133,8 +135,7 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype o
OPAL_CR_ENTER_LIBRARY();
/* XXX -- TODO: do not cast away the const */
rc = ompi_win->w_osc_module->osc_get_accumulate((void *) origin_addr,
rc = ompi_win->w_osc_module->osc_get_accumulate(origin_addr,
origin_count,
origin_datatype,
result_addr,

5
ompi/mpi/c/put.c
Просмотреть файл

@ -13,6 +13,8 @@
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -77,8 +79,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datat
OPAL_CR_ENTER_LIBRARY();
/* XXX -- CONST -- do not cast away const -- update mca/osc */
rc = win->w_osc_module->osc_put((void *) origin_addr, origin_count, origin_datatype,
rc = win->w_osc_module->osc_put(origin_addr, origin_count, origin_datatype,
target_rank, target_disp, target_count,
target_datatype, win);
OMPI_ERRHANDLER_RETURN(rc, win, rc, FUNC_NAME);

3
ompi/mpi/c/raccumulate.c
Просмотреть файл

@ -130,8 +130,7 @@ int MPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype orig
OPAL_CR_ENTER_LIBRARY();
/* TODO: don't cast away the const */
rc = ompi_win->w_osc_module->osc_raccumulate((void*) origin_addr,
rc = ompi_win->w_osc_module->osc_raccumulate(origin_addr,
origin_count,
origin_datatype,
target_rank,

5
ompi/mpi/c/rget_accumulate.c
Просмотреть файл

@ -14,6 +14,8 @@
* Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
* Copyright (c) 2014 Los Alamos National Security, LLC. All right
* reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -135,8 +137,7 @@ int MPI_Rget_accumulate(const void *origin_addr, int origin_count, MPI_Datatype
OPAL_CR_ENTER_LIBRARY();
/* TODO: do not cast away the const */
rc = ompi_win->w_osc_module->osc_rget_accumulate((void *) origin_addr,
rc = ompi_win->w_osc_module->osc_rget_accumulate(origin_addr,
origin_count,
origin_datatype,
result_addr,

7
ompi/mpi/c/rput.c
Просмотреть файл

@ -13,6 +13,8 @@
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -80,9 +82,8 @@ int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype origin_data
OPAL_CR_ENTER_LIBRARY();
/* TODO: do not cast away the const */
rc = win->w_osc_module->osc_rput((void *) origin_addr, origin_count, origin_datatype,
target_rank, target_disp, target_count,
rc = win->w_osc_module->osc_rput(origin_addr, origin_count, origin_datatype,
target_rank, target_disp, target_count,
target_datatype, win, request);
OMPI_ERRHANDLER_RETURN(rc, win, rc, FUNC_NAME);
}