Changeset b56249 in git


Ignore:
Timestamp:
Apr 23, 2013, 5:00:16 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
Children:
5782e2d7947412c3820f7bd158d09b128c888ca9
Parents:
888b45777bfde99aa51caf2645601ffcc66fa35e
Message:
Misc fixes due to building on Mac OS X 10.6

fix: no  pyobject-building if configured without dynamic loading
chg: minor include reordering + forward declarations + cosmetics
fix: AM_COND_IF may be undefined in older automake/autoconf
fix: distribute ALL tested tests
fix: no double definition of NATNUMBER/int_number in structs.h
fix: n_ExtGcd is not always related to HAVE_RINGS
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r888b457 rb56249  
    410410module_LTLIBRARIES =
    411411
     412if ENABLE_P_PROCS_DYNAMIC
    412413if PYTHON_MODULE
    413414module_LTLIBRARIES += pyobject.la
     415endif
    414416endif
    415417

  • Singular/iparith.cc

    r888b457 rb56249  
    77*/
    88
    9 #include <stdlib.h>
    10 #include <string.h>
    11 #include <ctype.h>
    12 #include <stdio.h>
    13 #include <time.h>
    14 #include <unistd.h>
    15 
    169#include "config.h"
     10
     11#include <omalloc/omalloc.h>
     12
    1713#include <coeffs/bigintmat.h>
    18 #include <kernel/mod2.h>
    19 #include <Singular/tok.h>
    20 #include <misc/options.h>
    21 #include <Singular/ipid.h>
    22 #include <misc/intvec.h>
    23 #include <omalloc/omalloc.h>
    24 #include <kernel/polys.h>
    25 #include <kernel/febase.h>
    26 #include <Singular/sdb.h>
    27 #include <kernel/ideals.h>
    28 #include <polys/prCopy.h>
    29 #include <polys/matpol.h>
    30 #include <kernel/kstd1.h>
    31 #include <kernel/timer.h>
    32 
    33 #include <kernel/preimage.h>
    34 
    35 #include <Singular/subexpr.h>
    36 #include <Singular/lists.h>
    37 #include <kernel/modulop.h>
     14#include <coeffs/coeffs.h>
     15#include <coeffs/numbers.h>
     16
    3817#ifdef HAVE_RINGS
    3918#include <coeffs/rmodulon.h>
    … …  
    4120#include <coeffs/rintegers.h>
    4221#endif
    43 #include <coeffs/numbers.h>
     22
     23#include <misc/options.h>
     24#include <misc/intvec.h>
     25
     26#include <polys/prCopy.h>
     27#include <polys/matpol.h>
     28#include <polys/monomials/maps.h>
     29#include <polys/coeffrings.h>
     30#include <polys/sparsmat.h>
     31#include <polys/mod_raw.h>
     32#include <polys/weight.h>
     33
     34
     35#include <kernel/modulop.h>
    4436#include <kernel/stairc.h>
    45 #include <polys/monomials/maps.h>
     37#include <kernel/mod2.h>
     38#include <kernel/polys.h>
     39#include <kernel/febase.h>
     40#include <kernel/ideals.h>
     41#include <kernel/kstd1.h>
     42#include <kernel/timer.h>
     43#include <kernel/preimage.h>
     44#include <kernel/units.h>
     45#include <kernel/GMPrat.h>
     46#include <kernel/tgb.h>
     47#include <kernel/walkProc.h>
     48#include <kernel/linearAlgebra.h>
     49#include <kernel/syz.h>
     50#include <kernel/timer.h>
     51
     52
     53#include <Singular/tok.h>
     54#include <Singular/ipid.h>
     55#include <Singular/sdb.h>
     56#include <Singular/subexpr.h>
     57#include <Singular/lists.h>
    4658#include <Singular/maps_ip.h>
    47 #include <kernel/syz.h>
    48 #include <polys/weight.h>
     59
    4960#include <Singular/ipconv.h>
    5061#include <Singular/ipprint.h>
    5162#include <Singular/attrib.h>
    5263#include <Singular/links/silink.h>
    53 #include <polys/sparsmat.h>
    54 #include <kernel/units.h>
    5564#include <Singular/janet.h>
    56 #include <kernel/GMPrat.h>
    57 #include <kernel/tgb.h>
    58 #include <kernel/walkProc.h>
    59 #include <polys/mod_raw.h>
    6065#include <Singular/MinorInterface.h>
    61 #include <kernel/linearAlgebra.h>
    6266#include <Singular/misc_ip.h>
    6367#include <Singular/linearAlgebra_ip.h>
     68
    6469#ifdef HAVE_FACTORY
    6570#  include <factory/factory.h>
    … …  
    6974#  include <Singular/fglm.h>
    7075#endif /* HAVE_FACTORY */
     76
    7177#include <Singular/interpolation.h>
    7278
    … …  
    7682//#include <kernel/mpr_inout.h>
    7783
    78 #include <kernel/timer.h>
    79 
    80 #include <polys/coeffrings.h>
    8184#include <Singular/si_signals.h>
     85
     86
     87#include <stdlib.h>
     88#include <string.h>
     89#include <ctype.h>
     90#include <stdio.h>
     91#include <time.h>
     92#include <unistd.h>
     93
    8294
    8395lists rDecompose(const ring r);

  • configure.ac

    r888b457 rb56249  
    155155fi
    156156
     157dnl AC_CONFIG_FILES conditionalization requires using AM_COND_IF, however
     158dnl AM_COND_IF is new to Automake 1.11.  To use it on new Automake without
     159dnl requiring same, a fallback implementation for older Autoconf is provided.
     160dnl Note that disabling of AC_CONFIG_FILES requires Automake 1.11, this code
     161dnl is correct only in terms of m4sh generated script.
     162m4_ifndef([AM_COND_IF], [AC_DEFUN([AM_COND_IF], [
     163if test -z "$$1_TRUE"; then :
     164  m4_n([$2])[]dnl
     165m4_ifval([$3],
     166[else
     167    $3
     168])dnl
     169fi[]dnl
     170])])
     171
     172   
    157173AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([dox/Doxyfile])])
    158174AC_CONFIG_FILES([dox/Makefile])

  • dyn_modules/syzextra/Makefile.am

    r888b457 rb56249  
    7575endif
    7676
    77 EXTRA_DIST = syzextra.tst ederc.tst test.sh $(TESTS)
     77EXTRA_DIST = syzextra.tst ederc.tst test_clear_enum.tst test.sh $(TESTS)

  • kernel/structs.h

    r888b457 rb56249  
    1919
    2020/* standard types */
    21 #ifdef HAVE_RINGS
    22 typedef unsigned long NATNUMBER;
    23 typedef mpz_ptr int_number;
    24 #endif
     21//#ifdef HAVE_RINGS
     22//typedef unsigned long NATNUMBER;
     23//typedef mpz_ptr int_number;
     24//#endif
    2525
    2626#define BITSET  unsigned int

  • libpolys/coeffs/coeffs.h

    r888b457 rb56249  
    139139   void     (*cfMPZ)(mpz_t result, number &n, const coeffs r);
    140140   
    141 #ifdef HAVE_RINGS
    142    int     (*cfDivComp)(number a,number b,const coeffs r);
    143    BOOLEAN (*cfIsUnit)(number a,const coeffs r);
    144    number  (*cfGetUnit)(number a,const coeffs r);
    145 #endif
    146 
    147141   /// changes argument  inline: a:= -a
    148142   /// return -a! (no copy is returned)
    … …  
    165159   const char *  (*cfRead)(const char * s, number * a, const coeffs r);
    166160   void    (*cfNormalize)(number &a, const coeffs r);
     161   
     162#ifdef HAVE_RINGS
     163   int     (*cfDivComp)(number a,number b,const coeffs r);
     164   BOOLEAN (*cfIsUnit)(number a,const coeffs r);
     165   number  (*cfGetUnit)(number a,const coeffs r);
     166   BOOLEAN (*cfDivBy)(number a, number b, const coeffs r);
     167#endif
     168
     169   
    167170   BOOLEAN (*cfGreater)(number a,number b, const coeffs r),
    168 #ifdef HAVE_RINGS
    169            (*cfDivBy)(number a, number b, const coeffs r),
    170 #endif
    171171            /// tests
    172172           (*cfEqual)(number a,number b, const coeffs r),
    … …  
    428428
    429429#ifdef HAVE_RINGS
     430static inline int n_DivComp(number a, number b, const coeffs r)
     431{ assume(r != NULL); assume(r->cfDivComp!=NULL); return r->cfDivComp (a,b,r); }
     432
    430433/// TRUE iff n has a multiplicative inverse in the given coeff field/ring r
    431434static inline BOOLEAN n_IsUnit(number n, const coeffs r)
    432435{ assume(r != NULL); assume(r->cfIsUnit!=NULL); return r->cfIsUnit(n,r); }
    433 
    434 static inline number n_ExtGcd(number a, number b, number *s, number *t, const coeffs r)
    435 { assume(r != NULL); assume(r->cfExtGcd!=NULL); return r->cfExtGcd (a,b,s,t,r); }
    436 
    437 static inline int n_DivComp(number a, number b, const coeffs r)
    438 { assume(r != NULL); assume(r->cfDivComp!=NULL); return r->cfDivComp (a,b,r); }
    439436
    440437/// in Z: 1
    … …  
    577574{ assume(r != NULL); assume(r->cfGcd!=NULL); return r->cfGcd(a,b,r); }
    578575
     576/// beware that ExtGCD is only relevant for a few chosen coeff. domains
     577/// and may perform something unexpected in some cases...
     578static inline number n_ExtGcd(number a, number b, number *s, number *t, const coeffs r)
     579{ assume(r != NULL); assume(r->cfExtGcd!=NULL); return r->cfExtGcd (a,b,s,t,r); }
     580
    579581/// in Z: return the lcm of 'a' and 'b'
    580582/// in Z/nZ, Z/2^kZ: computed as in the case Z
    … …  
    819821// Missing wrappers for: (TODO: review this?)
    820822// cfIntMod, cfRead, cfName, cfInit_bigint
    821 // HAVE_RINGS: cfDivComp, cfExtGcd...
     823
     824// HAVE_RINGS: cfDivComp, cfIsUnit, cfGetUnit, cfDivBy
     825// BUT NOT cfExtGcd...!
    822826
    823827

  • libpolys/polys/nc/gb_hack.h

    r888b457 rb56249  
    66#ifdef PLURAL_INTERNAL_DECLARATIONS
    77
    8 struct  spolyrec;
    9 typedef struct spolyrec    polyrec;
    10 typedef polyrec *          poly;
    11 
    12 struct ip_sring;
    13 typedef struct ip_sring *         ring;
     8struct  spolyrec; typedef struct spolyrec    polyrec; typedef polyrec *          poly;
     9struct ip_sring; typedef struct ip_sring *         ring;
     10struct sip_sideal; typedef struct sip_sideal *       ideal;
    1411
    1512class intvec;
    16 
    17 struct sip_sideal;
    18 typedef struct sip_sideal *       ideal;
    1913
    2014class skStrategy; typedef skStrategy * kStrategy;

  • libpolys/polys/prCopy.h

    r888b457 rb56249  
    88*/
    99
     10struct spolyrec; typedef struct spolyrec polyrec; typedef polyrec* poly;
     11struct ip_sring; typedef struct ip_sring* ring; typedef struct ip_sring const* const_ring;
     12struct sip_sideal; typedef struct sip_sideal *ideal;
    1013
    1114/*************************************************************************
Note: See TracChangeset for help on using the changeset viewer.