Skip to content

Commit

Permalink
debug 15
Browse files Browse the repository at this point in the history
  • Loading branch information
nilason committed Sep 2, 2024
1 parent 9fab3f8 commit 93ad410
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/apt.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
bison
build-essential
flex
libblas-dev
libbz2-dev
libcairo-dev
libfftw3-dev
libgdal-dev
libgl1-mesa-dev
libglu1-mesa-dev
liblapacke-dev
libnetcdf-dev
libopenblas-dev
libpdal-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_ubuntu-22.04.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export INSTALL_PREFIX=$1
--with-cxx \
--with-zstd \
--with-bzlib \
--with-blas=blas-netlib \
--with-blas=openblas \
--with-lapack \
--with-libsvm \
--with-readline \
Expand Down
19 changes: 10 additions & 9 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -13771,25 +13771,26 @@ if test -n "$USE_BLAS"; then
BLASINC=$(${PKG_CONFIG} --cflags ${BLAS_PKG})

save_CFLAGS="$CFLAGS"; CFLAGS="$BLASINC $CFLAGS"
save_LDFLAGS="$LDFLAGS"; LDFLAGS="-L/usr/lib/x86_64-linux-gnu/blas $BLASLIB $LDFLAGS"
save_LDFLAGS="$LDFLAGS"; LDFLAGS="$BLASLIB $LDFLAGS"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: CFLAGS: \"$CFLAGS\"" >&5
printf "%s\n" "$as_me: CFLAGS: \"$CFLAGS\"" >&6;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: LDFLAGS: \"$LDFLAGS\"" >&5
printf "%s\n" "$as_me: LDFLAGS: \"$LDFLAGS\"" >&6;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: LIBS: \"$LIBS\"" >&5
printf "%s\n" "$as_me: LIBS: \"$LIBS\"" >&6;}
for ac_header in cblas.h
do :
ac_fn_c_check_header_compile "$LINENO" "cblas.h" "ac_cv_header_cblas_h" "$ac_includes_default"
if test "x$ac_cv_header_cblas_h" = xyes
ac_fn_c_check_header_compile "$LINENO" "cblas.h," "ac_cv_header_cblas_h_" "$ac_includes_default"
if test "x$ac_cv_header_cblas_h_" = xyes
then :
printf "%s\n" "#define HAVE_CBLAS_H 1" >>confdefs.h
printf "%s\n" "#define HAVE_CBLAS_H_ 1" >>confdefs.h

fi
ac_fn_c_check_header_compile "$LINENO" "cblas-atlas.h" "ac_cv_header_cblas_atlas_h" "$ac_includes_default"
if test "x$ac_cv_header_cblas_atlas_h" = xyes
then :
printf "%s\n" "#define HAVE_CBLAS_ATLAS_H 1" >>confdefs.h

else $as_nop
as_fn_error $? "*** Unable to find \"cblas.h\" with \"$CFLAGS\"." "$LINENO" 5
fi

done

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for linking to BLAS" >&5
printf %s "checking for linking to BLAS... " >&6; }
Expand Down
5 changes: 2 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1615,12 +1615,11 @@ if test -n "$USE_BLAS"; then
BLASINC=$(${PKG_CONFIG} --cflags ${BLAS_PKG})

save_CFLAGS="$CFLAGS"; CFLAGS="$BLASINC $CFLAGS"
save_LDFLAGS="$LDFLAGS"; LDFLAGS="-L/usr/lib/x86_64-linux-gnu/blas $BLASLIB $LDFLAGS"
save_LDFLAGS="$LDFLAGS"; LDFLAGS="$BLASLIB $LDFLAGS"
AC_MSG_NOTICE([CFLAGS: "$CFLAGS"])
AC_MSG_NOTICE([LDFLAGS: "$LDFLAGS"])
AC_MSG_NOTICE([LIBS: "$LIBS"])
AC_CHECK_HEADERS([cblas.h], [],
AC_MSG_ERROR([*** Unable to find "cblas.h" with "$CFLAGS".]))
AC_CHECK_HEADERS([cblas.h, cblas-atlas.h])

AC_MSG_CHECKING([for linking to BLAS])
dnl AC_LINK_IFELSE([AC_LANG_PROGRAM(
Expand Down

0 comments on commit 93ad410

Please sign in to comment.