Commit bc1c5442 authored by Mulas, Giacomo's avatar Mulas, Giacomo
Browse files

add AC_SUBST entries for BLAS

parent 96a796e3

build/Makefile.in

+28 −15
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ cluster_clu_LDADD = $(LDADD) 
am__DEPENDENCIES_1 =

cluster_clu_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__cluster_edfb_clu_SOURCES_DIST = ../src/cluster/edfb_clu.f

@BUILDFORTRAN_TRUE@am__objects_2 = ../src/cluster/edfb_clu.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_cluster_edfb_clu_OBJECTS = $(am__objects_2)
@@ -186,7 +186,8 @@ cluster_edfb_clu_OBJECTS = $(am_cluster_edfb_clu_OBJECTS) 
cluster_edfb_clu_LDADD = $(LDADD)

cluster_edfb_clu_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__cluster_np_cluster_SOURCES_DIST = ../src/cluster/np_cluster.cpp \

	../src/cluster/cluster.cpp

@BUILDFORTRAN_FALSE@am_cluster_np_cluster_OBJECTS =  \
@@ -199,7 +200,8 @@ cluster_np_cluster_OBJECTS = $(am_cluster_np_cluster_OBJECTS) 
cluster_np_cluster_LDADD = $(LDADD)

cluster_np_cluster_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__inclusion_edfb_inclu_SOURCES_DIST = ../src/inclusion/edfb_inclu.f

@BUILDFORTRAN_TRUE@am__objects_3 =  \

@BUILDFORTRAN_TRUE@	../src/inclusion/edfb_inclu.$(OBJEXT)
@@ -208,7 +210,8 @@ inclusion_edfb_inclu_OBJECTS = $(am_inclusion_edfb_inclu_OBJECTS) 
inclusion_edfb_inclu_LDADD = $(LDADD)

inclusion_edfb_inclu_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__inclusion_inclu_SOURCES_DIST = ../src/inclusion/inclu.f

@BUILDFORTRAN_TRUE@am__objects_4 = ../src/inclusion/inclu.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_inclusion_inclu_OBJECTS = $(am__objects_4)
@@ -216,7 +219,8 @@ inclusion_inclu_OBJECTS = $(am_inclusion_inclu_OBJECTS) 
inclusion_inclu_LDADD = $(LDADD)

inclusion_inclu_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__inclusion_np_inclusion_SOURCES_DIST =  \

	../src/inclusion/np_inclusion.cpp \

	../src/inclusion/inclusion.cpp
@@ -230,7 +234,8 @@ inclusion_np_inclusion_OBJECTS = $(am_inclusion_np_inclusion_OBJECTS) 
inclusion_np_inclusion_LDADD = $(LDADD)

inclusion_np_inclusion_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__sphere_edfb_sph_SOURCES_DIST = ../src/sphere/edfb_sph.f

@BUILDFORTRAN_TRUE@am__objects_5 = ../src/sphere/edfb_sph.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_sphere_edfb_sph_OBJECTS = $(am__objects_5)
@@ -238,7 +243,8 @@ sphere_edfb_sph_OBJECTS = $(am_sphere_edfb_sph_OBJECTS) 
sphere_edfb_sph_LDADD = $(LDADD)

sphere_edfb_sph_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__sphere_np_sphere_SOURCES_DIST = ../src/sphere/np_sphere.cpp \

	../src/sphere/sphere.cpp

@BUILDFORTRAN_FALSE@am_sphere_np_sphere_OBJECTS =  \
@@ -251,7 +257,8 @@ sphere_np_sphere_OBJECTS = $(am_sphere_np_sphere_OBJECTS) 
sphere_np_sphere_LDADD = $(LDADD)

sphere_np_sphere_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__sphere_sph_SOURCES_DIST = ../src/sphere/sph.f

@BUILDFORTRAN_TRUE@am__objects_6 = ../src/sphere/sph.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_sphere_sph_OBJECTS = $(am__objects_6)
@@ -259,7 +266,7 @@ sphere_sph_OBJECTS = $(am_sphere_sph_OBJECTS) 
sphere_sph_LDADD = $(LDADD)

sphere_sph_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__testing_test_ParticleDescriptor_SOURCES_DIST =  \

	../src/testing/test_ParticleDescriptor.cpp

