Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace lapack and clapack for openblas #5

Merged
merged 1 commit into from
Jul 2, 2018
+27 −17
Merged

replace lapack and clapack for openblas #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions cf_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#define HAVE_MEMORY_H 1

/* Define to 1 if you have the <mpi.h> header file. */
/* #undef HAVE_MPI_H */
#define HAVE_MPI_H 1

/* Define to 1 if you have the <netcdf.h> header file. */
#define HAVE_NETCDF_H 1
Expand All @@ -70,7 +70,7 @@
#define HAVE_STRING_H 1

/* Define this if you have strlcat() */
#define HAVE_STRLCAT 1
/* #undef HAVE_STRLCAT */

/* Define to 1 if `st_blksize' is a member of `struct stat'. */
#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
Expand All @@ -89,7 +89,7 @@
#define HAVE_UNISTD_H 1

/* Define if uuid is found */
#define HAVE_UUID_H 1
/* #undef HAVE_UUID_H */

/* if true, turn on logging */
/* #undef LOGGING */
Expand Down Expand Up @@ -178,6 +178,11 @@
# endif
#endif

/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif

/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */

Expand Down
5 changes: 5 additions & 0 deletions cf_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@
# endif
#endif

/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif

/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS

Expand Down
18 changes: 9 additions & 9 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18225,7 +18225,8 @@ for ac_lib in '' $possible_blas_library_names; do
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
LIBS="-l$ac_lib "-lgfortran"
$ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_dcopy=$ac_res
Expand Down Expand Up @@ -18288,7 +18289,8 @@ for ac_lib in '' $possible_blas_library_names; do
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
LIBS="-l$ac_lib "-lgfortran"
$ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_dcopy_=$ac_res
Expand All @@ -18313,13 +18315,11 @@ ac_res=$ac_cv_search_dcopy_
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
have_blas_underscore="yes"

fi


fi

possible_lapack_library_names="sci_quadcore_mp nag essl mkl lapack"
possible_lapack_library_names="openblas blas sci_quadcore_mp nag essl mkl lapack"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dgetrf" >&5
$as_echo_n "checking for library containing dgetrf... " >&6; }
if ${ac_cv_search_dgetrf+:} false; then :
Expand Down Expand Up @@ -18357,7 +18357,8 @@ for ac_lib in '' $possible_lapack_library_names; do
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
LIBS="-l$ac_lib "-lgfortran"
$ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_dgetrf=$ac_res
Expand Down Expand Up @@ -18420,7 +18421,8 @@ for ac_lib in '' $possible_lapack_library_names; do
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
LIBS="-l$ac_lib "-lgfortran"
$ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_dgetrf_=$ac_res
Expand All @@ -18445,10 +18447,8 @@ ac_res=$ac_cv_search_dgetrf_
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
have_lapack_underscore="yes"

fi


fi

fi
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,15 @@ possible_blas_library_names="sci_quadcore_mp nag essl mkl f77blas blas"
AC_SEARCH_LIBS([dcopy], [$possible_blas_library_names],
[have_blas="yes"],
[AC_SEARCH_LIBS([dcopy_], [$possible_blas_library_names],
[have_blas_underscore="yes"]
)]
[have_blas_underscore="yes"], [], ["-lgfortran"]
)], ["-lgfortran"]
)
possible_lapack_library_names="sci_quadcore_mp nag essl mkl lapack"
possible_lapack_library_names="openblas blas sci_quadcore_mp nag essl mkl lapack"
AC_SEARCH_LIBS([dgetrf], [$possible_lapack_library_names],
[have_lapack="yes"],
AC_SEARCH_LIBS([dgetrf_], [$possible_lapack_library_names],
[have_lapack_underscore="yes"]
)
[have_lapack_underscore="yes"], [], ["-lgfortran"]
), ["-lgfortran"]
)
fi
AC_SUBST([HAVE_LAPACK_NO_UNDERSCORE], [0])
Expand Down