Merge pull request Reference-LAPACK#1181 from ACSimon33/fortran_strlen_type

Change FORTRAN_STRLEN type in installed headers.

Author: langou

CBLAS/CMakeLists.txt

@@ -1,36 +1,23 @@
 message(STATUS "CBLAS enabled")
 enable_language(C)
 
-set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
-
-# Create a header file cblas.h for the routines called in my C programs
 include(CheckLanguage)
 check_language(Fortran)
 if(CMAKE_Fortran_COMPILER)
   enable_language(Fortran)
-  include(FortranCInterface)
-  ## Ensure that the fortran compiler and c compiler specified are compatible
-  FortranCInterface_VERIFY()
-  FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
-                          MACRO_NAMESPACE "F77_"
-                          SYMBOL_NAMESPACE "F77_")
 
   # Check for any necessary platform specific compiler flags
   include(CheckLAPACKCompilerFlags)
   CheckLAPACKCompilerFlags()
 endif()
-if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
-  message(WARNING "Reverting to pre-defined include/cblas_mangling.h")
-    configure_file(include/cblas_mangling_with_flags.h.in
-                 ${LAPACK_BINARY_DIR}/include/cblas_mangling.h)
-endif()
+
+set(LAPACK_INSTALL_EXPORT_NAME ${CBLASLIB}-targets)
 
 include(CheckCSourceCompiles)
 check_c_source_compiles("int __attribute__((weak)) main() {};"
                         HAS_ATTRIBUTE_WEAK_SUPPORT)
 
 include_directories(include ${LAPACK_BINARY_DIR}/include)
-add_subdirectory(include)
 add_subdirectory(src)
 
 macro(append_subdir_files variable dirname)
@@ -40,12 +27,6 @@ foreach(depfile ${holder})
 endforeach()
 endmacro()
 
-append_subdir_files(CBLAS_INCLUDE "include")
-install(FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-  COMPONENT Development
-  )
-
 if(BUILD_TESTING)
   add_subdirectory(testing)
   add_subdirectory(examples)

CBLAS/include/CMakeLists.txt

@@ -1,5 +1,51 @@
-set(CBLAS_INCLUDE cblas.h cblas_f77.h cblas_64.h)
+# Replace FORTRAN_STRLEN definition in cblas_f77.h if needed
+file(READ cblas_f77.h cblas_f77_h_content)
+if(FORTRAN_STRLEN_TYPE)
+  string(REPLACE
+    "#define FORTRAN_STRLEN size_t" "#define FORTRAN_STRLEN ${FORTRAN_STRLEN_TYPE}"
+    cblas_f77_h_content "${cblas_f77_h_content}")
+endif()
+file(WRITE ${LAPACK_BINARY_DIR}/include/cblas_f77.h "${cblas_f77_h_content}")
+install(
+  FILES ${LAPACK_BINARY_DIR}/include/cblas_f77.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  COMPONENT Development)
 