@BUILDFORTRAN_FALSE@am_testing_test_ParticleDescriptor_OBJECTS = ../src/testing/test_ParticleDescriptor.$(OBJEXT)
@@ -269,7 +276,8 @@ testing_test_ParticleDescriptor_OBJECTS = \ 
testing_test_ParticleDescriptor_LDADD = $(LDADD)

testing_test_ParticleDescriptor_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__testing_test_TEDF_SOURCES_DIST = ../src/testing/test_TEDF.cpp

@BUILDFORTRAN_FALSE@am_testing_test_TEDF_OBJECTS =  \

@BUILDFORTRAN_FALSE@	../src/testing/test_TEDF.$(OBJEXT)
@@ -279,7 +287,8 @@ testing_test_TEDF_OBJECTS = $(am_testing_test_TEDF_OBJECTS) 
testing_test_TEDF_LDADD = $(LDADD)

testing_test_TEDF_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__testing_test_TTMS_SOURCES_DIST = ../src/testing/test_TTMS.cpp

@BUILDFORTRAN_FALSE@am_testing_test_TTMS_OBJECTS =  \

@BUILDFORTRAN_FALSE@	../src/testing/test_TTMS.$(OBJEXT)
@@ -289,7 +298,8 @@ testing_test_TTMS_OBJECTS = $(am_testing_test_TTMS_OBJECTS) 
testing_test_TTMS_LDADD = $(LDADD)

testing_test_TTMS_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

am__trapping_frfme_SOURCES_DIST = ../src/trapping/frfme.f

@BUILDFORTRAN_TRUE@am__objects_7 = ../src/trapping/frfme.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_trapping_frfme_OBJECTS = $(am__objects_7)
@@ -297,7 +307,7 @@ trapping_frfme_OBJECTS = $(am_trapping_frfme_OBJECTS) 
trapping_frfme_LDADD = $(LDADD)

trapping_frfme_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__trapping_lffft_SOURCES_DIST = ../src/trapping/lffft.f

@BUILDFORTRAN_TRUE@am__objects_8 = ../src/trapping/lffft.$(OBJEXT)

@BUILDFORTRAN_TRUE@am_trapping_lffft_OBJECTS = $(am__objects_8)
@@ -305,7 +315,7 @@ trapping_lffft_OBJECTS = $(am_trapping_lffft_OBJECTS) 
trapping_lffft_LDADD = $(LDADD)

trapping_lffft_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

am__trapping_np_trapping_SOURCES_DIST =  \

	../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp \

	../src/trapping/clffft.cpp
@@ -321,7 +331,8 @@ trapping_np_trapping_OBJECTS = $(am_trapping_np_trapping_OBJECTS) 
trapping_np_trapping_LDADD = $(LDADD)

trapping_np_trapping_DEPENDENCIES = libnptm/libnptm.la \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

	$(am__DEPENDENCIES_1)

AM_V_P = $(am__v_P_@AM_V@)

am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)

am__v_P_0 = false
@@ -501,6 +512,8 @@ AUTOCONF = @AUTOCONF@ 
AUTOHEADER = @AUTOHEADER@

AUTOMAKE = @AUTOMAKE@

AWK = @AWK@

BLASFLAGS = @BLASFLAGS@

BLASLDFLAGS = @BLASLDFLAGS@

CC = @CC@

CCDEPMODE = @CCDEPMODE@

CFLAGS = @CFLAGS@

build/configure

+43 −15
Original line number Diff line number Diff line
@@ -662,6 +662,8 @@ NVTXFLAGS 
MAGMALDFLAGS

MAGMAFLAGS

REFINEFLAGS

BLASFLAGS

BLASLDFLAGS

LAPACKLDFLAGS

LAPACKFLAGS

OPTFLAGS
@@ -25193,6 +25195,8 @@ then : 














      LAPACKLDFLAGS=""



























      BLASLDFLAGS=""



























    else





























    if test "x$ENABLE_ILP64" = "xyes"; then









@@ -25208,7 +25212,6 @@ then :













      LAPACK_LDSPEC=""















      MKL_BUILD="mkl-dynamic-lp64-gomp"















    fi # end of 64-bit decision tree













    BLAS_INCLUDE=""















    BLASLDFLAGS=""















    pkg-config --version > /dev/null















    use_pkg_config=$?









