223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ULTRA OPTIMIZATION wasnt working anymore, seems to be related to Bertholds update of ws12 and ws13. had to remove -static from optimization string to be able to link again. Added some support for IKLM, but this didn't solve the problem

This commit is contained in:
Martin Diehl 2012-06-13 17:19:16 +00:00
parent 39ebc03b42
commit eb39d332bd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/Makefile
View File

@ -37,7 +37,7 @@ SHELL = /bin/sh
#auto values will be set by setup_code.py #auto values will be set by setup_code.py
FFTWROOT :=$(DAMASK_ROOT)/lib/fftw FFTWROOT :=$(DAMASK_ROOT)/lib/fftw
#IKMLROOT := #IKMLROOT :=/opt/intel/composerxe/mkl
#ACMLROOT :=/opt/acml4.4.0 #ACMLROOT :=/opt/acml4.4.0
LAPACKROOT :=/usr LAPACKROOT :=/usr
@ -93,6 +93,7 @@ LIB_DIRS +=-L$(FFTWROOT)/lib
ifdef IKMLROOT ifdef IKMLROOT
LIBRARIES +=-mkl LIBRARIES +=-mkl
LIBRARIES +=-L$(IKMLROOT)/lib/intel64
else else
ifdef ACMLROOT ifdef ACMLROOT
LIB_DIRS +=-L$(ACMLROOT)/$(F90)64$(ACML_ARCH)/lib LIB_DIRS +=-L$(ACMLROOT)/$(F90)64$(ACML_ARCH)/lib
@ -123,7 +124,7 @@ OPTIMIZATION_OFF_ifort :=-O0 -no-ip
OPTIMIZATION_OFF_gfortran :=-O0 OPTIMIZATION_OFF_gfortran :=-O0
OPTIMIZATION_DEFENSIVE_ifort :=-O2 OPTIMIZATION_DEFENSIVE_ifort :=-O2
OPTIMIZATION_DEFENSIVE_gfortran :=-O2 OPTIMIZATION_DEFENSIVE_gfortran :=-O2
OPTIMIZATION_AGGRESSIVE_ifort :=-O3 $(PORTABLE_SWITCH) -ipo -static -no-prec-div -fp-model fast=2 OPTIMIZATION_AGGRESSIVE_ifort :=-O3 $(PORTABLE_SWITCH) -no-prec-div -fp-model fast=2 -ipo #-static causes trouble at the moment
OPTIMIZATION_AGGRESSIVE_gfortran :=-O3 $(PORTABLE_SWITCH) -ffast-math -funroll-loops -ftree-vectorize OPTIMIZATION_AGGRESSIVE_gfortran :=-O3 $(PORTABLE_SWITCH) -ffast-math -funroll-loops -ftree-vectorize