Updated general icc Makefile

gstlal-inspiral/share/ER10/optimised/Makefile.ligosoftware_icc_gstreamer-1.0

@@ -19,7 +19,7 @@ LALSUITE_REPO:=${PWD}/git/lalsuite
 INSTALL_DIR:=${LAL_PATH}
 
 # Set to build from git (0 = repo, 1 = git)
-LALSUITE_GIT=1
+LALSUITE_GIT=0
 GSTLAL_GIT=1
 
 # Set package release versions
@@ -29,22 +29,22 @@ GSTLALUGLY=gstlal-ugly-0.99.2
 GSTLAL=gstlal-0.99.6
 DOXYGEN=doxygen-1.8.9.1
 LALSUITEEXTRA=lalsuite-extra-1.1.0
-PYLAL=pylal-0.10.0
-GLUE=glue-1.50.0
-LALAPPS=lalapps-6.19.0
-LALSTOCHASTIC=lalstochastic-1.1.18
-LALINFERENCE=lalinference-1.7.0
-LALPULSAR=lalpulsar-1.14.0
-LALINSPIRAL=lalinspiral-1.7.5
-LALDETCHAR=laldetchar-0.3.3
-LALBURST=lalburst-1.4.2
-LALSIMULATION=lalsimulation-1.6.0
-LALMETAIO=lalmetaio-1.2.8
-LALFRAME=lalframe-1.4.1
-LAL=lal-6.16.1
-GDS=gds-2.17.9
-LDASTOOLSFRAMECPP=ldas-tools-framecpp-2.5.2
-LDASTOOLSAL=ldas-tools-al-2.5.2
+PYLAL=pylal-0.11.0
+GLUE=glue-1.52.0
+LALAPPS=lalapps-6.20.0
+LALSTOCHASTIC=lalstochastic-1.1.19
+LALINFERENCE=lalinference-1.8.0
+LALPULSAR=lalpulsar-1.15.0
+LALINSPIRAL=lalinspiral-1.7.6
+LALDETCHAR=laldetchar-0.3.4
+LALBURST=lalburst-1.4.3
+LALSIMULATION=lalsimulation-1.6.1
+LALMETAIO=lalmetaio-1.3.0
+LALFRAME=lalframe-1.4.2
+LAL=lal-6.17.0
+GDS=gds-2.17.10
+LDASTOOLSFRAMECPP=ldas-tools-framecpp-2.5.3
+LDASTOOLSAL=ldas-tools-al-2.5.4
 SWIG=swig-3.0.7
 METAIO=metaio-8.4.0
 LIBFRAME=libframe-8.21
@@ -55,7 +55,7 @@ GSTPLUGINSBASE=gst-plugins-base-1.4.5
 GSTREAMER=gstreamer-1.4.5
 GSL=gsl-1.16
 ORC=orc-0.4.25
-FFTW=fftw-3.3.4
+FFTW=fftw-3.3.5
 
 # Specify target/dependancy files
 GSTINSPIRAL_TARGET=$(INSTALL_DIR)/lib/libgstlalinspiral.so
@@ -150,7 +150,7 @@ env.sh :
 	@echo 'unset GST_PLUGIN_PATH PYTHONPATH' > $@
 	@echo 'unset LD_LIBRARY_PATH LIBRARY_PATH LD_PRELOAD' >> $@
 	@echo 'LAL_PATH=${PWD}/opt' >> $@
-	@echo 'export CFLAGS="-O3 -march=native -lfftw3f -lfftw3 -lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lpthread -Wno-write-strings -lirc -limf"' >> $@
+	@echo 'export CFLAGS="-O3 -march=native -lfftw3f -lfftw3 -lm -lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lpthread -Wno-write-strings -lirc -limf"' >> $@
 	@if [ ${CLUSTER} = "ligo.caltech.edu" ] ; then \
 		echo "source ${ICC_CIT} intel64" >> $@ ; \
 		echo 'export LDFLAGS="-L${MKLROOT}/lib/intel64"' >> $@ ; \
@@ -488,7 +488,7 @@ logs/gds.txt : $(LOGS_DIR)/ldas-tools-framecpp.txt $(GDS_TARGET)
 $(GDS_TARGET) : $(LDASTOOLSFRAMECPP_TARGET)
 	echo $(GDS) 1>&2
 	tar -xzf $(TAR_DIR)/$(GDS).tar.gz -C $(SRC_DIR)
-	cd $(SRC_DIR)/$(GDS) && ./configure --enable-online --prefix=$(INSTALL_DIR) CC="gcc" CXX="g++" CFLAGS="-fPIC -O3 -march=native"
+	cd $(SRC_DIR)/$(GDS) && ./configure --enable-online --prefix=$(INSTALL_DIR) CC="gcc" CXX="g++" CFLAGS="-fPIC -O3 -march=native -lfftw3_threads -lfftw3f_threads"
 	cd $(SRC_DIR)/$(GDS) && make && make install
 
 # ldas-tools-framecpp
@@ -619,9 +619,9 @@ $(FFTW_TARGET) : $(LOGS_DIR)/patch.txt
 	echo $(FFTW) 1>&2
 	tar -xzf $(TAR_DIR)/$(FFTW).tar.gz -C $(SRC_DIR)
 	cd $(SRC_DIR)/$(FFTW) && \
-		./configure CFLAGS="${CFLAGS}" --enable-shared --enable-sse --enable-sse2 --enable-avx --enable-float --prefix=$(INSTALL_DIR) && \
+		./configure CFLAGS="${CFLAGS}" --enable-shared --enable-sse --enable-sse2 --enable-avx --enable-float --enable-avx --enable-fma --enable-avx2 --enable-threads --prefix=$(INSTALL_DIR) && \
 		make -j$(CORES) && make install -j$(CORES) && make clean && \
-		./configure CFLAGS="${CFLAGS}" --enable-shared --enable-sse2 --enable-avx --prefix=$(INSTALL_DIR) && \
+		./configure CFLAGS="${CFLAGS}" --enable-shared --enable-sse2 --enable-avx --enable-avx --enable-fma --enable-avx2 --enable-threads --prefix=$(INSTALL_DIR) && \
 		make -j$(CORES) && make install -j$(CORES)
 
 #########################