Changeset 471


Ignore:
Timestamp:
Feb 19, 2014 1:11:34 PM (6 years ago)
Author:
kulshres
Message:

merge branch 'master' of 'gitclone' into 'svn'

The following commits were merged:

commit 6e104d84715fd2ba2926f8c99f3ebe51a7d49f4a
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Feb 19 18:58:40 2014 +0100

get make test to work again

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit a937e606f3e0e1c2172affffc4d42455cafc89c3
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Feb 19 18:50:01 2014 +0100

simplify linking with colpack

based on the conversation with Jean Utke, we don't need to store
COLPACK_CFLAGS/COLPACK_LIBS etc. Once the check passes in configure
everything is already set up.

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 9e63d3b2f653139a1a7bfe8fa1963c93e9640b62
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Feb 19 18:22:45 2014 +0100

don't use stubs library for real compilation

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit cb1deda1f278fc9150ab5a11eecef15f8f76cb7b
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Wed Feb 19 18:13:27 2014 +0100

change LDFLAGS for configure

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 8a02c2d81b286b0869ec7ff207c2238001c29fe3
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Feb 17 19:33:54 2014 +0100

try to deal with non -fPIC mpi libraries

don't use mpicc in the linking step for lib@adolclib@.so
shared libraries cannot be linked with static libraries
mpicc/mpicxx is required to link any user programmes anyway.

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 76e70c141f223e36035492c5742075110449bbd9
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Feb 17 14:19:06 2014 +0100

