1
1

use correct names or cannot call functions...

use correct ddt calls (and params ext vs lb etc)

This commit was SVN r7243.
Этот коммит содержится в:
Graham Fagg 2005-09-09 02:39:57 +00:00
родитель e2186a1cc2
Коммит 9596d6e2f3
4 изменённых файлов: 21 добавлений и 27 удалений

Просмотреть файл

@ -323,37 +323,31 @@ OMPI_COMP_EXPORT extern int mca_coll_tuned_priority_param;
int mca_coll_tuned_reduce_intra_dec_fixed(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_op_t *op, int root,
struct ompi_communicator_t *comm);
int mca_coll_tuned_reduce_intra_dec_dynamic(void *sbuf, void* rbuf,
int count,
int mca_coll_tuned_reduce_intra_dec_dynamic(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_op_t *op, int root,
struct ompi_communicator_t *comm);
int mca_coll_tuned_reduce_intra_chain(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm, uint32_t segsize, int fanout);
struct ompi_op_t *op, int root,
struct ompi_communicator_t *comm,
uint32_t segsize, int fanout);
int mca_coll_tuned_reduce_intra_pipeline(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_communicator_t *comm, uint32_t segsize);
struct ompi_op_t *op, int root,
struct ompi_communicator_t *comm,
uint32_t segsize);
int mca_coll_tuned_reduce_inter_dec_fixed(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_op_t *op, int root,
struct ompi_communicator_t *comm);
int mca_coll_tuned_reduce_inter_dec_dynamic(void *sbuf, void* rbuf,
int count,
int mca_coll_tuned_reduce_inter_dec_dynamic(void *sbuf, void* rbuf, int count,
struct ompi_datatype_t *dtype,
struct ompi_op_t *op,
int root,
struct ompi_op_t *op, int root,
struct ompi_communicator_t *comm);
int mca_coll_tuned_reduce_scatter_intra_dec_fixed(void *sbuf, void *rbuf,

Просмотреть файл

@ -43,7 +43,8 @@ int mca_coll_tuned_reduce_intra_chain( void *sendbuf, void *recvbuf, int count,
int segcount, segindex, num_segments, realsegsize;
char *inbuf[2] = {NULL, NULL};
char *recvtmpbuf = NULL;
long typelng, ext;
long ext, lb;
int typelng;
ompi_request_t* reqs[2];
ompi_coll_chain_t* chain;
@ -75,8 +76,8 @@ int mca_coll_tuned_reduce_intra_chain( void *sendbuf, void *recvbuf, int count,
/* ----------------------------------------------------------------- */
/* Determine number of segments and number of elements
sent per operation */
ompi_ddt_get_extent( datatype, &typelng, &ext );
ompi_ddt_get_size( datatype, &typelng );
ompi_ddt_get_extent( datatype, &lb, &ext );
ompi_ddt_type_size( datatype, &typelng );
if( segsize > 0 ) {
segcount = segsize/typelng;
num_segments = count/segcount;
@ -216,7 +217,7 @@ int mca_coll_tuned_reduce_intra_pipeline( void *sendbuf, void *recvbuf,
ompi_op_t* op, int root,
ompi_communicator_t* comm, uint32_t segsize )
{
return mca_coll_tuned_reduce_chain_intra( sendbuf,recvbuf, count,
return mca_coll_tuned_reduce_intra_chain( sendbuf,recvbuf, count,
datatype, op, root, comm,
segsize, 1 );
}

Просмотреть файл

@ -22,7 +22,7 @@
#include "communicator/communicator.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/coll_tags.h"
#include "coll_tuned.h"
#include "op/op.h"
#include "mca/pml/pml.h"
#include "opal/util/bit_ops.h"
@ -37,7 +37,7 @@
* Returns: - MPI_SUCCESS or error code (passed from the reduce implementation)
*
*/
int mca_coll_tuned_reduce_intra( void *sendbuf, void *recvbuf,
int mca_coll_tuned_reduce_intra_dec_dynamic( void *sendbuf, void *recvbuf,
int count, ompi_datatype_t* datatype,
ompi_op_t* op, int root,
ompi_communicator_t* comm)

Просмотреть файл

@ -22,10 +22,9 @@
#include "communicator/communicator.h"
#include "mca/coll/coll.h"
#include "mca/coll/base/coll_tags.h"
#include "coll_tuned.h"
#include "mca/pml/pml.h"
#include "opal/util/bit_ops.h"
#include "op/op.h"
#include "coll_tuned.h"
@ -37,7 +36,7 @@
* Returns: - MPI_SUCCESS or error code (passed from the reduce implementation)
*
*/
int mca_coll_tuned_reduce_intra( void *sendbuf, void *recvbuf,
int mca_coll_tuned_reduce_intra_dec_fixed( void *sendbuf, void *recvbuf,
int count, ompi_datatype_t* datatype,
ompi_op_t* op, int root,
ompi_communicator_t* comm)