config: add BLIS, sync with BLAS++

.gitignore

@@ -10,8 +10,8 @@
 __pycache__
 lapackpp-*
 build*
-config/acml_version
 config/blas
+config/blis_version
 config/cblas
 config/compiler_cxx
 config/cublas

cmake/LAPACKFinder.cmake

@@ -51,30 +51,19 @@ endif()
 #---------------------------------------- lapack
 string( TOLOWER "${lapack}" lapack_ )
 
-if ("${lapack_}" MATCHES "auto")
-    set( test_all true )
-endif()
-
-if ("${lapack_}" MATCHES "default")
-    set( test_default true )
-endif()
-
-if ("${lapack_}" MATCHES "generic")
-    set( test_generic true )
-endif()
+string( REGEX MATCH "auto|default" test_default "${lapack_}" )
+string( REGEX MATCH "auto|generic" test_generic "${lapack_}" )
 
 message( DEBUG "
 LAPACK_LIBRARIES      = '${LAPACK_LIBRARIES}'
 lapack                = '${lapack}'
 lapack_               = '${lapack_}'
 test_lapack_libraries = '${test_lapack_libraries}'
 test_default          = '${test_default}'
-test_generic          = '${test_generic}'
-test_all              = '${test_all}'")
+test_generic          = '${test_generic}'" )
 
 #-------------------------------------------------------------------------------
 # Build list of libraries to check.
-# todo: add flame?
 # todo: LAPACK_?(ROOT|DIR)
 
 set( lapack_libs_list "" )
@@ -89,12 +78,12 @@ if (test_lapack_libraries)
 endif()
 
 #---------------------------------------- default (in BLAS library)
-if (test_all OR test_default)
+if (test_default)
     list( APPEND lapack_libs_list " " )
 endif()
 
 #---------------------------------------- generic -llapack
-if (test_all OR test_generic)
+if (test_generic)
     list( APPEND lapack_libs_list "-llapack" )
 endif()
 
@@ -106,6 +95,7 @@ message( DEBUG "lapack_libs_list ${lapack_libs_list}" )
 # LAPACK++ checks for pstrf (Cholesky with pivoting) to make sure it is
 # a complete LAPACK library, since some BLAS libraries (ESSL, ATLAS)
 # contain only an optimized subset of LAPACK routines.
+# ESSL lacks [cz]symv, [cz]syr.
 
 unset( LAPACK_FOUND CACHE )
 unset( lapackpp_defs_ CACHE )

config/blas.cc

@@ -8,6 +8,7 @@
 
 #include "config.h"
 
+//------------------------------------------------------------------------------
 #define BLAS_ddot FORTRAN_NAME( ddot, DDOT )
 
 // result return directly
@@ -19,6 +20,7 @@ double BLAS_ddot(
     const double* x, const blas_int* incx,
     const double* y, const blas_int* incy );
 
+//------------------------------------------------------------------------------
 int main()
 {
     // If blas_int is 32-bit, but BLAS actually interprets it as 64-bit,
@@ -28,7 +30,15 @@ int main()
     blas_int n[] = { 5, 5 }, ione = 1;
     double x[] = { 1, 2, 3, 4, 5 };
     double y[] = { 5, 4, 3, 2, 1 };
+    for (int i = 0; i < n[0]; ++i) {
+        printf( "x[ %d ] = %.1f; y[ %d ] = %.1f\n",
+                i, x[ i ],
+                i, y[ i ] );
+    }
+
     double result = BLAS_ddot( n, x, &ione, y, &ione );
+    printf( "result = %.1f; should be 35.0\n", result );
+
     bool okay = (result == 35);
     printf( "%s\n", okay ? "ok" : "failed" );
     return ! okay;

config/acml_version.cc → config/blis_version.cc

@@ -1,16 +1,14 @@
-// Copyright (c) 2017-2023, University of Tennessee. All rights reserved.
+// Copyright (c) 2017-2024, University of Tennessee. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the BSD 3-Clause license. See the accompanying LICENSE file.
 
 #include <stdio.h>
-#include <mkl.h>
+#include <blis.h>
 
 int main()
 {
-    int major, minor, patch, build;
-    acmlversion( &major, &minor, &patch, &build );
-    printf( "ACML_VERSION=%d.%d.%d.%d\n",
-            major, minor, patch, build );
+    const char* v = bli_info_get_version_str();
+    printf( "BLIS_VERSION=%s\n", v );
     return 0;
 }

config/cblas.cc

@@ -38,12 +38,21 @@
     #endif
 #endif
 
+//------------------------------------------------------------------------------
 int main()
 {
     int n = 5;
     double x[] = { 1, 2, 3, 4, 5 };
     double y[] = { 5, 4, 3, 2, 1 };
+    for (int i = 0; i < n; ++i) {
+        printf( "x[ %d ] = %.1f; y[ %d ] = %.1f\n",
+                i, x[ i ],
+                i, y[ i ] );
+    }
+
     double result = cblas_ddot( n, x, 1, y, 1 );
+    printf( "result = %.1f; should be 35.0\n", result );
+
     bool okay = (result == 35);
     printf( "%s\n", okay ? "ok" : "failed" );
     return ! okay;

config/config.py

@@ -993,7 +993,7 @@ def parse_args():
 
     # Parse name=value pairs.
     for arg in opts.options:
-        s = re.search( '^(\w+)=(.*)', arg )
+        s = re.search( r'^(\w+)=(.*)', arg )
         if (s):
             environ[ s.group(1) ] = s.group(2)
         else: