Skip to content

Fix for issue #31 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sandroos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for issue #31 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions vlsv_common_mpi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ namespace vlsv {
MPI_Datatype getMPIDatatype(datatype::type dt,uint64_t dataSize) {
switch (dt) {
case datatype::UNKNOWN:
// TEST
cerr << "(VLSV) ERROR: VLSV::getMPIDatatype called with datatype::UNKNOWN datatype, returning MPI_DATATYPE_NULL!" << endl;
// END TEST
return MPI_DATATYPE_NULL;
break;
case datatype::INT:
Expand Down
16 changes: 10 additions & 6 deletions vlsv_reader_parallel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ namespace vlsv {
if (arrayElements == 0) return true;

// Get the byte size of the MPI primitive datatype (MPI_INT etc.) used here:
int datatypeBytesize;
MPI_Type_size(getMPIDatatype(arrayOpen.dataType,arrayOpen.dataSize),&datatypeBytesize);
int datatypeBytesize = arrayOpen.dataSize;

// Calculate the maximum number of array elements written using a single multi-write.
// Note: element = vector of size vectorSize, each vector element has byte size of datatypeBytesize.
Expand All @@ -80,10 +79,15 @@ namespace vlsv {
elements*arrayOpen.vectorSize));
}
} else {
multiReadUnits.push_back(
Multi_IO_Unit(buffer,
getMPIDatatype(arrayOpen.dataType,arrayOpen.dataSize),
arrayElements*arrayOpen.vectorSize));
if ( getMPIDatatype(arrayOpen.dataType,arrayOpen.dataSize) == MPI_DATATYPE_NULL ) {
multiReadUnits.push_back(Multi_IO_Unit(buffer,
MPI_Type<uint8_t>(),
arrayElements*arrayOpen.vectorSize*arrayOpen.dataSize));
} else {
multiReadUnits.push_back(Multi_IO_Unit(buffer,
getMPIDatatype(arrayOpen.dataType,arrayOpen.dataSize),
arrayElements*arrayOpen.vectorSize));
}
}

return success;
Expand Down