Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 13 additions & 5 deletions m4/check_mpi.m4
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,10 @@ AC_DEFUN([UD_MPI_COMPILER_BASENAME],[
# Fujitsu MPI compilers: fccpx, FCCpx, frtpx
compile_basename=`$compile_cmd -showme | cut -d' ' -f1`
;;
mpiicc | mpiicx | mpiicpc | mpiifort | mpiifx | *[[\\/]]mpiicc | *[[\\/]]mpiicx | *[[\\/]]mpiicpc | *[[\\/]]mpiifort | *[[\\/]]mpiifx )
# Intel MPI classic compilers: icc, icpc, ifort. OneAPI compilers: icx, icpx, ifx.
compile_basename=`$compile_cmd --version -c 2>&1 | grep -v '^$' | grep -v "remark" | head -n1 | cut -d' ' -f1 | cut -d':' -f1`
;;
cc | *[[\\/]]cc )
# For Cray PrgEnv-intel, cc is a wrapper of icc
# For Cray PrgEnv-gnu, cc is a wrapper of gcc
Expand All @@ -374,10 +378,12 @@ AC_DEFUN([UD_MPI_COMPILER_BASENAME],[
# % cc --version
# nvc 25.5-0 64-bit target on x86-64 Linux -tp zen3-64

compile_basename=`$compile_cmd --version -c 2>&1 | grep -v '^$' | head -n1 | cut -d' ' -f1`
compile_basename=`$compile_cmd --version -c 2>&1 | grep -v '^$' | grep -v "remark" | head -n1 | cut -d' ' -f1 | cut -d':' -f1`
case "$compile_basename" in
"gcc"*)
;;
"icc"*)
;;
"Intel"*)
unset cc_basename
AC_CHECK_PROG(cc_basename, icx, [icx])
Expand Down Expand Up @@ -410,10 +416,12 @@ AC_DEFUN([UD_MPI_COMPILER_BASENAME],[
# % CC --version
# nvc++ 25.5-0 64-bit target on x86-64 Linux -tp zen3-64

compile_basename=`$compile_cmd --version -c 2>&1 | grep -v '^$' | head -n1 | cut -d' ' -f1`
compile_basename=`$compile_cmd --version -c 2>&1 | grep -v '^$' | grep -v "remark" | head -n1 | cut -d' ' -f1 | cut -d':' -f1`
case "$compile_basename" in
"g++"*)
;;
"icpc"*)
;;
"Intel"*)
unset cxx_basename
AC_CHECK_PROG(cxx_basename, icpx, [icpx])
Expand Down Expand Up @@ -446,14 +454,14 @@ AC_DEFUN([UD_MPI_COMPILER_BASENAME],[
# % ftn --version
# nvfortran 25.5-0 64-bit target on x86-64 Linux -tp zen3-64

compile_basename=`$compile_cmd --version -c 2>&1 | grep -v '^$' | head -n1 | cut -d' ' -f1`
compile_basename=`$compile_cmd --version -c 2>&1 | grep -v '^$' | grep -v "remark" | head -n1 | cut -d' ' -f1 | cut -d':' -f1`
case "$compile_basename" in
"gfortran"*)
;;
"GNU"*)
compile_basename="gfortran"
;;
"ifx"*)
"ifx"* | "ifort"* )
;;
"Intel"*)
unset ftn_basename
Expand Down Expand Up @@ -486,7 +494,7 @@ AC_DEFUN([UD_MPI_COMPILER_BASENAME],[
else
AC_MSG_RESULT([not found])
fi
ud_vendor_version_$1=`$compile_basename --version -c 2>&1 | grep -v '^$' | head -n1`
ud_vendor_version_$1=`$compile_basename --version -c 2>&1 | grep -v '^$' | grep -v "remark" | head -n1`
unset compile_basename
unset compile_cmd
])# UD_MPI_COMPILER_BASENAME
Expand Down
4 changes: 3 additions & 1 deletion sneak_peek.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ This is essentially a placeholder for the next release note ...
See [PR #230](https://github.com/Parallel-NetCDF/PnetCDF/pull/230).

* Bug fixes
+ none
+ Fix utility program `pnetcdf_version` for printing the version string of
the base compiler of MPICC when the base is a classic Intel compiler.
See [PR #232](https://github.com/Parallel-NetCDF/PnetCDF/pull/232).

* New example programs
+ none
Expand Down