/* smpi_mpi_dt.c -- MPI primitives to handle datatypes */
/* FIXME: a very incomplete implementation */
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "private.h"
#include "smpi_mpi_dt_private.h"
+#include "mc/mc.h"
+#include "simgrid/modelchecker.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi,
"Logging specific to SMPI (datatype)");
void * buf_tmp = xbt_malloc(count);
- subtype->serialize( sendbuf, buf_tmp,1, subtype);
+ subtype->serialize( sendbuf, buf_tmp,count/smpi_datatype_size(sendtype), subtype);
subtype = recvtype->substruct;
- subtype->unserialize( buf_tmp, recvbuf,1, subtype);
+ subtype->unserialize( buf_tmp, recvbuf,count/smpi_datatype_size(recvtype), subtype);
free(buf_tmp);
}
type_c->old_type->substruct);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+ if((i+1)%type_c->block_count ==0)
+ noncontiguous_vector_char += type_c->block_length*smpi_datatype_get_extent(type_c->old_type);
+ else
noncontiguous_vector_char += type_c->block_stride*smpi_datatype_get_extent(type_c->old_type);
}
}
type_c->block_length,
type_c->old_type->substruct);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+ if((i+1)%type_c->block_count ==0)
+ noncontiguous_vector_char += type_c->block_length*smpi_datatype_get_extent(type_c->old_type);
+ else
noncontiguous_vector_char += type_c->block_stride*smpi_datatype_get_extent(type_c->old_type);
}
}
void *struct_type, int flags){
MPI_Datatype new_t= xbt_new(s_smpi_mpi_datatype_t,1);
new_t->size = size;
- new_t->has_subtype = has_subtype;
+ new_t->has_subtype = size>0? has_subtype:0;
new_t->lb = lb;
new_t->ub = ub;
new_t->flags = flags;
new_t->substruct = struct_type;
new_t->in_use=0;
*new_type = new_t;
+
+#ifdef HAVE_MC
+ if(MC_is_active())
+ MC_ignore(&(new_t->in_use), sizeof(new_t->in_use));
+#endif
}
void smpi_datatype_free(MPI_Datatype* type){
void smpi_datatype_use(MPI_Datatype type){
if(type)type->in_use++;
+
+#ifdef HAVE_MC
+ if(MC_is_active())
+ MC_ignore(&(type->in_use), sizeof(type->in_use));
+#endif
}
void smpi_datatype_unuse(MPI_Datatype type){
if(type && type->in_use-- == 0 && (type->flags & DT_FLAG_DESTROYED))
smpi_datatype_free(&type);
+
+#ifdef HAVE_MC
+ if(MC_is_active())
+ MC_ignore(&(type->in_use), sizeof(type->in_use));
+#endif
}
-int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type)
+
+
+
+/*
+Contiguous Implementation
+*/
+
+
+/*
+ * Copies noncontiguous data into contiguous memory.
+ * @param contiguous_hvector - output hvector
+ * @param noncontiguous_hvector - input hvector
+ * @param type - pointer contening :
+ * - stride - stride of between noncontiguous data, in bytes
+ * - block_length - the width or height of blocked matrix
+ * - count - the number of rows of matrix
+ */
+void serialize_contiguous( const void *noncontiguous_hvector,
+ void *contiguous_hvector,
+ size_t count,
+ void *type)
+{
+ s_smpi_mpi_contiguous_t* type_c = (s_smpi_mpi_contiguous_t*)type;
+ char* contiguous_vector_char = (char*)contiguous_hvector;
+ char* noncontiguous_vector_char = (char*)noncontiguous_hvector+type_c->lb;
+ memcpy(contiguous_vector_char,
+ noncontiguous_vector_char, count* type_c->block_count * type_c->size_oldtype);
+}
+/*
+ * Copies contiguous data into noncontiguous memory.
+ * @param noncontiguous_vector - output hvector
+ * @param contiguous_vector - input hvector
+ * @param type - pointer contening :
+ * - stride - stride of between noncontiguous data, in bytes
+ * - block_length - the width or height of blocked matrix
+ * - count - the number of rows of matrix
+ */
+void unserialize_contiguous( const void *contiguous_vector,
+ void *noncontiguous_vector,
+ size_t count,
+ void *type)
+{
+ s_smpi_mpi_contiguous_t* type_c = (s_smpi_mpi_contiguous_t*)type;
+ char* contiguous_vector_char = (char*)contiguous_vector;
+ char* noncontiguous_vector_char = (char*)noncontiguous_vector+type_c->lb;
+
+ memcpy(noncontiguous_vector_char,
+ contiguous_vector_char, count* type_c->block_count * type_c->size_oldtype);
+}
+
+void free_contiguous(MPI_Datatype* d){
+}
+
+/*
+ * Create a Sub type contiguous to be able to serialize and unserialize it
+ * the structure s_smpi_mpi_contiguous_t is derived from s_smpi_subtype which
+ * required the functions unserialize and serialize
+ *
+ */
+s_smpi_mpi_contiguous_t* smpi_datatype_contiguous_create( MPI_Aint lb,
+ int block_count,
+ MPI_Datatype old_type,
+ int size_oldtype){
+ s_smpi_mpi_contiguous_t *new_t= xbt_new(s_smpi_mpi_contiguous_t,1);
+ new_t->base.serialize = &serialize_contiguous;
+ new_t->base.unserialize = &unserialize_contiguous;
+ new_t->base.subtype_free = &free_contiguous;
+ new_t->lb = lb;
+ new_t->block_count = block_count;
+ new_t->old_type = old_type;
+ new_t->size_oldtype = size_oldtype;
+ return new_t;
+}
+
+
+
+
+int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type, MPI_Aint lb)
{
int retval;
if(old_type->has_subtype){
//handle this case as a hvector with stride equals to the extent of the datatype
return smpi_datatype_hvector(count, 1, smpi_datatype_get_extent(old_type), old_type, new_type);
}
+
+ s_smpi_mpi_contiguous_t* subtype = smpi_datatype_contiguous_create( lb,
+ count,
+ old_type,
+ smpi_datatype_size(old_type));
+
smpi_datatype_create(new_type,
count * smpi_datatype_size(old_type),
- 0,count * smpi_datatype_size(old_type),
- 0,NULL, DT_FLAG_CONTIGUOUS);
+ lb,lb + count * smpi_datatype_size(old_type),
+ 1,subtype, DT_FLAG_CONTIGUOUS);
retval=MPI_SUCCESS;
return retval;
}
int smpi_datatype_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type)
{
int retval;
- if (blocklen<=0) return MPI_ERR_ARG;
+ if (blocklen<0) return MPI_ERR_ARG;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
if(count>0){
type_c->old_type->substruct);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+ if((i+1)%type_c->block_count ==0)
+ noncontiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+ else
noncontiguous_vector_char += type_c->block_stride;
}
}
type_c->block_length,
type_c->old_type->substruct);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+ if((i+1)%type_c->block_count ==0)
+ noncontiguous_vector_char += type_c->block_length*type_c->size_oldtype;
+ else
noncontiguous_vector_char += type_c->block_stride;
}
}
int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type)
{
int retval;
- if (blocklen<=0) return MPI_ERR_ARG;
+ if (blocklen<0) return MPI_ERR_ARG;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
if(count>0){
s_smpi_mpi_indexed_t* type_c = (s_smpi_mpi_indexed_t*)type;
int i,j;
char* contiguous_indexed_char = (char*)contiguous_indexed;
- char* noncontiguous_indexed_char = (char*)noncontiguous_indexed;
+ char* noncontiguous_indexed_char = (char*)noncontiguous_indexed+type_c->block_indices[0] * type_c->size_oldtype;
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_type->has_subtype == 0)
size_t count,
void *type)
{
+
s_smpi_mpi_indexed_t* type_c = (s_smpi_mpi_indexed_t*)type;
int i,j;
-
char* contiguous_indexed_char = (char*)contiguous_indexed;
- char* noncontiguous_indexed_char = (char*)noncontiguous_indexed;
+ char* noncontiguous_indexed_char = (char*)noncontiguous_indexed+type_c->block_indices[0]*smpi_datatype_get_extent(type_c->old_type);
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_type->has_subtype == 0)
- memcpy(noncontiguous_indexed_char,
+ memcpy(noncontiguous_indexed_char ,
contiguous_indexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
else
((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize( contiguous_indexed_char,
}
for(i=0; i< count; i++){
- if (blocklens[i]<=0)
+ if (blocklens[i]<0)
return MPI_ERR_ARG;
size += blocklens[i];
smpi_datatype_create(new_type, size *
smpi_datatype_size(old_type),lb,ub,1, subtype, DT_FLAG_DATA);
}else{
+ s_smpi_mpi_contiguous_t* subtype = smpi_datatype_contiguous_create( lb,
+ size,
+ old_type,
+ smpi_datatype_size(old_type));
smpi_datatype_create(new_type, size *
- smpi_datatype_size(old_type),0,size *
- smpi_datatype_size(old_type),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
+ smpi_datatype_size(old_type),lb,ub,1, subtype, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
}
retval=MPI_SUCCESS;
return retval;
s_smpi_mpi_hindexed_t* type_c = (s_smpi_mpi_hindexed_t*)type;
int i,j;
char* contiguous_hindexed_char = (char*)contiguous_hindexed;
- char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed;
+ char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_type->has_subtype == 0)
int i,j;
char* contiguous_hindexed_char = (char*)contiguous_hindexed;
- char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed;
+ char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_type->has_subtype == 0)
ub=indices[0] + blocklens[0]*smpi_datatype_ub(old_type);
}
for(i=0; i< count; i++){
- if (blocklens[i]<=0)
+ if (blocklens[i]<0)
return MPI_ERR_ARG;
size += blocklens[i];
ub
,1, subtype, DT_FLAG_DATA);
}else{
+ s_smpi_mpi_contiguous_t* subtype = smpi_datatype_contiguous_create( lb,
+ size,
+ old_type,
+ smpi_datatype_size(old_type));
smpi_datatype_create(new_type, size * smpi_datatype_size(old_type),
0,size * smpi_datatype_size(old_type),
- 0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
+ 1, subtype, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
}
retval=MPI_SUCCESS;
return retval;
s_smpi_mpi_struct_t* type_c = (s_smpi_mpi_struct_t*)type;
int i,j;
char* contiguous_struct_char = (char*)contiguous_struct;
- char* noncontiguous_struct_char = (char*)noncontiguous_struct;
+ char* noncontiguous_struct_char = (char*)noncontiguous_struct+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_types[i]->has_subtype == 0)
int i,j;
char* contiguous_struct_char = (char*)contiguous_struct;
- char* noncontiguous_struct_char = (char*)noncontiguous_struct;
+ char* noncontiguous_struct_char = (char*)noncontiguous_struct+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
if (type_c->old_types[i]->has_subtype == 0)
int forced_lb=0;
int forced_ub=0;
for(i=0; i< count; i++){
- if (blocklens[i]<=0)
+ if (blocklens[i]<0)
return MPI_ERR_ARG;
if (old_types[i]->has_subtype == 1)
contiguous=0;
smpi_datatype_create(new_type, size, lb, ub,1, subtype, DT_FLAG_DATA);
}else{
- smpi_datatype_create(new_type, size, lb, ub,0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
+ s_smpi_mpi_contiguous_t* subtype = smpi_datatype_contiguous_create( lb,
+ size,
+ MPI_CHAR,
+ 1);
+ smpi_datatype_create(new_type, size, lb, ub,1, subtype, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
}
return MPI_SUCCESS;
}
int smpi_op_is_commute(MPI_Op op)
{
- return op-> is_commute;
+ return (op==MPI_OP_NULL) ? 1 : op-> is_commute;
}
void smpi_op_destroy(MPI_Op op)