-file(COPY ${CBLAS_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
+if(CBLAS)
+  set(CBLAS_INCLUDE cblas.h cblas_64.h)
+  file(COPY ${CBLAS_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
+  install(FILES ${CBLAS_INCLUDE}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    COMPONENT Development)
 
-file(COPY cblas_test.h DESTINATION ${LAPACK_BINARY_DIR}/test_include)
+  file(COPY cblas_test.h DESTINATION ${LAPACK_BINARY_DIR}/test_include)
+endif()
+
+# Create a header file for CBLAS routine mangling (cblas_mangling.h)
+include(CheckLanguage)
+check_language(Fortran)
+check_language(C)
+if(CMAKE_Fortran_COMPILER AND CMAKE_C_COMPILER)
+  enable_language(Fortran)
+  enable_language(C)
+  include(FortranCInterface)
+  ## Ensure that the fortran compiler and c compiler specified are compatible
+  FortranCInterface_VERIFY()
+  FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
+                           MACRO_NAMESPACE "F77_"
+                           SYMBOL_NAMESPACE "F77_")
+
+  # Check for any necessary platform specific compiler flags
+  include(CheckLAPACKCompilerFlags)
+  CheckLAPACKCompilerFlags()
+endif()
+if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
+  message(WARNING "Reverting to pre-defined include/cblas_mangling.h")
+    configure_file(
+      cblas_mangling_with_flags.h.in
+      ${LAPACK_BINARY_DIR}/include/cblas_mangling.h)
+endif()
+
+install(FILES ${LAPACK_BINARY_DIR}/include/cblas_mangling.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  COMPONENT Development)

CBLAS/include/cblas.h

@@ -44,8 +44,6 @@ typedef enum CBLAS_SIDE {CblasLeft=141, CblasRight=142} CBLAS_SIDE;
 
 #define CBLAS_ORDER CBLAS_LAYOUT /* this for backward compatibility with CBLAS_ORDER */
 
-#include "cblas_mangling.h"
-
 /*
  * Integer specific API
  */

CBLAS/include/cblas_f77.h

@@ -9,6 +9,8 @@
 #ifndef CBLAS_F77_H
 #define CBLAS_F77_H
 
+#include "cblas_mangling.h"
+
 #include <stdarg.h>
 #include <stdint.h>
 
@@ -1007,7 +1009,7 @@ void F77_sgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const float *, const float *
 );
 void F77_sgemmtr_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const float *, const float *, FINT, const float *, FINT, const float *, float *, FINT
 #ifdef BLAS_FORTRAN_STRLEN_END
-   , size_t, size_t, size_t
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 
@@ -1046,7 +1048,7 @@ void F77_dgemm_base(FCHAR, FCHAR, FINT, FINT, FINT, const double *, const double
 );
 void F77_dgemmtr_base(FCHAR, FCHAR, FCHAR, FINT, FINT, const double *, const double *, FINT, const double *, FINT, const double *, double *, FINT
 #ifdef BLAS_FORTRAN_STRLEN_END
-   , size_t, size_t, size_t
+   , FORTRAN_STRLEN, FORTRAN_STRLEN, FORTRAN_STRLEN
 #endif
 );
 

CMAKE/CheckLAPACKCompilerFlags.cmake

@@ -57,6 +57,7 @@ macro(CheckLAPACKCompilerFlags)
 
     if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS "8")
       add_compile_definitions("$<$<COMPILE_LANGUAGE:C>:FORTRAN_STRLEN=int>")
+      set(FORTRAN_STRLEN_TYPE "int" CACHE INTERNAL "" FORCE)
     endif()
 
     # Disabling loop vectorization for GNU Fortran versions affected by
@@ -137,12 +138,14 @@ macro(CheckLAPACKCompilerFlags)
     if(UNIX)
       if(APPLE)
         add_compile_definitions("$<$<COMPILE_LANGUAGE:C>:FORTRAN_STRLEN=int>")
+        set(FORTRAN_STRLEN_TYPE "int" CACHE INTERNAL "" FORCE)
       else()
         # Get all flags added via `add_compile_options(...)`
         get_directory_property(COMP_OPTIONS COMPILE_OPTIONS)
 
         if(NOT("${CMAKE_Fortran_FLAGS};${COMP_OPTIONS}" MATCHES "-abi=64c"))
           add_compile_definitions("$<$<COMPILE_LANGUAGE:C>:FORTRAN_STRLEN=int>")
+          set(FORTRAN_STRLEN_TYPE "int" CACHE INTERNAL "" FORCE)
         endif()
       endif()
     endif()

CMakeLists.txt

@@ -258,6 +258,11 @@ endif()
 # CBLAS
 option(CBLAS "Build CBLAS" OFF)
 
+# Include cblas_f77.h and cblas_mangling.h even if CBLAS is not built
+if(CBLAS OR NOT BLAS_FOUND)
+  add_subdirectory(CBLAS/include)
+endif()
+
 if(CBLAS)
   add_subdirectory(CBLAS)
 endif()
@@ -285,7 +290,7 @@ if(LAPACK_LIBRARIES)
   check_language(Fortran)
   if(CMAKE_Fortran_COMPILER)
     enable_language(Fortran)
-    include(CheckFortranFunctionExists)
+    incldude(CheckFortranFunctionExists)
     set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
     # Check if new routine of 3.4.0 is in LAPACK_LIBRARIES
     CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LATESTLAPACK_FOUND)

LAPACKE/CMakeLists.txt

@@ -33,7 +33,6 @@ message(STATUS "Build LAPACKE double precision real: ${LAPACKE_BUILD_DOUBLE}")
 message(STATUS "Build LAPACKE single precision complex: ${LAPACKE_BUILD_COMPLEX}")
 message(STATUS "Build LAPACKE double precision complex: ${LAPACKE_BUILD_COMPLEX16}")
 
-append_subdir_files(LAPACKE_INCLUDE "include")
 append_subdir_files(SOURCES "src")
 if (LAPACKE_BUILD_SINGLE)
   append_subdir_files(SOURCES_SINGLE "src")
@@ -112,11 +111,6 @@ endif()
 target_link_libraries(${LAPACKELIB} PRIVATE ${LAPACK_LIBRARIES})
 
 lapack_install_library(${LAPACKELIB})
-install(
-  FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-  COMPONENT Development
-  )
 
 if(BUILD_TESTING)
   add_subdirectory(example)

LAPACKE/include/CMakeLists.txt

@@ -1,11 +1,28 @@
-set(LAPACKE_INCLUDE lapack.h)
-IF(LAPACKE)
-    list(APPEND LAPACKE_INCLUDE lapacke.h lapacke_config.h lapacke_utils.h)
+# Replace FORTRAN_STRLEN definition in lapack.h if needed
+file(READ lapack.h lapack_h_content)
+if(FORTRAN_STRLEN_TYPE)
+  string(REPLACE
+    "#define FORTRAN_STRLEN size_t" "#define FORTRAN_STRLEN ${FORTRAN_STRLEN_TYPE}"
+    lapack_h_content "${lapack_h_content}")
 endif()
+file(WRITE ${LAPACK_BINARY_DIR}/include/lapack.h "${lapack_h_content}")
+install(
+  FILES ${LAPACK_BINARY_DIR}/include/lapack.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  COMPONENT Development
+)
 
-file(COPY ${LAPACKE_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
+if(LAPACKE)
+  list(APPEND LAPACKE_INCLUDE lapacke.h lapacke_64.h lapacke_config.h lapacke_utils.h)
+  file(COPY ${LAPACKE_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
+  install(
+    FILES ${LAPACKE_INCLUDE}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    COMPONENT Development
+  )
+endif()
 
-# Create a header file lapacke_mangling.h for the routines called in my C programs
+# Create a header file for LAPACK routine mangling (lapacke_mangling.h)
 include(CheckLanguage)
 check_language(Fortran)
 check_language(C)
@@ -23,4 +40,10 @@ if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
   message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
   configure_file(lapacke_mangling_with_flags.h.in
                  ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
-endif()
+endif()
+
+install(
+  FILES ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  COMPONENT Development
+)