Changeset 1914

Timestamp:

Apr 24, 2009, 7:52:09 PM (14 years ago)

Author:

Peter

Message:

Using ACX_BLAS macro for blas detection. The behavior will likely be a
bit different from before. The major difference is that there are no
-m64 flags in the atlas tests, which implies you might need to add
-m64 to LDFLAGS (and possibly CXXFLAGS) at configure time. It also
implies that you might detect atlas on your 32bit machine, which
previously was not possible. fixes #349

There is a new configure option: '--with-blas' that can be used to
specify which blas should be used. fixes #524

refs #518

Location:

trunk

Files:

• build_support/yat-config.in (modified) (1 diff)
• configure.ac (modified) (4 diffs)
• m4/acx_blas.m4 (added)
• m4/yat_gsl.m4 (modified) (1 diff)

trunk/build_support/yat-config.in

@@ -40 +40 @@
 
 if test "x$YAT_CBLAS_LIB" = "x"; then
-  YAT_CBLAS_LIB=@YAT_CBLAS_LIB@
+  YAT_CBLAS_LIB="@YAT_CBLAS_LIB@"
 fi
 

trunk/configure.ac

@@ -125 +125 @@
 AC_MSG_NOTICE([checking for libraries])
 AC_CHECK_LIBM
-AS_IF([test "x$LIBM" != x], [LIBS="$LIBM $LIBS"]) 
-# searching for cblas. Priority 1) find a cblas library, 2) find ATLAS
-# generated cblas, and 3) fall back to GSL cblas implementation. If
-# partial ATLAS is detected the configure script fails.
-cblas_found="no"  # cblas_found may get values yes or no
-# atlas_found may get values yes, no, or partial. In some cases
-# partial atlas may be installed
-atlas_found="no"
-gslcblas_found="no" # gslcblas_found may get values yes or no
-AC_SEARCH_LIBS(cblas_sdsdot,cblas,cblas_found="yes",
-  AC_SEARCH_LIBS(ATL_sdsdot,atlas,
-    AC_SEARCH_LIBS(cblas_sdsdot,cblas,atlas_found="yes",
-                   atlas_found="partial",-m64),
-      AC_SEARCH_LIBS(cblas_dswap,gslcblas,gslcblas_found="yes"),-m64),)
-
-YAT_CBLAS_LIB=-lgslcblas
-if test ${cblas_found} = "yes"; then
-  YAT_CBLAS_LIB=-lcblas
-fi
-if test ${atlas_found} = "yes"; then
-  YAT_CXX_ADD_FLAG([CXXFLAGS], [-m64]) 
-  YAT_LD_ADD_FLAG([LDFLAGS], [-m64])
-  YAT_CBLAS_LIB=-latlas
-fi
-# used in test of gsl 
-export GSL_CBLAS_LIB=${YAT_CBLAS_LIB}
-AC_SUBST(YAT_CBLAS_LIB)
-
+
+ACX_BLAS([YAT_CBLAS_LIB=$BLAS_LIBS], [YAT_CBLAS_LIB=-lgslcblas])
 
 # GNU Scientific Library, GSL http://www.gnu.org/software/gsl/, checks
@@ -158 +132 @@
 gsl_version="1.8"
 AC_SUBST(gsl_version)
-# sets variable $yat_gsl_status to one of the following
-#   "ok" - everything is fine
-#   "no" - no gsl found
-#   "no-header" - gsl library found but no header files
-#   "old" - gsl older than $gsl_version found
-YAT_CHECK_GSL([$gsl_version])
+gsl_ok=yes
+YAT_CHECK_GSL([$gsl_version],[gsl_ok=yes])
 
 # Boost http://www.boost.org
@@ -368 +338 @@
 
 # Non-existing GSL is fatal -- sub-sequent compilation will fail.
-if test "x$yat_gsl_status" != "xok" ; then
-  all_reqs_ok="false"
-  AS_CASE([$yat_gsl_status],
-          [old],
-          [AC_MSG_WARN([
-  GSL found but not the required version. Please install
-  GSL version ${gsl_version} or later])
-          ],
-          [no-header],
-          [AC_MSG_WARN([
-  GSL header files not found. The GNU Scientific Library (GSL)
-  header files cannot be found. Please make sure GSL header
-  files are installed.])
-          ],
-          [AC_MSG_WARN([
-  GSL not found. The GNU Scientific Library (GSL) library cannot be
-  found. Please make sure GSL is installed.])
-          ])
+if test "x$gsl_ok" != "xyes" ; then
+  all_reqs_ok="false"
+  AC_MSG_WARN([
+              GSL $gsl_version (or newer) not found. The GNU
+              Scientific Library (GSL) library cannot be found. Please
+              make sure GSL is installed. Please refer to warnings
+              above for more details
+              ]) 
 fi
 
@@ -408 +368 @@
 APR_RESTORE_THE_ENVIRONMENT(CXXFLAGS, YAT_)
 APR_RESTORE_THE_ENVIRONMENT(LDFLAGS, YAT_)
-APR_RESTORE_THE_ENVIRONMENT(LIBS, YAT_PRIMARY_)
-
-# remove cblas and m
-APR_REMOVEFROM([YAT_PRIMARY_LIBS], [$YAT_CBLAS_LIB])
-APR_REMOVEFROM([YAT_PRIMARY_LIBS], [$LIBM])
-
+
+YAT_PRIMARY_LIBS=-lgsl
 YAT_LIBS="$YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM"
+AC_SUBST(YAT_PRIMARY_LIBS)
 AC_SUBST(YAT_LIBS)
+AC_SUBST(YAT_CBLAS_LIB)
 
 # set and AC_SUBST variables that are interpreted by Automake

trunk/m4/yat_gsl.m4

@@ -38 +38 @@
         ])
 
-  # check if failure was due to too old gsl
-  AS_IF([test "x$yat_gsl_status" = "xno" && \
-         test -f "$GSL_CONFIG" && $GSL_CONFIG --help >/dev/null 2>&1],
-        [yat_gsl_status="old"
-        ])
-     
-  # if everything is fine, append to gsl variables to LIBS and friends
   AS_IF([test "x$yat_gsl_status" = "xok"],
-        [LIBS="-lgsl $LIBS"
-         # grep words starting with '-L' in other words LDFLAGS
+        [# grep words startinging with '-L' in other words LDFLAGS
          for i in $GSL_LIBS; do
            AS_IF([test ${i:0:2} = "-L"],
                  [YAT_LD_ADD_FLAG([LDFLAGS], [$i])])
-         done
+         done         
         ])
+
+
 
 ]) # YAT_CHECK_GSL