Skip to content
Snippets Groups Projects
Commit ec80e1df authored by Mark OLESEN's avatar Mark OLESEN
Browse files

COMP: improve consistency for Intel-MPI and non-icc compilers (issue #524)

parent 092d71c3
Branches
Tags
1 merge request!5Final content for 1712 release
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 0 deletions
Allwmake
+ 6
− 0
View file @ ec80e1df
...@@ -145,6 +145,9 @@ then ...@@ -145,6 +145,9 @@ then
export CCS="${CC:-$WM_CC}" # CCS (serial compiler) default=$(CC) export CCS="${CC:-$WM_CC}" # CCS (serial compiler) default=$(CC)
export CCP=$(whichMpicc) # CCP (parallel compiler) default=mpicc export CCP=$(whichMpicc) # CCP (parallel compiler) default=mpicc
# Consistency for Intel-MPI and non-icc compilers
[ -n "$I_MPI_CC" ] || export I_MPI_CC="${CC:-$WM_CC}"
make realclean 2>/dev/null # Extra safety make realclean 2>/dev/null # Extra safety
make -j $WM_NCOMPPROCS scotch \ make -j $WM_NCOMPPROCS scotch \
&& make \ && make \
...@@ -209,6 +212,9 @@ then ...@@ -209,6 +212,9 @@ then
export CCS="${CC:-$WM_CC}" # CCS (serial compiler) default=$(CC) export CCS="${CC:-$WM_CC}" # CCS (serial compiler) default=$(CC)
export CCP=$(whichMpicc) # CCP (parallel compiler) default=mpicc export CCP=$(whichMpicc) # CCP (parallel compiler) default=mpicc
# Consistency for Intel-MPI and non-icc compilers
[ -n "$I_MPI_CC" ] || export I_MPI_CC="${CC:-$WM_CC}"
make realclean 2>/dev/null # Extra safety make realclean 2>/dev/null # Extra safety
make -j $WM_NCOMPPROCS ptscotch \ make -j $WM_NCOMPPROCS ptscotch \
&& make \ && make \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment