Merge pull request #5 from CDAT/1.0.2

replace lapack and clapack for openblas
CDAT · Jul 2, 2018 · 304e0e5 · 304e0e5
2 parents 994aa30 + 04f5fd4
commit 304e0e5
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/cf_config.h b/cf_config.h
@@ -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
@@ -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
@@ -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 */
@@ -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 */
 

diff --git a/cf_config.h.in b/cf_config.h.in
@@ -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
 

diff --git a/configure b/configure
@@ -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
@@ -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
@@ -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 :
@@ -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
@@ -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
@@ -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

diff --git a/configure.ac b/configure.ac
@@ -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])