Skip to content

Commit

Permalink
Bring the regular MKL-include folder in front as well (not just the F…
Browse files Browse the repository at this point in the history 
…FTW sub-folder).
  • Loading branch information
@hfp
hfp committed Nov 17, 2017
1 parent cdbc4b1 commit b2872d8
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion config/qe/configure-qe-hsw-omp.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down
2 changes: 1 addition & 1 deletion config/qe/configure-qe-hsw.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down
2 changes: 1 addition & 1 deletion config/qe/configure-qe-knl-omp.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down
2 changes: 1 addition & 1 deletion config/qe/configure-qe-knl.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down
2 changes: 1 addition & 1 deletion config/qe/configure-qe-skx-omp.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down
2 changes: 1 addition & 1 deletion config/qe/configure-qe-skx.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down
2 changes: 1 addition & 1 deletion config/qe/configure-qe-snb-omp.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down
2 changes: 1 addition & 1 deletion config/qe/configure-qe-snb.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down
2 changes: 1 addition & 1 deletion config/qe/configure-qe.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sed -i \
${INCFILE}
sed -i \
-e "s/-D__FFTW/-D__DFTI/" -e "s/-D__DFTI/-D__DFTI ${EXX_ACE}/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/^IFLAGS\s\s*=\s\(..*\)/IFLAGS = -I\$(MKLROOT)\/include\/fftw -I\$(MKLROOT)\/include -I${SED_ELPAROOT}\/include\/elpa\/modules \1/" \
-e "s/-O3/${OPTC} ${IPO} ${TARGET} ${FPFLAGS} -fno-alias -ansi-alias/" \
-e "s/-O2 -assume byterecl -g -traceback/${OPTF} -align array64byte -threads -heap-arrays 4096 ${IPO} ${TARGET} ${FPFLAGS} -assume byterecl/" \
-e "s/LDFLAGS\s\s*=/LDFLAGS = -static-intel -static-libgcc -static-libstdc++/" \
Expand Down

0 comments on commit b2872d8

Please sign in to comment.