Changeset 630ca9 in git


Ignore:
Timestamp:
Mar 23, 2011, 6:39:21 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
20d9284f2e2a49cb47ad41808ddefe8b058c7647
Parents:
1b49fffcc09b3cc35d86a2d919252c972d6515eb
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-23 18:39:21+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:12+01:00
Message:
FIX: separate debug/optimized flags for resources and coeffs
FIX: longrat.cc: missing "coeff" arguments!
Location:
libpolys
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • libpolys/coeffs/Makefile.am

    r1b49ff r630ca9  
    1 AM_CXXFLAGS     = -fno-implicit-templates --no-exceptions
    2 INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir}
    3 AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc
    4 AM_CPPFLAGS     = -DNDEBUG -DOM_NDEBUG
    5 
    6 SOURCES = \
    7         gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
    8         modulop.cc mpr_complex.cc \
    9         numbers.cc rintegers.cc rmodulo2m.cc rmodulon.cc shortfl.cc
    10 
    111lib_LIBRARIES=libcoeffs.a libcoeffs_g.a
    122
    13 libcoeffs_a_SOURCES = ${SOURCES}
    14 libcoeffs_g_a_SOURCES = ${SOURCES}
     3CXXTEMPLFLAGS      = -fno-implicit-templates --no-exceptions
    154
    16 libcoeffs_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    17 # -fdiagnostics-show-option
    18 noinst_HEADERS= \
    19         gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h \
    20         mpr_complex.h mpr_global.h \
    21         rintegers.h rmodulo2m.h rmodulon.h shortfl.h
     5libcoeffs_a_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
     6libcoeffs_g_a_CFLAGS = ${PIPE}
     7
     8libcoeffs_a_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     9libcoeffs_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
     10# -fdiagnostics-show-option
     11
     12libcoeffs_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     13libcoeffs_g_a_CPPFLAGS = -DHAVE_CONFIG_H
     14
    2215
    2316include_HEADERS = coeffs.h numbers.h
    2417
    25 ## debug version:
     18noinst_HEADERS= \
     19        gnumpc.h gnumpfl.h longrat.h modulop.h ffields.h \
     20        rintegers.h rmodulo2m.h rmodulon.h shortfl.h \
     21        mpr_complex.h mpr_global.h
    2622
    27 check_PROGRAMS=test test-g
     23INCLUDES = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir}
    2824
    29 test_SOURCES=test.cc
    30 test_g_SOURCES=test.cc
     25SOURCES = \
     26        numbers.cc rintegers.cc rmodulo2m.cc rmodulon.cc shortfl.cc \
     27        gnumpc.cc gnumpfl.cc longrat.cc longrat0.cc ffields.cc \
     28        modulop.cc mpr_complex.cc
     29libcoeffs_a_SOURCES   = $(SOURCES)
     30libcoeffs_g_a_SOURCES = $(SOURCES)
    3131
    32 test_LDADD = libcoeffs.a -lresources -lreporter -lgmp -lomalloc
    33 test_g_LDADD = libcoeffs_g.a -lresources -lreporter -lgmp -lomalloc_debug
     32libcoeffs_a_includedir  =$(includedir)/libpolys/coeffs
     33libcoeffs_g_a_includedir=$(includedir)/libpolys/coeffs
    3434
    35 test_g_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    36 #  -fdiagnostics-show-option
     35COEFFSHEADERS  = coeffs.h numbers.h
     36libcoeffs_a_include_HEADERS   = $(COEFFSHEADERS)
     37libcoeffs_g_a_include_HEADERS = $(COEFFSHEADERS)
     38
     39
     40
     41## for testing...
     42AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc
     43
     44check_PROGRAMS = test test-g
     45
     46test_SOURCES   = test.cc
     47test_g_SOURCES = test.cc
     48
     49test_LDADD   = libcoeffs.a -lresources -lreporter -lgmp -lomalloc
     50test_g_LDADD = libcoeffs_g.a -lresources_g -lreporter_g -lgmp -lomalloc_debug
     51
     52
     53test_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
     54test_g_CFLAGS = ${PIPE}
     55
     56test_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     57test_g_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
     58# -fdiagnostics-show-option
     59
     60test_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     61test_g_CPPFLAGS = -DHAVE_CONFIG_H

  • libpolys/coeffs/configure.ac

    r1b49ff r630ca9  
    33
    44AC_PREREQ([2.65])
    5 AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
     5AC_INIT([coeffs], [3.1.2.sw])
    66AM_INIT_AUTOMAKE
    7 AC_CONFIG_SRCDIR([rmodulon.h])
     7AC_CONFIG_SRCDIR([coeffs.h])
    88AC_CONFIG_HEADERS([config.h])
    99
    … …  
    2121AC_PROG_INSTALL
    2222AC_PROG_RANLIB
     23AM_PROG_CC_C_O
    2324
    2425# Checks for libraries.

  • libpolys/coeffs/longrat.cc

    r1b49ff r630ca9  
    13851385    }
    13861386  }
    1387   nlTest(a, r);
    13881387  return a;
    13891388}
    … …  
    15521551    }
    15531552  }
    1554   nlTest(u, r);
    15551553  return u;
    15561554}
    … …  
    17761774    }
    17771775  }
    1778   nlTest(u, r);
    17791776  return u;
    17801777}
    … …  
    17901787  mpz_init_set_si(u->z,SR_TO_INT(a));
    17911788  mpz_mul_si(u->z,u->z,SR_TO_INT(b));
    1792   nlTest(u, r);
    17931789  return u;
    17941790}
    … …  
    18931889    }
    18941890  }
    1895   nlTest(u, r);
    18961891  return u;
    18971892}
    … …  
    20952090    return a;
    20962091  }
    2097   return _nlNeg_NoImm(a);
     2092  a = _nlNeg_NoImm(a);
     2093  nlTest(a, R);
     2094  return a;
     2095
    20982096}
    20992097
    … …  
    21032101LINLINE number nlAdd (number a, number b, const coeffs R)
    21042102{
    2105   number u;
    21062103  if (SR_HDL(a) & SR_HDL(b) & SR_INT)
    21072104  {
    … …  
    21122109      return nlRInit(SR_TO_INT(r));
    21132110  }
    2114   return _nlAdd_aNoImm_OR_bNoImm(a, b);
     2111  number u =  _nlAdd_aNoImm_OR_bNoImm(a, b);
     2112  nlTest(u, R);
     2113  return u;
    21152114}
    21162115
    … …  
    22842283      return nlRInit(SR_HDL(u)>>2);
    22852284    }
    2286     return _nlMult_aImm_bImm_rNoImm(a, b);
    2287   }
    2288   return _nlMult_aNoImm_OR_bNoImm(a, b);
     2285    number u = _nlMult_aImm_bImm_rNoImm(a, b);
     2286    nlTest(u, R);
     2287    return u;
     2288   
     2289  }
     2290  number u = _nlMult_aNoImm_OR_bNoImm(a, b);
     2291  nlTest(u, R);
     2292  return u;
     2293 
    22892294}
    22902295
    … …  
    23052310      return nlRInit(SR_TO_INT(r));
    23062311  }
    2307   return _nlSub_aNoImm_OR_bNoImm(a, b);
     2312  number u = _nlSub_aNoImm_OR_bNoImm(a, b);
     2313  nlTest(u, r);
     2314  return u;
     2315 
    23082316}
    23092317

  • libpolys/resources/Makefile.am

    r1b49ff r630ca9  
    11lib_LIBRARIES=libresources.a libresources_g.a
    22
    3 AM_CFLAGS       = -O3 -w -fomit-frame-pointer ${PIPE}
    4 CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
    5 AM_CXXFLAGS     = -O3 -w -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
    6 INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/..
    7 AM_CPPFLAGS     = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     3CXXTEMPLFLAGS      = -fno-implicit-templates --no-exceptions
     4
     5libresources_a_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
     6libresources_g_a_CFLAGS = ${PIPE}
     7
     8libresources_a_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     9libresources_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
     10# -fdiagnostics-show-option
     11
     12libresources_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     13libresources_g_a_CPPFLAGS = -DHAVE_CONFIG_H
     14
     15INCLUDES = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/..
    816
    917SOURCES = feFopen.cc feResource.cc
    10 
    11 libresources_a_SOURCES = $(SOURCES)
    12 
    13 libresources_a_includedir=$(includedir)/libpolys/resources
    14 
    15 libresources_a_include_HEADERS = feFopen.h feResource.h
    16 
     18libresources_a_SOURCES   = $(SOURCES)
    1719libresources_g_a_SOURCES = $(SOURCES)
    1820
    19 libresources_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    20 # -fdiagnostics-show-option
     21libresources_a_includedir  =$(includedir)/libpolys/resources
     22libresources_g_a_includedir=$(includedir)/libpolys/resources
     23
     24RESOURCESHEADERS  = feFopen.h feResource.h
     25libresources_a_include_HEADERS   = $(RESOURCESHEADERS)
     26libresources_g_a_include_HEADERS = $(RESOURCESHEADERS)
     27
     28
     29

  • libpolys/resources/configure.ac

    r1b49ff r630ca9  
    33
    44AC_PREREQ([2.65])
    5 AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
     5AC_INIT([resources], [3.1.2.sw])
    66AM_INIT_AUTOMAKE
    77AC_CONFIG_SRCDIR([feFopen.h])
    … …  
    1414AC_PROG_INSTALL
    1515AC_PROG_RANLIB
     16AM_PROG_CC_C_O
    1617
    1718# Checks for libraries.

  • libpolys/resources/feFopen.cc

    r1b49ff r630ca9  
    66#include <unistd.h>
    77
    8 #include <resources/config.h>
    9 
     8#include "config.h"
    109#include <misc/auxiliary.h>
    1110

  • libpolys/resources/feResource.cc

    r1b49ff r630ca9  
    1111#include <string.h>
    1212
    13 #include <resources/config.h>
    14 
     13#include "config.h"
    1514#include <misc/auxiliary.h>
    1615
Note: See TracChangeset for help on using the changeset viewer.