Skip to content
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

dart/mpi: Correctly use MPI_DATATYPE_NULL to denote an invalid type #709

Merged
merged 1 commit into from
Jun 9, 2020
Merged

dart/mpi: Correctly use MPI_DATATYPE_NULL to denote an invalid type #709

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
4 changes: 1 addition & 3 deletions dart-impl/mpi/include/dash/dart/mpi/dart_communication_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ dart_ret_t dart__mpi__op_fini();
*/
#define MAX_CONTIG_ELEMENTS (INT_MAX)

#define DART_MPI_TYPE_UNDEFINED (MPI_Datatype)MPI_UNDEFINED

typedef enum {
DART_KIND_BASIC = 0,
DART_KIND_STRIDED,
Expand Down Expand Up @@ -190,7 +188,7 @@ MPI_Datatype dart__mpi__datatype_maxtype(dart_datatype_t dart_type) {
dart_datatype_struct_t *dts = dart__mpi__datatype_struct(dart_type);
MPI_Datatype res;
if (dart__mpi__datatype_iscontiguous(dart_type)) {
if (dts->contiguous.max_type == DART_MPI_TYPE_UNDEFINED) {
if (dts->contiguous.max_type == MPI_DATATYPE_NULL) {
dts->contiguous.max_type = dart__mpi__datatype_create_max_datatype(
dts->contiguous.mpi_type);
}
Expand Down
4 changes: 2 additions & 2 deletions dart-impl/mpi/src/dart_communication.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,11 @@ dart__mpi__put_basic(
CHECK_MPI_RET(
dart__mpi__put(src_ptr,
nchunks,
dart__mpi__datatype_struct(dtype)->contiguous.max_type,
dart__mpi__datatype_maxtype(dtype),
team_unit_id.id,
offset,
nchunks,
dart__mpi__datatype_struct(dtype)->contiguous.max_type,
dart__mpi__datatype_maxtype(dtype),
win,
reqs, num_reqs),
"MPI_Put");
Expand Down
7 changes: 4 additions & 3 deletions dart-impl/mpi/src/dart_mpi_types.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ dart_type_create_custom(
new_struct->contiguous.size = num_bytes;
new_struct->contiguous.mpi_type = new_mpi_dtype;
// max_type will be created on-demand for custom types
new_struct->contiguous.max_type = DART_MPI_TYPE_UNDEFINED;
new_struct->contiguous.max_type = MPI_DATATYPE_NULL;

*newtype = (dart_datatype_t)new_struct;
DART_LOG_TRACE("Created new custom data type %p with %zu bytes`",
Expand Down Expand Up @@ -343,7 +343,7 @@ dart_type_destroy(dart_datatype_t *dart_type_ptr)
MPI_Type_free(&dart_type->indexed.mpi_type);
} else if (dart_type->kind == DART_KIND_CUSTOM) {
MPI_Type_free(&dart_type->contiguous.mpi_type);
if (dart_type->contiguous.max_type != DART_MPI_TYPE_UNDEFINED) {
if (dart_type->contiguous.max_type != MPI_DATATYPE_NULL) {
MPI_Type_free(&dart_type->contiguous.max_type);
}
}
Expand All @@ -357,7 +357,8 @@ dart_type_destroy(dart_datatype_t *dart_type_ptr)
static void destroy_basic_type(dart_datatype_t dart_type_id)
{
dart_datatype_struct_t *dart_type = dart__mpi__datatype_struct(dart_type_id);
MPI_Type_free(&dart_type->contiguous.max_type);
if (dart_type->contiguous.max_type != MPI_DATATYPE_NULL)
MPI_Type_free(&dart_type->contiguous.max_type);
dart_type->contiguous.max_type = MPI_DATATYPE_NULL;
}

Expand Down