Ignore:
Timestamp:
Dec 18, 2018 10:36:05 AM (7 months ago)
Author:
mbanovic
Message:

Merged branch "medipacksupport" from "git" into "svn"

The following commits were merged:

commit 0d1b5eec2cca8afdeea3cdffa196efb6cfd60a53
Merge: 72d114b 33bfdb5
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Nov 5 10:03:04 2018 +0000

Merge branch 'medipackSupport' into 'medipacksupport'

Medipack support

See merge request adol-c/adol-c!26

commit 33bfdb5a006c782489bfef1b651ca3bdbceefaf2
Merge: ac55eab cf82982
Author: Max Sagebaum <max.sagebaum@…>
Date: Tue Oct 30 11:19:31 2018 +0100

Merge branch 'medipackSupport' into temp

commit ac55eab9dd8cb8c84926ee56456076392a047c1a
Merge: 72d114b caaac60
Author: Max Sagebaum <max.sagebaum@…>
Date: Tue Oct 30 11:14:09 2018 +0100

Merge remote-tracking branch 'origin/master' into temp

commit cf82982421aaa7d83405ffa3d0c9b6ef88251d0c
Merge: 6aeca20 caaac60
Author: Max Sagebaum <max.sagebaum@…>
Date: Tue Oct 30 11:13:25 2018 +0100

Merge remote-tracking branch 'origin/master' into medipackSupport

commit 6aeca205c2448b4bbc915eb76153ebde19448573
Author: Max Sagebaum <max.sagebaum@…>
Date: Tue Oct 23 22:30:28 2018 +0200

Added suport for ZOS, FOS, FOV forward and reverse.

commit caaac60da4c61b370d106c68064d38c42a7cb6e3
Merge: cc2e0b3 70fc288
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Oct 8 08:53:40 2018 +0000

Merge branch 'fix_adtl_hov_refcntr' into 'master'

Fix undefined reference to adtl_hov::refcounter::refcnt

See merge request adol-c/adol-c!24

commit 70fc288b9ab95b16d3179fcf239ee2208ae1a2c4
Author: Jean-Paul Pelteret <jppelteret@…>
Date: Mon Oct 1 20:53:03 2018 +0200

Fix undefined reference to adtl_hov::refcounter::refcnt

commit cc2e0b3154fb6e62580def4501c4cf3f3d8e32ef
Merge: d7400f5 7c7f24b
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Oct 1 12:26:39 2018 +0000

Merge branch 'docu' into 'master'

Refactor tapeless to traceless

See merge request adol-c/adol-c!23

commit ca397962cde23bde80e03924893e09c84d8728bf
Merge: 9cbc432 d7400f5
Author: Max Sagebaum <max.sagebaum@…>
Date: Fri Sep 28 10:07:41 2018 +0200

Merge remote-tracking branch 'origin/master' into medipackSupport

commit 9cbc4324e0d3e19f97ba5c5474121f0189e60f83
Author: Max Sagebaum <max.sagebaum@…>
Date: Thu Sep 27 14:38:30 2018 +0200

Missing MeDiPack? initialization on trace_on.

commit 76c30290365830d2370a354af949f3bf42df3885
Author: Max Sagebaum <max.sagebaum@…>
Date: Thu Sep 27 09:55:42 2018 +0200

Null pointer fix for initialization.

commit 7c7f24b25479870d58ff19d78a6e394ca28ddb58
Author: mflehmig <martin.schroschk@…>
Date: Thu Sep 20 13:16:06 2018 +0200

Refactor tapeless to traceless

As far as I can see, the official wording is traceless forward mode.
Additonally, the latex label and refs changed to 'traceless'.

commit 72d114b7ac42b8ac493030cedd1df8c9746ba5d4
Author: Max Sagebaum <max.sagebaum@…>
Date: Thu Oct 19 09:25:19 2017 +0200

Added support for MeDiPack? library.

Enable it with the configure options:
--enable-medipack --with-medipack=<path to MeDiPack?>

Tutorial on a how to use will follow.

commit b4ca76279d28407f29901d40953d02a0c5c9140e
Author: Max Sagebaum <max.sagebaum@…>
Date: Mon May 7 14:45:13 2018 +0200

Added support for cbrt function.

