Skip to content
Snippets Groups Projects
Commit 3f358dcb authored by Derek Steinmoeller's avatar Derek Steinmoeller
Browse files

Missed src/Splits.cpp conflict somehow.

parent bdff0037
No related branches found
No related tags found
No related merge requests found
......@@ -121,24 +121,14 @@ src_temp(0), dst_temp(0), issue_warning(true) {
rec_types.resize(num_proc); // make sure our vector can hold everything
for (int i = 0; i < num_proc; i++) {
<<<<<<< HEAD
// We'll have to use the MPI_Type_struct syntax, so build arrays:
MPI_Datatype types[1] = {vec_type};
=======
/*// We'll have to use the MPI_Type_struct syntax, so build arrays:
MPI_Datatype types[2] = {vec_type,MPI_UB};
>>>>>>> upstream/master
int counts[2]; counts[0] = extent_from[i]; counts[1] = 1;
// Now, set displacements to set the "end" of the datatype a full
// "row" ahead of the partial row received.
MPI_Aint displs[2] = {0,sizeof(T)*sizes[untouched_dim]*sizes[from_dim]};
// And make the type
<<<<<<< HEAD
MPI_Type_create_struct(1, counts, displs, types, &rec_types[i]);
=======
MPI_Type_struct(2,counts,displs,types,&rec_types[i]);*/
// This code formerly used the MPI_UB marker to define the upper bound
......@@ -154,7 +144,6 @@ src_temp(0), dst_temp(0), issue_warning(true) {
sizeof(T)*sizes[untouched_dim]*sizes[from_dim], // extent
&rec_types[i]); // new type
>>>>>>> upstream/master
MPI_Type_commit(&rec_types[i]);
MPI_Type_free(&multivec);
/* Impelementation note: one optimization possible here is to collapse
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment