modules/find/FindMETIS.cmake

@@ -283,9 +283,11 @@ int main(int argc, char **argv) {
     return 1;
 }
 ")
+unset(METIS_Idx_4 CACHE)
+unset(METIS_Idx_8 CACHE)
 check_c_source_runs("${METIS_C_TEST_METIS_Idx_4}" METIS_Idx_4)
+check_c_source_runs("${METIS_C_TEST_METIS_Idx_8}" METIS_Idx_8)
 if(NOT METIS_Idx_4)
-  check_c_source_runs("${METIS_C_TEST_METIS_Idx_8}" METIS_Idx_8)
   if(NOT METIS_Idx_8)
     set(METIS_INTSIZE -1)
   else()

modules/find/FindMUMPS.cmake

@@ -30,6 +30,7 @@
 #   - PTSCOTCH: to activate detection of MUMPS linked with PTSCOTCH
 #   - METIS: to activate detection of MUMPS linked with METIS
 #   - PARMETIS: to activate detection of MUMPS linked with PARMETIS
+#   - OPENMP: to activate detection of MUMPS linked with OPENMP
 #
 # This module finds headers and mumps library.
 # Results are reported in variables:
@@ -80,6 +81,7 @@ set(MUMPS_LOOK_FOR_SCOTCH OFF)
 set(MUMPS_LOOK_FOR_PTSCOTCH OFF)
 set(MUMPS_LOOK_FOR_METIS OFF)
 set(MUMPS_LOOK_FOR_PARMETIS OFF)
+set(MUMPS_LOOK_FOR_OPENMP OFF)
 
 if( MUMPS_FIND_COMPONENTS )
   foreach( component ${MUMPS_FIND_COMPONENTS} )
@@ -105,6 +107,9 @@ if( MUMPS_FIND_COMPONENTS )
     if (${component} STREQUAL "PARMETIS")
       set(MUMPS_LOOK_FOR_PARMETIS ON)
     endif()
+    if (${component} STREQUAL "OPENMP")
+      set(MUMPS_LOOK_FOR_OPENMP ON)
+    endif()
   endforeach()
 endif()
 
@@ -245,6 +250,19 @@ if (NOT PARMETIS_FOUND AND MUMPS_LOOK_FOR_PARMETIS)
   endif()
 endif()
 
+# MUMPS may depends on OPENMP
+#------------------------------
+if (NOT OPENMP_FOUND AND MUMPS_LOOK_FOR_OPENMP)
+  if (NOT MUMPS_FIND_QUIETLY)
+    message(STATUS "Looking for MUMPS - Try to detect OPENMP")
+  endif()
+  if (MUMPS_FIND_REQUIRED)
+    find_package(OpenMP REQUIRED)
+  else()
+    find_package(OpenMP)
+  endif()
+endif()
+
 # Looking for MUMPS
 # -----------------
 
@@ -561,6 +579,7 @@ if(MUMPS_LIBRARIES)
     endif()
   endforeach()
   set(REQUIRED_LIBS "${MUMPS_LIBRARIES}")
+
   # SCALAPACK
   if (MUMPS_LOOK_FOR_MPI AND SCALAPACK_FOUND)
     if (SCALAPACK_INCLUDE_DIRS)
@@ -652,6 +671,10 @@ if(MUMPS_LIBRARIES)
     endforeach()
     list(APPEND REQUIRED_LIBS "${PARMETIS_LIBRARIES}")
   endif()
+  # OpenMP
+  if(MUMPS_LOOK_FOR_OPENMP AND OPENMP_FOUND)
+    list(APPEND REQUIRED_LDFLAGS "${OpenMP_C_FLAGS}")
+  endif()
   # Fortran
   if (CMAKE_C_COMPILER_ID MATCHES "GNU")
     find_library(
@@ -727,9 +750,11 @@ if(MUMPS_LIBRARIES)
 	"See the explanation in FindMUMPS.cmake.")
     endif()
   endif()
+
   set(CMAKE_REQUIRED_INCLUDES)
   set(CMAKE_REQUIRED_FLAGS)
   set(CMAKE_REQUIRED_LIBRARIES)
+
 endif(MUMPS_LIBRARIES)
 
 if (MUMPS_LIBRARIES)

modules/find/FindPTSCOTCH.cmake

@@ -401,9 +401,12 @@ int main(int argc, char **argv) {
     return 1;
 }
 ")
+
+unset(PTSCOTCH_Num_4 CACHE)
+unset(PTSCOTCH_Num_8 CACHE)
 check_c_source_runs("${PTSCOTCH_C_TEST_SCOTCH_Num_4}" PTSCOTCH_Num_4)
