Changeset 410


Ignore:
Timestamp:
Mar 13, 2013 12:07:39 PM (8 years ago)
Author:
kulshres
Message:

Preprocessor SPARSE=1 should be defined in config.h instead of Makefile.am

See ​http://bugs.debian.org/700937

Reported-by: Barak A. Perlmutter <barak@…>
Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ADOL-C/src/Makefile.am

    r372 r410  
    1111##############################################################################
    1212
    13 if SPARSE
    14 AM_CFLAGS            = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1 -std=gnu99
    15 AM_CXXFLAGS          = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    16 else
    1713AM_CFLAGS            = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -std=gnu99
    1814AM_CXXFLAGS          = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1
    19 endif
    2015
    2116AM_CPPFLAGS          = -I$(top_srcdir)/ADOL-C/include -I$(top_srcdir)/ADOL-C/src

  • trunk/MSVisualStudio/v10/adolc.vcxproj

    r396 r410  
    6969  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='sparse|Win32'">
    7070    <ClCompile>
    71       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;SPARSE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     71      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    7272      <AdditionalIncludeDirectories>$(IntDir);$(ProjectDir)\ColPack\$(IntDir)\include;$(ProjectDir)..\..\ADOL-C\include;$(ProjectDir)..\..\ADOL-C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    7373      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    … …  
    9292  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='sparse|x64'">
    9393    <ClCompile>
    94       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;SPARSE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     94      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;ADOLC_DLL;ADOLC_INTERNAL=1;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    9595      <AdditionalIncludeDirectories>$(IntDir);$(ProjectDir)\ColPack\$(IntDir)\include;$(ProjectDir)..\..\ADOL-C\include;$(ProjectDir)..\..\ADOL-C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    9696      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

  • trunk/MSVisualStudio/v10/nosparse/config.h.in

    r392 r410  
    137137#define SIZEOF_VOID_P 4
    138138
     139/* Define 1 if sparse derivative propagation is to be enabled */
     140/* #undef SPARSE */
     141
    139142/* Define to 1 if you have the ANSI C header files. */
    140143#define STDC_HEADERS 1

  • trunk/MSVisualStudio/v10/sparse/config.h.in

    r392 r410  
    137137#define SIZEOF_VOID_P 4
    138138
     139/* Define 1 if sparse derivative propagation is to be enabled */
     140#define SPARSE 1
     141
    139142/* Define to 1 if you have the ANSI C header files. */
    140143#define STDC_HEADERS 1

  • trunk/MSVisualStudio/v10/x64/nosparse/config.h.in

    r392 r410  
    137137#define SIZEOF_VOID_P 8
    138138
     139/* Define 1 if sparse derivative propagation is to be enabled */
     140/* #undef SPARSE */
     141
    139142/* Define to 1 if you have the ANSI C header files. */
    140143#define STDC_HEADERS 1

  • trunk/MSVisualStudio/v10/x64/sparse/config.h.in

    r395 r410  
    137137#define SIZEOF_VOID_P 8
    138138
     139/* Define 1 if sparse derivative propagation is to be enabled */
     140#define SPARSE 1
     141
    139142/* Define to 1 if you have the ANSI C header files. */
    140143#define STDC_HEADERS 1

  • trunk/configure.ac

    r406 r410  
    309309fi
    310310AM_CONDITIONAL(SPARSE,[test x${sparse} = xyes])
     311if test x$sparse = xyes ; then
     312   AC_DEFINE(SPARSE,[1],[Define 1 if sparse derivative propagation is to be enabled])
     313fi
    311314
    312315if test x$sparse = xyes && test x$have_colpack = xyes; then
Note: See TracChangeset for help on using the changeset viewer.