Ignore:
Timestamp:
Mar 5, 2011 12:06:15 PM (9 years ago)
Author:
stefan
Message:

check for AMD and CHOLMOD and GLPK's AMD in configure; compile ClpCholeskyUfl? only if AMD, CHOLMOD, or GLPK available

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
        3 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        4 Data/Netlib  https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
        5 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        6 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        7 Osi  https://projects.coin-or.org/svn/Osi/trunk/Osi
        8 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         4ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         5ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         6ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         7Data/Netlib   https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
         8Data/Sample   https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         10Osi           https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
  • trunk/Clp/src/unitTest.cpp

    r1665 r1691  
    5050// Function Prototypes. Function definitions is in this file.
    5151void testingMessage( const char * const msg );
    52 #if UFL_BARRIER
     52#if defined(COIN_HAS_AMD) || defined(COIN_HAS_CHOLMOD) || defined(COIN_HAS_GLPK)
    5353static int barrierAvailable = 1;
    5454static std::string nameBarrier = "barrier-UFL";
     
    11141114                    } else {
    11151115                         nameAlgorithm = "barrier-slow";
    1116 #ifdef UFL_BARRIER
     1116#if defined(COIN_HAS_AMD) || defined(COIN_HAS_CHOLMOD) || defined(COIN_HAS_GLPK)
    11171117                         solveOptions.setSpecialOption(4, 4);
    11181118                         nameAlgorithm = "barrier-UFL";
Note: See TracChangeset for help on using the changeset viewer.