Changeset 2762


Ignore:
Timestamp:
Jun 1, 2013 8:35:30 AM (6 years ago)
Author:
stefan
Message:

add recognition of HSL 2013 version

Location:
ThirdParty/HSL/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/HSL/trunk/config.h.in

    r2543 r2762  
    2727/* Define to 1 if METIS is available */
    2828#undef COINHSL_HAS_METIS
     29
     30/* Define to 1 if HSL library is from 2013 */
     31#undef COINHSL_HSL2013
    2932
    3033/* SVN revision number of project */

  • ThirdParty/HSL/trunk/config_coinhsl.h.in

    r2543 r2762  
    3131#undef COINHSL_HAS_METIS
    3232
     33/* Define to 1 if HSL library is from 2013 */
     34#undef COINHSL_HSL2013
     35
    3336/* Version number of project */
    3437#undef COINHSL_VERSION

  • ThirdParty/HSL/trunk/config_coinhsl_default.h

    r2546 r2762  
    2929/* #undef COINHSL_HAS_MA77 */
    3030
     31/* Define to 1 if MA86 is available */
     32/* #undef COINHSL_HAS_MA86 */
     33
     34/* Define to 1 if MA97 is available */
     35/* #undef COINHSL_HAS_MA97 */
     36
    3137/* Define to 1 if MC19 is available */
    3238#define COINHSL_HAS_MC19 1
     39
     40/* Define to 1 if MC68 is available. */
     41/* #undef COINHSL_HAS_MC68 */
     42
     43/* Define to 1 if METIS is available */
     44/* #undef COINHSL_HAS_METIS */

  • ThirdParty/HSL/trunk/configure

    r2695 r2762  
    55175517
    55185518
     5519# recent autotools versions can recognize OpenMP with the following macro
     5520# this would be useful when using MA86 and MA97
     5521# AC_OPENMP
     5522
    55195523# Initialize autotools
    55205524
    … …  
    71457149*-*-irix6*)
    71467150  # Find out which ABI we are using.
    7147   echo '#line 7147 "configure"' > conftest.$ac_ext
     7151  echo '#line 7151 "configure"' > conftest.$ac_ext
    71487152  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    71497153  (eval $ac_compile) 2>&5
    … …  
    96229626   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    96239627   -e 's:$: $lt_compiler_flag:'`
    9624    (eval echo "\"\$as_me:9624: $lt_compile\"" >&5)
     9628   (eval echo "\"\$as_me:9628: $lt_compile\"" >&5)
    96259629   (eval "$lt_compile" 2>conftest.err)
    96269630   ac_status=$?
    96279631   cat conftest.err >&5
    9628    echo "$as_me:9628: \$? = $ac_status" >&5
     9632   echo "$as_me:9632: \$? = $ac_status" >&5
    96299633   if (exit $ac_status) && test -s "$ac_outfile"; then
    96309634     # The compiler can only warn and ignore the option if not recognized
    … …  
    98909894   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    98919895   -e 's:$: $lt_compiler_flag:'`
    9892    (eval echo "\"\$as_me:9892: $lt_compile\"" >&5)
     9896   (eval echo "\"\$as_me:9896: $lt_compile\"" >&5)
    98939897   (eval "$lt_compile" 2>conftest.err)
    98949898   ac_status=$?
    98959899   cat conftest.err >&5
    9896    echo "$as_me:9896: \$? = $ac_status" >&5
     9900   echo "$as_me:9900: \$? = $ac_status" >&5
    98979901   if (exit $ac_status) && test -s "$ac_outfile"; then
    98989902     # The compiler can only warn and ignore the option if not recognized
    … …  
    99949998   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    99959999   -e 's:$: $lt_compiler_flag:'`
    9996    (eval echo "\"\$as_me:9996: $lt_compile\"" >&5)
     10000   (eval echo "\"\$as_me:10000: $lt_compile\"" >&5)
    999710001   (eval "$lt_compile" 2>out/conftest.err)
    999810002   ac_status=$?
    999910003   cat out/conftest.err >&5
    10000    echo "$as_me:10000: \$? = $ac_status" >&5
     10004   echo "$as_me:10004: \$? = $ac_status" >&5
    1000110005   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1000210006   then
    … …  
    1241112415  lt_status=$lt_dlunknown
    1241212416  cat > conftest.$ac_ext <<EOF
    12413 #line 12413 "configure"
     12417#line 12417 "configure"
    1241412418#include "confdefs.h"
    1241512419
    … …  
    1251112515  lt_status=$lt_dlunknown
    1251212516  cat > conftest.$ac_ext <<EOF
    12513 #line 12513 "configure"
     12517#line 12517 "configure"
    1251412518#include "confdefs.h"
    1251512519
    … …  
    1487114875   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1487214876   -e 's:$: $lt_compiler_flag:'`
    14873    (eval echo "\"\$as_me:14873: $lt_compile\"" >&5)
     14877   (eval echo "\"\$as_me:14877: $lt_compile\"" >&5)
    1487414878   (eval "$lt_compile" 2>conftest.err)
    1487514879   ac_status=$?
    1487614880   cat conftest.err >&5
    14877    echo "$as_me:14877: \$? = $ac_status" >&5
     14881   echo "$as_me:14881: \$? = $ac_status" >&5
    1487814882   if (exit $ac_status) && test -s "$ac_outfile"; then
    1487914883     # The compiler can only warn and ignore the option if not recognized
    … …  
    1497514979   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1497614980   -e 's:$: $lt_compiler_flag:'`
    14977    (eval echo "\"\$as_me:14977: $lt_compile\"" >&5)
     14981   (eval echo "\"\$as_me:14981: $lt_compile\"" >&5)
    1497814982   (eval "$lt_compile" 2>out/conftest.err)
    1497914983   ac_status=$?
    1498014984   cat out/conftest.err >&5
    14981    echo "$as_me:14981: \$? = $ac_status" >&5
     14985   echo "$as_me:14985: \$? = $ac_status" >&5
    1498214986   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1498314987   then
    … …  
    1654516549   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1654616550   -e 's:$: $lt_compiler_flag:'`
    16547    (eval echo "\"\$as_me:16547: $lt_compile\"" >&5)
     16551   (eval echo "\"\$as_me:16551: $lt_compile\"" >&5)
    1654816552   (eval "$lt_compile" 2>conftest.err)
    1654916553   ac_status=$?
    1655016554   cat conftest.err >&5
    16551    echo "$as_me:16551: \$? = $ac_status" >&5
     16555   echo "$as_me:16555: \$? = $ac_status" >&5
    1655216556   if (exit $ac_status) && test -s "$ac_outfile"; then
    1655316557     # The compiler can only warn and ignore the option if not recognized
    … …  
    1664916653   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1665016654   -e 's:$: $lt_compiler_flag:'`
    16651    (eval echo "\"\$as_me:16651: $lt_compile\"" >&5)
     16655   (eval echo "\"\$as_me:16655: $lt_compile\"" >&5)
    1665216656   (eval "$lt_compile" 2>out/conftest.err)
    1665316657   ac_status=$?
    1665416658   cat out/conftest.err >&5
    16655    echo "$as_me:16655: \$? = $ac_status" >&5
     16659   echo "$as_me:16659: \$? = $ac_status" >&5
    1665616660   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1665716661   then
    … …  
    1885618860   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1885718861   -e 's:$: $lt_compiler_flag:'`
    18858    (eval echo "\"\$as_me:18858: $lt_compile\"" >&5)
     18862   (eval echo "\"\$as_me:18862: $lt_compile\"" >&5)
    1885918863   (eval "$lt_compile" 2>conftest.err)
    1886018864   ac_status=$?
    1886118865   cat conftest.err >&5
    18862    echo "$as_me:18862: \$? = $ac_status" >&5
     18866   echo "$as_me:18866: \$? = $ac_status" >&5
    1886318867   if (exit $ac_status) && test -s "$ac_outfile"; then
    1886418868     # The compiler can only warn and ignore the option if not recognized
    … …  
    1912419128   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1912519129   -e 's:$: $lt_compiler_flag:'`
    19126    (eval echo "\"\$as_me:19126: $lt_compile\"" >&5)
     19130   (eval echo "\"\$as_me:19130: $lt_compile\"" >&5)
    1912719131   (eval "$lt_compile" 2>conftest.err)
    1912819132   ac_status=$?
    1912919133   cat conftest.err >&5
    19130    echo "$as_me:19130: \$? = $ac_status" >&5
     19134   echo "$as_me:19134: \$? = $ac_status" >&5
    1913119135   if (exit $ac_status) && test -s "$ac_outfile"; then
    1913219136     # The compiler can only warn and ignore the option if not recognized
    … …  
    1922819232   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1922919233   -e 's:$: $lt_compiler_flag:'`
    19230    (eval echo "\"\$as_me:19230: $lt_compile\"" >&5)
     19234   (eval echo "\"\$as_me:19234: $lt_compile\"" >&5)
    1923119235   (eval "$lt_compile" 2>out/conftest.err)
    1923219236   ac_status=$?
    1923319237   cat out/conftest.err >&5
    19234    echo "$as_me:19234: \$? = $ac_status" >&5
     19238   echo "$as_me:19238: \$? = $ac_status" >&5
    1923519239   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1923619240   then
    … …  
    2221222216
    2221322217coin_has_something=no
     22218hsl2013=no
    2221422219
    2221522220
    … …  
    2244322448
    2244422449                      coin_has_something=yes
     22450                      grep -q mc68_default_control_i $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 && hsl2013=yes
    2244522451                      coin_has_hsl_mc68=yes
    2244622452  :
    … …  
    2641726423fi
    2641826424
     26425fi
     26426
     26427# MC68 and MA77 changed the interface from HSL 2012 to HSL 2013,
     26428# so we check whether we have the 2013 version (for mc68, we did this test above)
     26429# and set a compiletime define
     26430if test $coin_has_hsl_ma77 = yes ; then
     26431  grep -q ma77_solve_fredholm $srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90 && hsl2013=yes
     26432fi
     26433if test $hsl2013 = yes ; then
     26434
     26435cat >>confdefs.h <<\_ACEOF
     26436#define COINHSL_HSL2013 1
     26437_ACEOF
     26438
     26439  { echo "$as_me:$LINENO: HSL source recognized as HSL 2013" >&5
     26440echo "$as_me: HSL source recognized as HSL 2013" >&6;}
    2641926441fi
    2642026442

  • ThirdParty/HSL/trunk/configure.ac

    r2761 r2762  
    105105
    106106coin_has_something=no
     107hsl2013=no
    107108
    108109AC_DEFUN([MY_CHECK_HSLFILE],
    … …  
    145146                     [AC_DEFINE(COINHSL_HAS_MC68, [1], Define to 1 if MC68 is available.)
    146147                      coin_has_something=yes
     148                      grep -q mc68_default_control_i $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 && hsl2013=yes
    147149                      coin_has_hsl_mc68=yes],
    148150                     [coin_has_hsl_mc68=no])
    … …  
    188190  # do as if we had metis, so metis.f is not compiled
    189191  AM_CONDITIONAL(COIN_HAS_METIS, [test 1 = 1])
     192fi
     193
     194# MC68 and MA77 changed the interface from HSL 2012 to HSL 2013,
     195# so we check whether we have the 2013 version (for mc68, we did this test above)
     196# and set a compiletime define
     197if test $coin_has_hsl_ma77 = yes ; then
     198  grep -q ma77_solve_fredholm $srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90 && hsl2013=yes
     199fi
     200if test $hsl2013 = yes ; then
     201  AC_DEFINE(COINHSL_HSL2013, [1], Define to 1 if HSL library is from 2013)
     202  AC_MSG_NOTICE([HSL source recognized as HSL 2013])
    190203fi
    191204
Note: See TracChangeset for help on using the changeset viewer.