+check_c_source_runs("${PTSCOTCH_C_TEST_SCOTCH_Num_8}" PTSCOTCH_Num_8)
 if(NOT PTSCOTCH_Num_4)
-  check_c_source_runs("${PTSCOTCH_C_TEST_SCOTCH_Num_8}" PTSCOTCH_Num_8)
   if(NOT PTSCOTCH_Num_8)
     set(PTSCOTCH_INTSIZE -1)
   else()

modules/find/FindSCOTCH.cmake

@@ -309,7 +309,7 @@ if (SCOTCH_LIBRARIES)
   if (${first_lib_path} MATCHES "/lib(32|64)?$")
     string(REGEX REPLACE "/lib(32|64)?$" "" not_cached_dir "${first_lib_path}")
     set(SCOTCH_DIR_FOUND "${not_cached_dir}" CACHE PATH "Installation directory of SCOTCH library" FORCE)
-  else()
+   else()
     set(SCOTCH_DIR_FOUND "${first_lib_path}" CACHE PATH "Installation directory of SCOTCH library" FORCE)
   endif()
 endif()
@@ -345,9 +345,12 @@ int main(int argc, char **argv) {
     return 1;
 }
 ")
+
+unset(SCOTCH_Num_4 CACHE)
+unset(SCOTCH_Num_8 CACHE)
 check_c_source_runs("${SCOTCH_C_TEST_SCOTCH_Num_4}" SCOTCH_Num_4)
+check_c_source_runs("${SCOTCH_C_TEST_SCOTCH_Num_8}" SCOTCH_Num_8)
 if(NOT SCOTCH_Num_4)
-  check_c_source_runs("${SCOTCH_C_TEST_SCOTCH_Num_8}" SCOTCH_Num_8)
   if(NOT SCOTCH_Num_8)
     set(SCOTCH_INTSIZE -1)
   else()

modules/find/FindSUITESPARSE.cmake

@@ -180,7 +180,7 @@ list(APPEND SUITESPARSE_hdrs_to_find
   "cs.h"
   "klu.h"
   "ldl.h"
-  "RBio.h"
+  #"RBio.h"
   "spqr.hpp"
   "SuiteSparse_config.h"
   "umfpack.h")
@@ -209,7 +209,7 @@ else()
       set(SUITESPARSE_${suitesparse_hdr}_DIRS "SUITESPARSE_${suitesparse_hdr}_INCLUDE_DIRS-NOTFOUND")
       find_path(SUITESPARSE_${suitesparse_hdr}_DIRS
 	NAMES ${suitesparse_hdr}
-	HINTS ${_inc_env})
+	HINTS ${_inc_env} ${_inc_env}/suitesparse)
       mark_as_advanced(SUITESPARSE_${suitesparse_hdr}_DIRS)
     endforeach()
   endif()
@@ -249,7 +249,7 @@ set(SUITESPARSE_libs_to_find
   "camd"
   "ccolamd"
   "colamd"
-  "rbio"
+  #"rbio"
   "suitesparseconfig"
   )
 

modules/precision_generator/subs.py

@@ -82,6 +82,8 @@ subs = {
     ('morse_get_s',               'morse_get_c'                      ),
     ('TASK_S',                    'TASK_C'                           ),
     ('TASK_D',                    'TASK_Z'                           ),
+    ('TASKS_S',                   'TASKS_C'                          ),
+    ('TASKS_D',                   'TASKS_Z'                          ),
     ('RUNTIME_S',                 'RUNTIME_C'                        ),
     ('RUNTIME_D',                 'RUNTIME_Z'                        ),
 
@@ -382,6 +384,8 @@ subs = {
     ('', 'TASK_stsmqr_sy', 'TASK_dtsmqr_sy', 'TASK_ctsmqr_he', 'TASK_ztsmqr_he'  ),
     ('', 'TASK_sor',       'TASK_dor',       'TASK_cun',       'TASK_zun'        ),
     ('', 'TASK_s',         'TASK_d',         'TASK_c',         'TASK_z'          ),
+    ('', 'TASKS_s',        'TASKS_d',        'TASKS_c',        'TASKS_z'         ),
+    ('', 'tasks_s',        'tasks_d',        'tasks_c',        'tasks_z'         ),
     ('', 'TASK_slan',      'TASK_dlan',      'TASK_slan',      'TASK_dlan'       ),
     ('', 'RUNTIME_S',      'RUNTIME_D',      'RUNTIME_C',      'RUNTIME_Z'       ),
     ('', 'RUNTIME_s',      'RUNTIME_d',      'RUNTIME_c',      'RUNTIME_z'       ),