Skip to content

libompitrace: handle MPI_DATATYPE_NULL #10035

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

Merged
merged 1 commit into from
Feb 23, 2022
Merged

libompitrace: handle MPI_DATATYPE_NULL #10035

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
16 changes: 13 additions & 3 deletions ompi/contrib/libompitrace/allgather.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2007-2022 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -38,8 +38,18 @@ int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int rank;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(sendtype, sendtypename, &len);
PMPI_Type_get_name(recvtype, recvtypename, &len);
if (sendtype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(sendtype, sendtypename, &len);
} else {
strncpy(sendtypename, "MPI_DATATYPE_NULL",
sizeof(sendtypename));
}
if (recvtype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(recvtype, recvtypename, &len);
} else {
strncpy(recvtypename, "MPI_DATATYPE_NULL",
sizeof(recvtypename));
}
PMPI_Comm_get_name(comm, commname, &len);

fprintf(stderr, "MPI_ALLGATHER[%d]: sendbuf %0" PRIxPTR " sendcount %d sendtype %s\n\trecvbuf %0" PRIxPTR " recvcount %d recvtype %s comm %s\n",
Expand Down
16 changes: 13 additions & 3 deletions ompi/contrib/libompitrace/allgatherv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -38,8 +38,18 @@ int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int rank;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(sendtype, sendtypename, &len);
PMPI_Type_get_name(recvtype, recvtypename, &len);
if (sendtype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(sendtype, sendtypename, &len);
} else {
strncpy(sendtypename, "MPI_DATATYPE_NULL",
sizeof(sendtypename));
}
if (recvtype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(recvtype, recvtypename, &len);
} else {
strncpy(recvtypename, "MPI_DATATYPE_NULL",
sizeof(recvtypename));
}
PMPI_Comm_get_name(comm, commname, &len);

fprintf(stderr, "MPI_ALLGATHERV[%d]: sendbuf %0" PRIxPTR " sendcount %d sendtype %s\n\trecvbuf %0" PRIxPTR " recvtype %s comm %s\n",
Expand Down
8 changes: 6 additions & 2 deletions ompi/contrib/libompitrace/allreduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
Expand All @@ -36,7 +36,11 @@ int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count,
int rank;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(datatype, typename, &len);
if (datatype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(datatype, typename, &len);
} else {
strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename));
}
PMPI_Comm_get_name(comm, commname, &len);

fprintf(stderr, "MPI_ALLREDUCE[%d]: sendbuf %0" PRIxPTR " recvbuf %0" PRIxPTR " count %d datatype %s op %s comm %s\n",
Expand Down
8 changes: 6 additions & 2 deletions ompi/contrib/libompitrace/bcast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -34,7 +34,11 @@ int MPI_Bcast(void *buffer, int count, MPI_Datatype datatype,
int rank;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(datatype, typename, &len);
if (datatype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(datatype, typename, &len);
} else {
strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename));
}
PMPI_Comm_get_name(comm, commname, &len);

fprintf(stderr, "MPI_BCAST[%d]: buffer %0" PRIxPTR " count %d datatype %s root %d comm %s\n",
Expand Down
8 changes: 6 additions & 2 deletions ompi/contrib/libompitrace/isend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
Expand All @@ -36,7 +36,11 @@ int MPI_Isend(const void *buf, int count, MPI_Datatype type, int dest,
int rank;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(type, typename, &len);
if (type != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(type, typename, &len);
} else {
strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename));
}
PMPI_Comm_get_name(comm, commname, &len);

fprintf(stderr, "MPI_ISEND[%d]: buf %0" PRIxPTR " count %d datatype %s dest %d tag %d comm %s\n",
Expand Down
8 changes: 6 additions & 2 deletions ompi/contrib/libompitrace/recv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -33,7 +33,11 @@ int MPI_Recv(void *buf, int count, MPI_Datatype type, int source,
int rank;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(type, typename, &len);
if (type != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(type, typename, &len);
} else {
strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename));
}
PMPI_Comm_get_name(comm, commname, &len);

fprintf(stderr, "MPI_RECV[%d]: buf %0" PRIxPTR " count %d datatype %s source %d tag %d comm %s\n",
Expand Down
8 changes: 6 additions & 2 deletions ompi/contrib/libompitrace/reduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
Expand All @@ -37,7 +37,11 @@ int MPI_Reduce(const void *sendbuf, void *recvbuf, int count,
int rank;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(datatype, typename, &len);
if (datatype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(datatype, typename, &len);
} else {
strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename));
}
PMPI_Comm_get_name(comm, commname, &len);

fprintf(stderr,"MPI_REDUCE[%d]: sendbuf %0" PRIxPTR " recvbuf %0" PRIxPTR " count %d datatype %s op %s root %d comm %s\n",
Expand Down
8 changes: 6 additions & 2 deletions ompi/contrib/libompitrace/send.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
Expand All @@ -36,7 +36,11 @@ int MPI_Send(const void *buf, int count, MPI_Datatype type, int dest,
int rank;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(type, typename, &len);
if (type != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(type, typename, &len);
} else {
strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename));
}
PMPI_Comm_get_name(comm, commname, &len);

fprintf(stderr, "MPI_SEND[%d]: : buf %0" PRIxPTR " count %d datatype %s dest %d tag %d comm %s\n",
Expand Down
16 changes: 13 additions & 3 deletions ompi/contrib/libompitrace/sendrecv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -41,8 +41,18 @@ int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,
int size;

PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
PMPI_Type_get_name(sendtype, sendtypename, &len);
PMPI_Type_get_name(sendtype, recvtypename, &len);
if (sendtype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(sendtype, sendtypename, &len);
} else {
strncpy(sendtypename, "MPI_DATATYPE_NULL",
sizeof(sendtypename));
}
if (recvtype != MPI_DATATYPE_NULL) {
PMPI_Type_get_name(recvtype, recvtypename, &len);
} else {
strncpy(recvtypename, "MPI_DATATYPE_NULL",
sizeof(recvtypename));
}
PMPI_Comm_get_name(comm, commname, &len);
PMPI_Type_size(recvtype, &size);

Expand Down