@@ -25224,14 +25227,20 @@ then :













        export LAPACKLDFLAGS=$(pkg-config --libs ${MKL_BUILD})















      else















        # MKL was not found, so configuration searches for BLAS













        declare -a pkg_array=$(pkg-config --list-all | grep openblas${LAPACK_LDSPEC})













        for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep openblas${LAPACK_LDSPEC} > /dev/null













        result=$?













        if test "x$result" = "x0"; then













          # OpenBLAS was found













	  export BLASLDFLAGS=$(pkg-config --libs openblas${LAPACK_LDSPEC})













	else















          declare -a pkg_array=$(pkg-config --list-all | grep blas${LAPACK_LDSPEC})















          for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep blas${LAPACK_LDSPEC} > /dev/null















          result=$?















          if test "x$result" = "x0"; then















            # BLAS was found













          BLAS_INCLUDE=$(pkg-config --cflags-only-I blas${LAPACK_LDSPEC})













	  export BLASFLAGS=${BLAS_INCLUDE}















	    export BLASLDFLAGS=$(pkg-config --libs blas${LAPACK_LDSPEC})













	  fi















        fi # end of BLAS decision tree















        # search for LAPACKe















        declare -a pkg_array=$(pkg-config --list-all | grep lapacke${LAPACK_LDSPEC})










@@ -25286,6 +25295,14 @@ fi



























      LAPACKLDFLAGS=${LAPACKLDFLAGS}



























      if test "x$BLASLDFLAGS" != "x"













then :

























fi













      BLASFLAGS=${BLASFLAGS}

























      BLASLDFLAGS=${BLASLDFLAGS}



























    fi





























else case e in #(









@@ -25304,7 +25321,6 @@ else case e in #(













      LAPACK_LDSPEC=""















      MKL_BUILD="mkl-dynamic-lp64-gomp"















    fi # end of 64-bit decision tree













    BLAS_INCLUDE=""















    BLASLDFLAGS=""















    pkg-config --version > /dev/null















    use_pkg_config=$?









@@ -25320,14 +25336,20 @@ else case e in #(













        export LAPACKLDFLAGS=$(pkg-config --libs ${MKL_BUILD})















      else















        # MKL was not found, so configuration searches for BLAS













        declare -a pkg_array=$(pkg-config --list-all | grep openblas${LAPACK_LDSPEC})













        for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep openblas${LAPACK_LDSPEC} > /dev/null













        result=$?













        if test "x$result" = "x0"; then













          # OpenBLAS was found













	  export BLASLDFLAGS=$(pkg-config --libs openblas${LAPACK_LDSPEC})













	else















          declare -a pkg_array=$(pkg-config --list-all | grep blas${LAPACK_LDSPEC})















          for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep blas${LAPACK_LDSPEC} > /dev/null















          result=$?















          if test "x$result" = "x0"; then















            # BLAS was found













          BLAS_INCLUDE=$(pkg-config --cflags-only-I blas${LAPACK_LDSPEC})













	  export BLASFLAGS=${BLAS_INCLUDE}















	    export BLASLDFLAGS=$(pkg-config --libs blas${LAPACK_LDSPEC})













	  fi















        fi # end of BLAS decision tree















        # search for LAPACKe















        declare -a pkg_array=$(pkg-config --list-all | grep lapacke${LAPACK_LDSPEC})










@@ -25382,6 +25404,12 @@ fi



























    LAPACKLDFLAGS=${LAPACKLDFLAGS}



























      test "x$BLASLDFLAGS" != "x",













    )













    BLASFLAGS=${BLASFLAGS}

























    BLASLDFLAGS=${BLASLDFLAGS}









































 ;;















esac










@@ -25720,7 +25748,7 @@ else case e in #(













 ;;















esac















fi













CXXFLAGS="$CLANGFLAGS $OPTFLAGS -ggdb $DEBUGFLAGS $OFFLOADFLAGS $USER_INCLUDE -I$HDF5_INCLUDE $OMPFLAGS $MPIFLAGS $LAPACKFLAGS $BLASFLAGS $MAGMAFLAGS $NVTXFLAGS $REFINEFLAGS"













CXXFLAGS="$CLANGFLAGS $OPTFLAGS -ggdb $DEBUGFLAGS $OFFLOADFLAGS $USER_INCLUDE -I$HDF5_INCLUDE $OMPFLAGS $MPIFLAGS $LAPACKFLAGS $MAGMAFLAGS $NVTXFLAGS $REFINEFLAGS"