commit bc7b8ca61865058fac097410fd94a44fba281131
Author: Max Sagebaum <max.sagebaum@…>
Date: Thu Mar 1 10:31:18 2018 +0100

Changes for new interface.

commit cd1e82778c8540221b24559d5097bf6d00597e19
Author: Max Sagebaum <max.sagebaum@…>
Date: Thu Nov 16 14:31:07 2017 +0100

Changes to new MeDiPack? interface for adjoint values.

commit 55bcb0ffd5a9496817bffac0bd2c9489ed8ce992
Author: Max Sagebaum <max.sagebaum@…>
Date: Thu Oct 19 09:25:19 2017 +0200

Added support for MeDiPack? library.

Enable it with the configure options:
--enable-medipack --with-medipack=<path to MeDiPack?>

Tutorial on a how to use will follow.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/src/Makefile.in

    r747 r762  
    1 # Makefile.in generated by automake 1.13.4 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    1919
    2020VPATH = @srcdir@
    21 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
     21am__is_gnu_make = { \
     22  if test -z '$(MAKELEVEL)'; then \
     23    false; \
     24  elif test -n '$(MAKE_HOST)'; then \
     25    true; \
     26  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     27    true; \
     28  else \
     29    false; \
     30  fi; \
     31}
    2232am__make_running_with_option = \
    2333  case $${target_option-} in \
     
    8393host_triplet = @host@
    8494@BUILD_ADOLC_AMPI_SUPPORT_TRUE@am__append_1 = libadolcampi.la
    85 @SPARSE_TRUE@am__append_2 = int_forward_s.c int_forward_t.c \
     95@BUILD_ADOLC_MEDIPACK_SUPPORT_TRUE@am__append_2 = libadolcmedipack.la
     96@SPARSE_TRUE@am__append_3 = int_forward_s.c int_forward_t.c \
    8697@SPARSE_TRUE@                       indopro_forward_s.c indopro_forward_t.c \
    8798@SPARSE_TRUE@                       indopro_forward_pl.c \
     
    91102
    92103subdir = ADOL-C/src
    93 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
    94         $(srcdir)/config.h.in $(top_srcdir)/autoconf/depcomp
    95104ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    96105am__aclocal_m4_deps = $(top_srcdir)/autoconf/acx_builtin.m4 \
     
    104113        $(top_srcdir)/autoconf/ltversion.m4 \
    105114        $(top_srcdir)/autoconf/lt~obsolete.m4 \
     115        $(top_srcdir)/autoconf/medipack.m4 \
    106116        $(top_srcdir)/autoconf/mpi.m4 \
    107117        $(top_srcdir)/autoconf/stdcxx_11.m4 $(top_srcdir)/configure.ac
    108118am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    109119        $(ACLOCAL_M4)
     120DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
    110121mkinstalldirs = $(install_sh) -d
    111122CONFIG_HEADER = config.h
     
    125136am__v_lt_1 =
    126137@BUILD_ADOLC_AMPI_SUPPORT_TRUE@am_libadolcampi_la_rpath =
     138libadolcmedipack_la_LIBADD =
     139am__libadolcmedipack_la_SOURCES_DIST = medipacksupport.cpp \
     140        medipacksupport_p.h
     141@BUILD_ADOLC_MEDIPACK_SUPPORT_TRUE@am_libadolcmedipack_la_OBJECTS =  \
     142@BUILD_ADOLC_MEDIPACK_SUPPORT_TRUE@     medipacksupport.lo
     143libadolcmedipack_la_OBJECTS = $(am_libadolcmedipack_la_OBJECTS)
     144@BUILD_ADOLC_MEDIPACK_SUPPORT_TRUE@am_libadolcmedipack_la_rpath =
    127145libadolcsrc_la_LIBADD =
    128146am__libadolcsrc_la_SOURCES_DIST = adalloc.c rpl_malloc.c adouble.cpp \
     
    218236am__v_CXXLD_0 = @echo "  CXXLD   " $@;
    219237am__v_CXXLD_1 =
    220 SOURCES = $(libadolcampi_la_SOURCES) $(libadolcsrc_la_SOURCES)
     238SOURCES = $(libadolcampi_la_SOURCES) $(libadolcmedipack_la_SOURCES) \
     239        $(libadolcsrc_la_SOURCES)
    221240DIST_SOURCES = $(am__libadolcampi_la_SOURCES_DIST) \
     241        $(am__libadolcmedipack_la_SOURCES_DIST) \
    222242        $(am__libadolcsrc_la_SOURCES_DIST)
    223243RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
     
    263283CTAGS = ctags
    264284DIST_SUBDIRS = drivers tapedoc lie sparse
     285am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
     286        $(top_srcdir)/autoconf/depcomp
    265287DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    266288am__relativize = \
     
    419441program_transform_name = @program_transform_name@
    420442psdir = @psdir@
     443runstatedir = @runstatedir@
    421444saveCC = @saveCC@
    422445saveCXX = @saveCXX@
     
    436459MAINTAINERCLEANFILES = Makefile.in *~ *.orig adolc_config.h config.h.in
    437460EXTRA_DIST = uni5_for.c fo_rev.c ho_rev.c
    438 noinst_LTLIBRARIES = libadolcsrc.la $(am__append_1)
     461noinst_LTLIBRARIES = libadolcsrc.la $(am__append_1) $(am__append_2)
    439462libadolcsrc_la_LDFLAGS =
    440463@BUILD_ADOLC_AMPI_SUPPORT_TRUE@libadolcampi_la_SOURCES = ampisupport.cpp ampisupportAdolc.cpp \
    441464@BUILD_ADOLC_AMPI_SUPPORT_TRUE@                           ampisupportAdolc.h
     465
     466@BUILD_ADOLC_MEDIPACK_SUPPORT_TRUE@libadolcmedipack_la_SOURCES = medipacksupport.cpp \
     467@BUILD_ADOLC_MEDIPACK_SUPPORT_TRUE@                               medipacksupport_p.h
    442468
    443469libadolcsrc_la_SOURCES = adalloc.c rpl_malloc.c adouble.cpp convolut.c \
     
    453479        fixpoint.cpp fov_offset_forward.c revolve.c advector.cpp \
    454480        adouble_tl.cpp adouble_tl_indo.cpp adouble_tl_hov.cpp \
    455         param.cpp externfcts2.cpp $(am__append_2)
     481        param.cpp externfcts2.cpp $(am__append_3)
    456482all: config.h
    457483        $(MAKE) $(AM_MAKEFLAGS) all-recursive
     
    471497        $(am__cd) $(top_srcdir) && \
    472498          $(AUTOMAKE) --foreign ADOL-C/src/Makefile
    473 .PRECIOUS: Makefile
    474499Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    475500        @case '$?' in \
     
    491516
    492517config.h: stamp-h1
    493         @if test ! -f $@; then rm -f stamp-h1; else :; fi
    494         @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
     518        @test -f $@ || rm -f stamp-h1
     519        @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
    495520
    496521stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
     
    518543libadolcampi.la: $(libadolcampi_la_OBJECTS) $(libadolcampi_la_DEPENDENCIES) $(EXTRA_libadolcampi_la_DEPENDENCIES)
    519544        $(AM_V_CXXLD)$(CXXLINK) $(am_libadolcampi_la_rpath) $(libadolcampi_la_OBJECTS) $(libadolcampi_la_LIBADD) $(LIBS)
     545
     546libadolcmedipack.la: $(libadolcmedipack_la_OBJECTS) $(libadolcmedipack_la_DEPENDENCIES) $(EXTRA_libadolcmedipack_la_DEPENDENCIES)
     547        $(AM_V_CXXLD)$(CXXLINK) $(am_libadolcmedipack_la_rpath) $(libadolcmedipack_la_OBJECTS) $(libadolcmedipack_la_LIBADD) $(LIBS)
    520548
    521549libadolcsrc.la: $(libadolcsrc_la_OBJECTS) $(libadolcsrc_la_DEPENDENCIES) $(EXTRA_libadolcsrc_la_DEPENDENCIES)
     
    569597@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interfaces.Plo@am__quote@
    570598@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interfacesf.Plo@am__quote@
     599@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/medipacksupport.Plo@am__quote@
    571600@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nonl_ind_forward_s.Plo@am__quote@
    572601@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nonl_ind_forward_t.Plo@am__quote@
     
    913942        tags tags-am uninstall uninstall-am
    914943
     944.PRECIOUS: Makefile
     945
    915946
    916947# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.