Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
quilt patches for autotools and compiler warnings
- Loading branch information
Barak A. Pearlmutter
committed
Mar 6, 2014
1 parent
96f9c1f
commit ce21fb0
Showing
3 changed files
with
135 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| From: "Barak A. Pearlmutter" <barak+git@cs.nuim.ie> | ||
| Date: Thu, 6 Mar 2014 11:36:20 +0000 | ||
| Subject: automake options | ||
|
|
||
| The subdir-objects is to address this autoreconf verbiage. | ||
|
|
||
| ADOL-C/examples/additional_examples/detexam/Makefile.am:26: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/detexam/Makefile.am:26: but option 'subdir-objects' is disabled | ||
| automake: warning: possible forward-incompatibility. | ||
| automake: At least a source file is in a subdirectory, but the 'subdir-objects' | ||
| automake: automake option hasn't been enabled. For now, the corresponding output | ||
| automake: object file(s) will be placed in the top-level directory. However, | ||
| automake: this behaviour will change in future Automake versions: they will | ||
| automake: unconditionally cause object files to be placed in the same subdirectory | ||
| automake: of the corresponding sources. | ||
| automake: You are advised to start using 'subdir-objects' option throughout your | ||
| automake: project, to avoid future incompatibilities. | ||
| ADOL-C/examples/additional_examples/detexam/Makefile.am:28: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/detexam/Makefile.am:28: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/ode/Makefile.am:29: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/ode/Makefile.am:29: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/ode/Makefile.am:31: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/ode/Makefile.am:31: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/ode/Makefile.am:27: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/ode/Makefile.am:27: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/sparse/Makefile.am:31: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/sparse/Makefile.am:31: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/speelpenning/Makefile.am:26: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/speelpenning/Makefile.am:26: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:49: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:49: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:82: warning: source file '$(srcdir)/../ode/vfunc_eutroph.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:82: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:82: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:82: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:91: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:91: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:88: warning: source file '$(srcdir)/../ode/vfunc_fic.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:88: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:88: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:88: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:73: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:73: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:55: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:55: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:67: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:67: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:58: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:58: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:76: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:76: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:64: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:64: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:85: warning: source file '$(srcdir)/../ode/vfunc_robertson.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:85: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:85: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:85: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:61: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:61: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:70: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:70: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:79: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:79: but option 'subdir-objects' is disabled | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:52: warning: source file '$(srcdir)/../clock/myclock.cpp' is in a subdirectory, | ||
| ADOL-C/examples/additional_examples/timing/Makefile.am:52: but option 'subdir-objects' is disabled | ||
| --- | ||
| configure.ac | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/configure.ac b/configure.ac | ||
| index 27e04ac..e8289fc 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -22,7 +22,7 @@ AC_CONFIG_AUX_DIR([autoconf]) | ||
| AC_CONFIG_MACRO_DIR([autoconf]) | ||
| AC_CONFIG_HEADERS([ADOL-C/src/config.h]) | ||
| AC_PREFIX_DEFAULT(${HOME}/adolc_base) | ||
| -AM_INIT_AUTOMAKE([1.11 dist-bzip2 foreign]) | ||
| +AM_INIT_AUTOMAKE([1.11 dist-bzip2 foreign subdir-objects -Wall]) | ||
| AM_MAINTAINER_MODE([disable]) | ||
| AM_SILENT_RULES([yes]) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| From: "Barak A. Pearlmutter" <barak+git@cs.nuim.ie> | ||
| Date: Thu, 6 Mar 2014 11:43:01 +0000 | ||
| Subject: printf format | ||
|
|
||
| Address compiler warnings about printf format strings. | ||
| These fall into two classes. | ||
| The "%z" alone is illegal. | ||
| And a portable way to print a size_t is to cast it to long | ||
| and use a long-compatible format specifier like "%ld" or "%lu". | ||
| --- | ||
| ADOL-C/include/adolc/adtl.h | 4 ++-- | ||
| ADOL-C/src/fo_rev.c | 4 ++-- | ||
| 2 files changed, 4 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/ADOL-C/include/adolc/adtl.h b/ADOL-C/include/adolc/adtl.h | ||
| index fbfb639..6b88f3a 100644 | ||
| --- a/ADOL-C/include/adolc/adtl.h | ||
| +++ b/ADOL-C/include/adolc/adtl.h | ||
| @@ -293,7 +293,7 @@ inline bool adouble::_do_indo() { | ||
|
|
||
| inline void setNumDir(const size_t p) { | ||
| if (refcounter::refcnt > 0) { | ||
| - fprintf(DIAG_OUT, "ADOL-C Warning: Tapeless: Setting numDir will not change the number of\n directional derivative in existing adoubles and may lead to erronious results\n or memory corruption\n Number of currently existing adoubles = %z\n", refcounter::refcnt); | ||
| + fprintf(DIAG_OUT, "ADOL-C Warning: Tapeless: Setting numDir will not change the number of\n directional derivative in existing adoubles and may lead to erronious results\n or memory corruption\n Number of currently existing adoubles = %lu\n", (long)refcounter::refcnt); | ||
| } | ||
| if (p < 1) { | ||
| fprintf(DIAG_OUT, "ADOL-C Error: Tapeless: You are being a moron now.\n"); | ||
| @@ -304,7 +304,7 @@ inline void setNumDir(const size_t p) { | ||
|
|
||
| inline void setMode(enum Mode newmode) { | ||
| if (refcounter::refcnt > 0) { | ||
| - fprintf(DIAG_OUT, "ADOL-C Warning: Tapeless: Setting mode will the change the mode of\n computation in previously computed variables and may lead to erronious results\n or memory corruption\n Number of currently exisiting adoubles = %z\n", refcounter::refcnt); | ||
| + fprintf(DIAG_OUT, "ADOL-C Warning: Tapeless: Setting mode will the change the mode of\n computation in previously computed variables and may lead to erronious results\n or memory corruption\n Number of currently exisiting adoubles = %lu\n", (long)refcounter::refcnt); | ||
| } | ||
| adouble::forward_mode = newmode; | ||
| } | ||
| diff --git a/ADOL-C/src/fo_rev.c b/ADOL-C/src/fo_rev.c | ||
| index 608607d..bec6dd5 100644 | ||
| --- a/ADOL-C/src/fo_rev.c | ||
| +++ b/ADOL-C/src/fo_rev.c | ||
| @@ -429,8 +429,8 @@ int int_reverse_safe( | ||
| } | ||
| else if (swchk != ADOLC_CURRENT_TAPE_INFOS.stats[NUM_SWITCHES]) { | ||
| fprintf(DIAG_OUT, "ADOL-C error: Number of switches passed %d does not " | ||
| - "match with the one recorded on tape %d (%d)\n",swchk,tnum, | ||
| - ADOLC_CURRENT_TAPE_INFOS.stats[NUM_SWITCHES]); | ||
| + "match with the one recorded on tape %d (%lu)\n",swchk,tnum, | ||
| + (long)ADOLC_CURRENT_TAPE_INFOS.stats[NUM_SWITCHES]); | ||
| exit(-1); | ||
| } | ||
| else |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,3 @@ | ||
| 0001-libdir-okay.patch | ||
| 0002-automake-options.patch | ||
| 0003-printf-format.patch |