[Trilinos-Users] [11.12.1] UMFPACK>=5.6.0 from Suite-sparse 4.4.2 does not have UFconfig.h

[Bartlett, Roscoe A.]

Denis,

We could allow the user to override the list of headers to look for with a given (generic) TPLs.  For example, for UMFPACK you could configure with:

  -D UMFPACK_HEADER_NAMES="umfpack.h;amd.h;UFconfig.h;SuiteSparse_config.h"

That would mirror what is already supported for overriding the list of library names with for a TPL, for example, with:

  -D UMFPACK_LIBRARY_NAMES="<name1>;<name2>;..."

Would that be sufficient in the short term?

Otherwise, someone would need to write a "smart" find module that looks for/at specific versions of UMFPACT and adjust accordingly.   That is a much harder problem and one we are not ready to deal with yet (other higher priories for the build/test system).

-Ross

_______________________________________________________________________________
Dr. Roscoe A. Bartlett, PhD
Oak Ridge National Laboratory
CASL Physics Integration Software Engineering Lead
Trilinos Software Engineering Technologies and Integration Lead
http://web.ornl.gov/~8vt/






From: trilinos-users-bounces at software.sandia.gov [mailto:trilinos-users-bounces at software.sandia.gov] On Behalf Of Denis Davydov
Sent: Thursday, January 15, 2015 1:00 PM
To: trilinos-users at software.sandia.gov
Subject: Re: [Trilinos-Users] [11.12.1] UMFPACK>=5.6.0 from Suite-sparse 4.4.2 does not have UFconfig.h

Denis,
  I need to find a mechanism to support both of these options. We have users
who use the old
UF_config. Is there a way to patch FindTPLUMFPACK.cmake to support both ?

well, the patch I apply to sort UMFPACK and Superlu_Dist issues is below.
I suppose if one do something like:

          REQUIRED_HEADERS umfpack.h amd.h UFconfig.h SuiteSparse_config.h

while not asking

    MUST_FIND_ALL_HEADERS

then it could work.
But I am a user myself ;-)
Your question is rather to developers who wrote CMake scripts, namely TRIBITS_TPL_DECLARE_LIBRARIES()

Regards,
Denis.

==
diff --git a/cmake/TPLs/FindTPLUMFPACK.cmake b/cmake/TPLs/FindTPLUMFPACK.cmake
index e26fc7e..f0b7ab6 100644
--- a/cmake/TPLs/FindTPLUMFPACK.cmake
+++ b/cmake/TPLs/FindTPLUMFPACK.cmake
@@ -55,6 +55,6 @@


 TRIBITS_TPL_DECLARE_LIBRARIES( UMFPACK
-  REQUIRED_HEADERS umfpack.h amd.h UFconfig.h
+  REQUIRED_HEADERS umfpack.h amd.h SuiteSparse_config.h
   REQUIRED_LIBS_NAMES umfpack amd
   )
diff --git a/packages/amesos/src/Amesos_Superludist.cpp b/packages/amesos/src/Amesos_Superludist.cpp
index 1fcac5d..12036fa 100644
--- a/packages/amesos/src/Amesos_Superludist.cpp
+++ b/packages/amesos/src/Amesos_Superludist.cpp
@@ -473,8 +473,8 @@ int Amesos_Superludist::Factor()
     else                    PrivateSuperluData_->options_.ReplaceTinyPivot = (yes_no_t)NO;

     if( IterRefine_ == "NO" ) PrivateSuperluData_->options_.IterRefine = (IterRefine_t)NO;
-    else if( IterRefine_ == "DOUBLE" ) PrivateSuperluData_->options_.IterRefine = DOUBLE;
-    else if( IterRefine_ == "EXTRA" ) PrivateSuperluData_->options_.IterRefine = EXTRA;
+    else if( IterRefine_ == "DOUBLE" ) PrivateSuperluData_->options_.IterRefine = SLU_DOUBLE;
+    else if( IterRefine_ == "EXTRA" ) PrivateSuperluData_->options_.IterRefine = SLU_EXTRA;

     //  Without the following two lines, SuperLU_DIST cannot be made
     //  quiet.



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://software.sandia.gov/pipermail/trilinos-users/attachments/20150115/52f2b9e5/attachment.html>