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

Cray XC case added #71

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −3
Open

Cray XC case added #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22685d7
Cray XC case added
ChristopherBignamini Apr 15, 2021
04373c9
Target system identification updated
ChristopherBignamini Apr 23, 2021
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
13 changes: 12 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ Please set them manually.])
AC_DEFINE(CRAY_XE6, 1, [Define if this is a Cray XE6 system.])
CC=cc
CXX=CC
elif hostname | grep -q daint; then
SYSGUESS=cray_xc_daint
AC_DEFINE(CRAY_XC_DAINT, 1, [Define if this is the Cray XC Daint system.])
CC=cc
CXX=CC
else
SYSGUESS=unknown
fi
Expand Down Expand Up @@ -110,6 +115,9 @@ else
cray_xe6)
MPI_CXXFLAGS=""
;;
cray_xc_daint)
MPI_CXXFLAGS=""
;;
bgq_seq)
MPI_CXXFLAGS=""
enable_shared=no
Expand Down Expand Up @@ -146,6 +154,9 @@ else
cray_xe6)
MPI_CFLAGS=""
;;
cray_xc_daint)
MPI_CFLAGS=""
;;
bgq_seq)
MPI_CFLAGS=""
enable_shared=no
Expand All @@ -171,7 +182,7 @@ else
openmpi)
MPI_LDFLAGS="`mpicxx -showme:link`"
;;
bgp|bgq|cray_xe6|bgq_seq)
bgp|bgq|cray_xe6|cray_xc_daint|bgq_seq)
MPI_LDFLAGS=""
;;
*)
Expand Down
11 changes: 9 additions & 2 deletions mpidep/mpidep.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extern "C" {

// Implementation-dependent code

#ifndef CRAY_XE6
#if !defined CRAY_XE6 && !defined CRAY_XC_DAINT
#ifdef HAVE_RTS_GET_PERSONALITY
#define BGL
#else
Expand Down Expand Up @@ -64,7 +64,7 @@ extern "C" {
* argc and argv (MPICH) or through the environment (OpenMPI).
*
* return -1 on failure
*/
*/

int
getRank (int argc, char *argv[])
Expand Down Expand Up @@ -136,6 +136,13 @@ getRank (int argc, char *argv[])
}
return -1;
#endif
#ifdef CRAY_XC_DAINT
char* rank_char = std::getenv("SLURM_PROCID");
std::istringstream rank_iss(rank_char);
int rank_int;
rank_iss >> rank_int;
return rank_int;
#endif
}


Expand Down