allow user to call the resulting library whatever they want

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
trunk
Files:
1 added
26 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/Makefile.am

    r354 r471  
    1414
    1515if DOCEXA
    16 SUBDIRS              = src examples test
     16SUBDIRS              = src . test examples
    1717else
    1818if ADDEXA
    19 SUBDIRS              = src examples test
     19SUBDIRS              = src . test examples
    2020else
    2121if PAREXA
    22 SUBDIRS              = src examples test
     22SUBDIRS              = src . test examples
    2323else
    24 SUBDIRS              = src test
     24SUBDIRS              = src . test
    2525endif
    2626endif
     
    3131MAINTAINERCLEANFILES = Makefile.in
    3232
    33 test: all
     33lib_LTLIBRARIES = lib@adolclib@.la
     34lib@adolclib@_la_LDFLAGS  = -version-info 3:0:2 -no-undefined
     35lib@adolclib@_la_SOURCES  =
     36
     37lib@adolclib@_la_LIBADD = src/libadolcsrc.la
     38
     39if BUILD_ADOLC_AMPI_SUPPORT
     40lib@adolclib@_la_LIBADD  += src/libadolcampi.la
     41endif
     42
     43lib@adolclib@_la_LIBADD  += src/drivers/libdrivers.la src/tapedoc/libtapedoc.la
     44
     45if SPARSE
     46lib@adolclib@_la_LIBADD   += src/sparse/libsparse.la
     47endif
     48
     49CC = $(saveCC)
     50CXX = $(saveCXX)
     51
     52test:
    3453        cd test; $(MAKE) test
    3554
    36 
     55.PHONY: test
  • trunk/ADOL-C/examples/Makefile.am

    r439 r471  
    1616
    1717LDADD                   = -l${adolclib}
    18 AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS              = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES    = Makefile.in *~ *.orig ADOLC-*.tap
  • trunk/ADOL-C/examples/additional_examples/checkpointing/Makefile.am

    r439 r471  
    1616
    1717LDADD                 = -l${adolclib}
    18 AM_LDFLAGS            = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS            = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES  = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/detexam/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.am

    r439 r471  
    1616
    1717LDADD                  = -l${adolclib}
    18 AM_LDFLAGS             = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS             = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES   = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.am

    r439 r471  
    1616
    1717LDADD                  = -l${adolclib}
    18 AM_LDFLAGS             = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS             = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES   = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/helm/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/hessmat/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/lighthouse/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/lufact/Makefile.am

    r439 r471  
    1717
    1818LDADD                = -l${adolclib}
    19 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     19AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    2020
    2121EXTRA_DIST           = LU.h
  • trunk/ADOL-C/examples/additional_examples/ode/Makefile.am

    r439 r471  
    1717
    1818LDADD                = -l${adolclib}
    19 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     19AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    2020
    2121MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/openmp_exam/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/pow/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/scal/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/sparse/Makefile.am

    r439 r471  
    1616
    1717LDADD                   = -l${adolclib}
    18 AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS              = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES    = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/speelpenning/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/tapesave/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/taylor/Makefile.am

    r439 r471  
    1616
    1717LDADD                = -l${adolclib}
    18 AM_LDFLAGS           = -L$(top_builddir)/ADOL-C/src
     18AM_LDFLAGS           = -L$(top_builddir)/ADOL-C
    1919
    2020MAINTAINERCLEANFILES = Makefile.in *~ *.orig
  • trunk/ADOL-C/examples/additional_examples/timing/Makefile.am

    r439 r471  
    1717
    1818LDADD                   = -l${adolclib}
    19 AM_LDFLAGS              = -L$(top_builddir)/ADOL-C/src
     19AM_LDFLAGS              = -L$(top_builddir)/ADOL-C
    2020
    2121CTRLFILES               = detexam.ctrl \
  • trunk/ADOL-C/src/Makefile.am

    r456 r471  
    2626EXTRA_DIST           = uni5_for.c fo_rev.c ho_rev.c
    2727
    28 
     28noinst_LTLIBRARIES      = libadolcsrc.la
     29libadolcsrc_la_LDFLAGS  =
    2930
    3031if BUILD_ADOLC_AMPI_SUPPORT
    31 lib_LTLIBRARIES      = libadolc_ampi.la
    32 noinst_LTLIBRARIES   = libadolc.la
    33 libadolc_ampi_la_LDFLAGS  = -version-info 2:1:1 -no-undefined
    34 libadolc_la_LDFLAGS  =
    35 libadolc_ampi_la_LIBADD = libadolc.la
    36 libadolc_ampi_la_SOURCES = ampisupport.cpp ampisupportAdolc.cpp \
     32noinst_LTLIBRARIES       += libadolcampi.la
     33libadolcampi_la_SOURCES  = ampisupport.cpp ampisupportAdolc.cpp \
    3734                           ampisupportAdolc.h
    38 else
    39 lib_LTLIBRARIES      = libadolc.la
    40 libadolc_la_LDFLAGS  = -version-info 2:1:1 -no-undefined
    4135endif
    4236
    4337
    44 libadolc_la_SOURCES  = adalloc.c malloc.c adouble.cpp \
     38libadolcsrc_la_SOURCES  = adalloc.c malloc.c adouble.cpp \
    4539                       convolut.c fortutils.c \
    4640                       interfaces.cpp interfacesf.c \
     
    5852                       advector.cpp adouble_tl.cpp
    5953
    60 libadolc_la_LIBADD   = drivers/libdrivers.la tapedoc/libtapedoc.la
    61 
    6254if SPARSE
    63 libadolc_la_SOURCES  += int_forward_s.c int_forward_t.c \
     55libadolcsrc_la_SOURCES  += int_forward_s.c int_forward_t.c \
    6456                       indopro_forward_s.c indopro_forward_t.c \
    6557                       nonl_ind_forward_s.c nonl_ind_forward_t.c \
     
    6759                       int_reverse_s.c int_reverse_t.c
    6860
    69 libadolc_la_LIBADD   += sparse/libsparse.la
    70 libadolc_la_LDFLAGS  += @COLPACK_LIBS@
    7161endif
  • trunk/ADOL-C/src/sparse/Makefile.am

    r354 r471  
    1313AM_CFLAGS                = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    1414AM_CXXFLAGS              = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    15 AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
     15AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/src
    1616
    1717MAINTAINERCLEANFILES     = Makefile.in *~ *.orig
  • trunk/ADOL-C/test/Makefile.am

    r439 r471  
    1919fminmax_SOURCES         = fminmax.cpp
    2020
    21 powexam_LDADD           = ../src/lib${adolclib}.la
    22 speelpenning_LDADD = ../src/lib${adolclib}.la
    23 fminmax_LDADD           = ../src/lib${adolclib}.la
     21powexam_LDADD           = ../lib${adolclib}.la
     22speelpenning_LDADD = ../lib${adolclib}.la
     23fminmax_LDADD           = ../lib${adolclib}.la
    2424
    2525AM_CFLAGS               = @ac_adolc_cflags@
  • trunk/Makefile.am

    r439 r471  
    4141        cd ADOL-C; $(MAKE) test
    4242
     43.PHONY: test
  • trunk/autoconf/ampi.m4

    r439 r471  
    2626
    2727  keepLIBS="$LIBS"
    28 
    2928  LIBS="$LIBS -lampiADtoolStubsOO"
    3029
  • trunk/autoconf/mpi.m4

    r439 r471  
    5858fi
    5959
     60saveCC="$CC"
     61saveCXX="$CXX"
     62AC_SUBST(saveCC)
     63AC_SUBST(saveCXX)
     64
    6065if test x"$adolc_ampi_support" = "xyes";
    6166then
  • trunk/configure.ac

    r461 r471  
    5959AC_DEFINE(ADOLC_AMPI_SUPPORT,1,[defined if adjoinable MPI support is to be compiled in])
    6060fi
    61 MPI_CONF_PRE
    6261
    6362# checks for programs
     
    7069AC_LIBTOOL_WIN32_DLL
    7170AC_PROG_LIBTOOL
     71
     72MPI_CONF_PRE
    7273
    7374AC_CHECK_SIZEOF([void *])
     
    300301            [sparse="no"
    301302             AC_MSG_RESULT(no)])
    302 AC_ARG_WITH(colpack,
    303         [
    304 AS_HELP_STRING([--with-colpack=DIR],[path to the colpack library and headers [default=system libraries]])],
    305 [
    306 colpack=$withval
    307 COLPACK_CFLAGS="$ac_adolc_openmpflag -I$colpack/include"
    308 if test x${_lib} != xlib ; then
    309    D[[0]]="$colpack/${_lib}"
    310    D[[1]]="$colpack/lib"
    311 else
    312    D[[0]]="$colpack/${_lib}"
    313 fi
    314 ],
    315 [
    316 COLPACK_CFLAGS="$ac_adolc_openmpflag"
    317 COLPACK_LIBS="$ac_adolc_openmpflag -lColPack"
    318 D[[0]]=""
    319 ])
    320 
    321 AC_LANG_PUSH([C++])
    322 save_CPPFLAGS="$CPPFLAGS"
    323 save_LIBS="$LIBS"
    324 CPPFLAGS="$CPPFLAGS $COLPACK_CFLAGS"
    325 AC_CHECK_HEADER([ColPack/ColPackHeaders.h],[have_colpackheaders=yes],[have_colpackheaders=no])
    326 for ((i=0; i < ${#D[@]} ; i++)); do
    327 COLPACK_LIBDIR="${D[[$i]]}"
    328 if test -n "$COLPACK_LIBDIR" ; then
    329 COLPACK_LIBS="$ac_adolc_openmpflag -L$COLPACK_LIBDIR -lColPack"
    330 fi
    331 LIBS="$COLPACK_LIBS $LIBS"
    332 if test x$have_colpackheaders = xyes ; then
    333    AC_MSG_CHECKING(for libColPack in $COLPACK_LIBDIR)
    334    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ColPack/ColPackHeaders.h>],
    335                         [ColPack::GraphColoring g])],
    336                        [have_colpack=yes],
    337                        [have_colpack=no])
    338    AC_MSG_RESULT($have_colpack)
    339    if test x$have_colpack = xyes ; then
    340       break
    341    fi
    342 else
    343     have_colpack=no
    344 fi
    345 done
    346 CPPFLAGS="$save_CPPFLAGS"
    347 LIBS="$save_LIBS"
    348 AC_LANG_POP([C++])
    349 
    350 AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes])
    351 if test x$have_colpack = xyes; then
    352    sparse=yes
    353    echo "will build sparse drivers as linking with -lColPack succeeded"
    354 fi
     303
     304COLPACK_CONF
     305
    355306AM_CONDITIONAL(SPARSE,[test x${sparse} = xyes])
     307
    356308if test x$sparse = xyes ; then
    357309   AC_DEFINE(SPARSE,[1],[Define 1 if sparse derivative propagation is to be enabled])
    358310fi
    359 
    360 if test x$sparse = xyes && test x$have_colpack = xyes; then
    361         AC_DEFINE(HAVE_LIBCOLPACK,[1],[Define 1 if ColPack is available])
    362 else
    363         COLPACK_CFLAGS=""
    364         COLPACK_LIBS=""
    365 fi
    366 AC_SUBST(COLPACK_CFLAGS)
    367 AC_SUBST(COLPACK_LIBS)
    368311
    369312# ADOL-C Examples
     
    452395MPI_CONF_POST
    453396AMPI_CONF
     397
     398AC_ARG_WITH(soname,
     399            [AS_HELP_STRING([--with-soname=NAME],
     400              [user can choose what to call his library here [default: if ampi enabled then adolc_ampi otherwise adolc]])],
     401      [adolclib=$withval])
    454402
    455403AC_SUBST(adolclib)
Note: See TracChangeset for help on using the changeset viewer.