[Getfem-commits] [getfem-commits] branch master updated: Remove detection of blas64 in matlab

[Konstantinos Poulios]

This is an automated email from the git hooks/post-receive script.

logari81 pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new 96250123 Remove detection of blas64 in matlab
96250123 is described below

commit 9625012326b595d08ca3f8372e9b66e82c3604ec
Author: Konstantinos Poulios <logari81@gmail.com>
AuthorDate: Tue Mar 26 12:50:48 2024 +0100

    Remove detection of blas64 in matlab
    
      - deployment of BLAS is already too messy to try to automatically
        detect its features by heuristic methods
      - remove redundant preprocessor if-statement
---
 configure.ac                 | 21 +--------------------
 src/gmm/gmm_blas_interface.h |  2 --
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index ea077f22..33faee1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,7 +547,7 @@ fi
 acx_blas_save_LIBS="$LIBS"
 LIBS="$LIBS $FLIBS"
 echo "BLAS_LIBS=$BLAS_LIBS"
-# First, check BLAS_LIBS environment variable
+# First, check BLAS_LIBS environment variable (can also be set using the 
--with-blas=<lib> option)
 if test "x$BLAS_LIBS" = xbuiltin; then
   echo "Using builtin blas lib";
   BLAS_LIBS=""
@@ -665,25 +665,6 @@ AC_ARG_ENABLE(blas64-support,
           no) useblas64support=NO;;
           esac], [useblas64support=NO])
 
-if test x$useblas64support = xNO && test x$usematlab = xYES; then
-  # 32 or 64 bits blas interface
-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-  #include <stdlib.h>
-  int main() {
-    int a; long b;
-    int *pa; long *pb; void *pc;
-
-    if (sizeof(long) > sizeof(int)) {
-      a = 0x3E0024; b = 0;
-      pb = &b; pc = (void *)(pb); pa = (int *)(pc); *pa = a;
-      if (int(b) != a) exit(1);
-      *pa = 0x3E0024;
-      if (int(b) != a) exit(1);
-      if (b != long(a)) exit(1);
-    } 
-  } ]])],[useblas64support=YES],[],[])
-fi
-
 if test x$useblas64support = xYES; then
   AC_DEFINE(GMM_USE_BLAS64_INTERFACE,,[Use blas with 64 bits integers])
 fi
diff --git a/src/gmm/gmm_blas_interface.h b/src/gmm/gmm_blas_interface.h
index cab18d7d..4c8deddf 100644
--- a/src/gmm/gmm_blas_interface.h
+++ b/src/gmm/gmm_blas_interface.h
@@ -183,7 +183,6 @@ namespace gmm {
     void  sger_(...); void  dger_(...); void  cgerc_(...); void  zgerc_(...);
   }
 
-#if 1
 
   /* ********************************************************************* */
   /* vect_norm2(x).                                                        */
@@ -1009,7 +1008,6 @@ namespace gmm {
   trsv_interface(upper_tri_solve, trsv_lower, gem_p1_c, gem_trans1_c,
                  ztrsv_, BLAS_Z)
 
-#endif
 }
 
 #endif // GMM_BLAS_INTERFACE_H