Changeset 156138 in git


Ignore:
Timestamp:
Aug 16, 2011, 7:36:36 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
6ea2f547817e1e86885f7f96f9c8d365f37e8161
Parents:
643b538e22eb5f58bfb7663b4801ca17c1bfb00a
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-16 19:36:36+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:22+01:00
Message:
ADD: build test/testg out of test.cc and run them during 'make check'
ADD: libSingular*.a
ADD: Singular/Singular_g need corresp. testgh.o/.og and libSingular.a/_g.a
CHG: better makefile
Location:
Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/makefile

    r643b538 r156138  
    3636##
    3737LIBPOLYS_INCLUDES = -I.. -I../libpolys -I/opt/local/include
     38
    3839LIBPOLYS_CFLAGS   = ${LIBPOLYS_INCLUDES}
     40
    3941LIBPOLYS_LIBS     = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys -lcoeffs -lresources -lreporter -lmisc -lfactory -lomalloc -L/opt/local/lib -lntl -lgmp -ldl
     42
    4043LIBPOLYS_LIBSG    = -L../factory -L../omalloc -L../libpolys/misc -L../libpolys/reporter -L../libpolys/resources -L../libpolys/coeffs -L../libpolys/polys -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g -lfactory -lomalloc_g  -L/opt/local/lib  -lntl -lgmp -ldl
    4144
     
    126129   ssiLink.cc\
    127130   subexpr.cc\
    128    tesths.cc\
    129131   utils.cc\
    130132   walk.cc\
    131133   walk_ip.cc\
    132134   wrapper.cc
     135
     136#   tesths.cc
    133137
    134138#   pyobject.cc  pyobject_setup.cc
     
    214218        ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
    215219
    216 OBJG= $(CXXSOURCES:.cc=.og) $(CSOURCES:.c=.og)
     220OBJG= $(OBJS:.o=.og)
    217221
    218222OBJG := $(OBJG) $(STATIC_SOURCES:.cc=.og)
    219223OBJP := $(OBJP) $(STATIC_SOURCES:.cc=.op)
    220224
    221 all:    Singular
    222 
    223 Singular: ${OBJS}
    224         $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${OBJS} -o $@ -L. -L../kernel -lkernel ${LIBPOLYS_LIBS}
     225all: libSingular_g.a libSingular.a Singularg Singular
     226
     227Singularg: tesths.og libSingular_g.a
     228        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.og -o $@ -L. -lSingular_g -L../kernel -lkernel_g ${LIBPOLYS_LIBSG}
     229
     230Singular: tesths.o libSingular.a
     231        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} tesths.o -o $@ -L. -lSingular -L../kernel -lkernel ${LIBPOLYS_LIBS}
    225232
    226233
     
    384391        ./gentable1
    385392        /bin/rm -f gentable1 gentable1.exe
     393
     394
     395
     396libSingular.a: ${OBJS}
     397        -rm -f $@
     398        ar cr $@ $^
     399
     400
     401libSingular_g.a: ${OBJG}
     402        -rm -f $@
     403        ar cr $@ $^
     404
     405test: test.o libSingular.a
     406        $(CXX) ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} $< -o $@  -L. -lSingular -L../kernel -lkernel ${LIBPOLYS_LIBS}
     407
     408# My headers test
     409check: test testg
     410        ./test
     411        ./testg
     412
     413testg: test.og libSingular_g.a
     414        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} $< -o $@  -L. -lSingular_g -L../kernel -lkernel_g ${LIBPOLYS_LIBSG}
  • Singular/test.cc

    r643b538 r156138  
     1#include <misc/auxiliary.h>
     2
     3#ifdef HAVE_FACTORY
     4#include <factory/factory.h> // :(
     5#endif
     6
     7#include <omalloc/omalloc.h>
     8
     9#include <misc/intvec.h>
     10#include <misc/int64vec.h>
     11#include <misc/mylimits.h>
     12#include <misc/options.h>
     13
     14#include <reporter/reporter.h>
     15
     16#include <resources/feFopen.h>
     17#include <resources/feResource.h>
     18
     19#include <coeffs/coeffs.h>
     20
     21#include <coeffs/si_gmp.h>
     22
     23#include <polys/kbuckets.h>
     24#include <polys/matpol.h>
     25#include <polys/mod_raw.h>
     26#include <polys/prCopy.h>
     27#include <polys/sbuckets.h>
     28#include <polys/simpleideals.h>
     29#include <polys/weight.h>
     30
     31#include <polys/monomials/maps.h>
     32#include <polys/monomials/monomials.h>
     33#include <polys/monomials/p_polys.h>
     34#include <polys/monomials/ring.h>
     35
     36#include <polys/nc/nc.h>
     37#include <polys/nc/ncSACache.h>
     38#include <polys/nc/ncSAFormula.h>
     39#include <polys/nc/ncSAMult.h>
     40#include <polys/nc/sca.h>
     41#include <polys/nc/summator.h>
     42
     43
     44#include <polys/templates/p_MemAdd.h>
     45#include <polys/templates/p_Procs.h>
     46
     47#include <polys/operations/pShallowCopyDelete.h>
     48
     49#include <polys/clapsing.h>
     50
     51
     52#ifdef HAVE_FACTORY
     53int initializeGMP(){ return 1; } // NEEDED FOR MAIN APP. LINKING!!!
     54#endif
     55
     56
     57#include <coeffs/numbers.h>
     58#include <polys/polys.h>
     59
     60
     61#include <kernel/mod2.h>
     62
     63#include <kernel/structs.h>
     64
     65
     66// HEADERS:
     67#include <kernel/hutil.h>
     68//#include "idrec.h" // moved to Singular
     69#include <kernel/stairc.h>
     70#include <kernel/ideals.h>
     71#include <kernel/syz.h>
     72#include <kernel/fast_maps.h>
     73#include <kernel/febase.h>
     74#include <kernel/walkProc.h>
     75#include <kernel/walkMain.h>
     76#include <kernel/walkSupport.h>
     77#include <kernel/khstd.h>
     78/// #include <kernel/sparsmat.h> // TODO: install polys/this!
     79//+
     80
     81#include <kernel/fglm.h>
     82#include <kernel/kstd1.h>
     83#include <kernel/fglmgauss.h>
     84#include <kernel/fglmvec.h>
     85#include <kernel/kstdfac.h>
     86#include <kernel/kmatrix.h>
     87#include <kernel/GMPrat.h>
     88#include <kernel/multicnt.h>
     89#include <kernel/npolygon.h>
     90#include <kernel/semic.h>
     91#include <kernel/spectrum.h>
     92#include <kernel/splist.h>
     93#include <kernel/multicnt.h>
     94#include <kernel/eigenval.h>
     95#include <kernel/units.h>
     96#include <kernel/fegetopt.h>
     97#include <kernel/ratgring.h>
     98#include <kernel/shiftgb.h>
     99#include <kernel/mmalloc.h>
     100#include <kernel/gfan.h>
     101
     102#include <kernel/kutil.h>
     103
     104// #include <kernel/dbm_sl.h> // TODO: needs si_link// already moved to Singular/!
     105
     106// #include "CCRing.h" // Too old!
     107#include <kernel/digitech.h>
     108#include <kernel/eigenval.h>
     109#include <kernel/fast_maps.h>
     110#include <kernel/fast_mult.h>
     111#include <kernel/febase.h>
     112#include <kernel/fegetopt.h>
     113
     114#include <kernel/fglmgauss.h>
     115#include <kernel/fglm.h>
     116#include <kernel/fglmvec.h>
     117
     118////////#include "F5cData.h"
     119#include <kernel/f5c.h>
     120#include <kernel/f5data.h>
     121#include <kernel/f5gb.h>
     122#include <kernel/f5lists.h>
     123////////#include <kernel/F5cLists.h>
     124
     125#include <kernel/gfan.h>
     126
     127
     128#include <kernel/GMPrat.h>
     129
     130// #include "htmlhelp.h" // For Windows //
     131#include <kernel/hutil.h>
     132// #include <kernel/Ideal.h> // Too old?
     133
     134
     135#include <kernel/ideals.h>
     136
     137#include <kernel/kmatrix.h>
     138#include <kernel/kstd1.h>
     139#include <kernel/kstdfac.h>
     140#include <kernel/khstd.h>
     141
     142#include <kernel/linearAlgebra.h>
     143
     144
     145
     146// #include "lplist.h" // Too old!
     147#include <kernel/mmalloc.h>
     148#include <kernel/multicnt.h>
     149#include <kernel/npolygon.h>
     150// #include <kernel/Number.h> // Too old?
     151#include <kernel/page.h>
     152// #include <kernel/Poly.h> // Too old?
     153// #include <kernel/PowerSeries.h> // Too old?
     154
     155#include <kernel/preimage.h>
     156
     157#include <kernel/nc.h>
     158
     159#include <kernel/ratgring.h>
     160#include <kernel/ringgb.h>
     161#include <kernel/semic.h>
     162#include <kernel/shiftgb.h>
     163
     164#include <kernel/spectrum.h>
     165#include <kernel/splist.h>
     166#include <kernel/stairc.h>
     167#include <kernel/structs.h>
     168#include <kernel/syz.h>
     169// #include <kernel/testpoly.h> // Too old?
     170
     171#include <kernel/tgbgauss.h>
     172#include <kernel/tgb.h>
     173
     174#include <kernel/timer.h>
     175
     176#include <kernel/units.h>
     177#include <kernel/walkMain.h>
     178#include <kernel/walkProc.h>
     179#include <kernel/walkSupport.h>
     180
     181
     182// #include <polys/clapconv.h> // due to factory? :(
     183// #include <kernel/tgb_internal.h> // :(
     184// #include <kernel/F4.h> // uses tgb_internal // :(
     185// #include <kernel/IIntvec.h> // :(
     186
     187
     188
    1189// headers in Singular/
    2190#include "attrib.h"
     
    57245
    58246// Source files in Singular/
    59 
     247/*
    60248#include "attrib.cc"
    61249#include "bbcone.cc"
     
    125313#include "walk_ip.cc"
    126314#include "wrapper.cc"
     315*/
     316
     317int main( int, char *argv[] )
     318{
     319  feInitResources(argv[0]);
     320
     321  StringSetS("ressources in use (as reported by feStringAppendResources(0):\n");
     322  feStringAppendResources(0);
     323  PrintS(StringAppendS("\n"));
     324   
     325  return 0;
     326}
     327
Note: See TracChangeset for help on using the changeset viewer.