SUBDIRS="cluster libnptm sphere testing trapping"





























# Generate the output

























build/configure.ac



+23
−8




























Original line number
Diff line number
Diff line








@@ -93,7 +93,6 @@ m4_define(













      LAPACK_LDSPEC=""















      MKL_BUILD="mkl-dynamic-lp64-gomp"















    fi # end of 64-bit decision tree













    BLAS_INCLUDE=""















    BLASLDFLAGS=""















    pkg-config --version > /dev/null















    use_pkg_config=$?









@@ -109,14 +108,20 @@ m4_define(













        export LAPACKLDFLAGS=$(pkg-config --libs ${MKL_BUILD})















      else















        # MKL was not found, so configuration searches for BLAS













        declare -a pkg_array=$(pkg-config --list-all | grep openblas${LAPACK_LDSPEC})













        for i in "${pkg_array[[@]]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep openblas${LAPACK_LDSPEC} > /dev/null













        result=$?













        if test "x$result" = "x0"; then













          # OpenBLAS was found













	  export BLASLDFLAGS=$(pkg-config --libs openblas${LAPACK_LDSPEC})













	else















          declare -a pkg_array=$(pkg-config --list-all | grep blas${LAPACK_LDSPEC})















          for i in "${pkg_array[[@]]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep blas${LAPACK_LDSPEC} > /dev/null















          result=$?















          if test "x$result" = "x0"; then















            # BLAS was found













          BLAS_INCLUDE=$(pkg-config --cflags-only-I blas${LAPACK_LDSPEC})













	  export BLASFLAGS=${BLAS_INCLUDE}















	    export BLASLDFLAGS=$(pkg-config --libs blas${LAPACK_LDSPEC})













	  fi















        fi # end of BLAS decision tree















        # search for LAPACKe















        declare -a pkg_array=$(pkg-config --list-all | grep lapacke${LAPACK_LDSPEC})










@@ -549,6 +554,7 @@ AC_ARG_WITH(













    if test "x$withval" = "xno"; then















      AC_SUBST([LAPACKFLAGS], [""])















      AC_SUBST([LAPACKLDFLAGS], [""])













      AC_SUBST([BLASLDFLAGS], [""])















    else















      M4_DETECT_LAPACK















      AS_IF(









@@ -558,6 +564,11 @@ AC_ARG_WITH(













      )















      AC_SUBST([LAPACKFLAGS], [${LAPACKFLAGS}])















      AC_SUBST([LAPACKLDFLAGS], [${LAPACKLDFLAGS}])













      AS_IF(













        [test "x$BLASLDFLAGS" != "x"],













      )













      AC_SUBST([BLASFLAGS], [${BLASFLAGS}])













      AC_SUBST([BLASLDFLAGS], [${BLASLDFLAGS}])















    fi















  ],















  [









@@ -569,6 +580,10 @@ AC_ARG_WITH(













    )















    AC_SUBST([LAPACKFLAGS], [${LAPACKFLAGS}])















    AC_SUBST([LAPACKLDFLAGS], [${LAPACKLDFLAGS}])













      [test "x$BLASLDFLAGS" != "x"],













    )













    AC_SUBST([BLASFLAGS], [${BLASFLAGS}])













    AC_SUBST([BLASLDFLAGS], [${BLASLDFLAGS}])















  ]















)


























@@ -681,7 +696,7 @@ AS_IF(













  [AC_SUBST([OMPFLAGS], [""])],















  [AC_SUBST([OMPFLAGS], [$OMPFLAGS])]















)













CXXFLAGS="$CLANGFLAGS $OPTFLAGS -ggdb $DEBUGFLAGS $OFFLOADFLAGS $USER_INCLUDE -I$HDF5_INCLUDE $OMPFLAGS $MPIFLAGS $LAPACKFLAGS $BLASFLAGS $MAGMAFLAGS $NVTXFLAGS $REFINEFLAGS"













CXXFLAGS="$CLANGFLAGS $OPTFLAGS -ggdb $DEBUGFLAGS $OFFLOADFLAGS $USER_INCLUDE -I$HDF5_INCLUDE $OMPFLAGS $MPIFLAGS $LAPACKFLAGS $MAGMAFLAGS $NVTXFLAGS $REFINEFLAGS"















SUBDIRS="cluster libnptm sphere testing trapping"































# Generate the output