Changeset d1df84 in git

Timestamp:

Jun 2, 2014, 11:05:05 AM (9 years ago)

Author:

Jakob Kröker <kroeker@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f0c04483fc85bda32ad578ef2d17303bc3bb3d7b

Parents:

7835f61d17a89c6f9e24dcc0904db0042ade03fc68e8ddfaf4c44baab2c1a43c6fa8f1d9a2002746

Message:

Merge branch 'spielwiese' into add.assume.in.primdec.lib

Files:

• HOWTO-libsingular (modified) (1 diff)
• Includes.dot (modified) (previous)
• Makefile.am (modified) (1 diff)
• Singular/LIB/modular.lib (modified) (2 diffs)
• Singular/LIB/primdec.lib (modified) (79 diffs)
• Singular/Makefile.am (modified) (6 diffs)
• Singular/dyn_modules/Makefile.am (modified) (1 diff)
• Singular/dyn_modules/bigintm/Makefile.am (modified) (2 diffs)
• Singular/dyn_modules/bigintm/mod_main.cc (modified) (2 diffs)
• Singular/dyn_modules/callpolymake/Makefile.am (deleted)
• Singular/dyn_modules/callpolymake/polymake_documentation.h (deleted)
• Singular/dyn_modules/gfanlib/Makefile.am (moved) (moved from Singular/dyn_modules/callgfanlib/Makefile.am) (1 diff)
• Singular/dyn_modules/gfanlib/bbcone.cc (moved) (moved from Singular/dyn_modules/callgfanlib/bbcone.cc) (4 diffs)
• Singular/dyn_modules/gfanlib/bbcone.h (moved) (moved from Singular/dyn_modules/callgfanlib/bbcone.h) (2 diffs)
• Singular/dyn_modules/gfanlib/bbfan.cc (moved) (moved from Singular/dyn_modules/callgfanlib/bbfan.cc) (3 diffs)
• Singular/dyn_modules/gfanlib/bbfan.h (moved) (moved from Singular/dyn_modules/callgfanlib/bbfan.h) (2 diffs)
• Singular/dyn_modules/gfanlib/bbpolytope.cc (moved) (moved from Singular/dyn_modules/callgfanlib/bbpolytope.cc) (3 diffs)
• Singular/dyn_modules/gfanlib/bbpolytope.h (moved) (moved from Singular/dyn_modules/callgfanlib/bbpolytope.h) (2 diffs)
• Singular/dyn_modules/gfanlib/gfan.cc (moved) (moved from Singular/dyn_modules/callgfanlib/gfan.cc) (2 diffs)
• Singular/dyn_modules/gfanlib/gfan.h (moved) (moved from Singular/dyn_modules/callgfanlib/gfan.h) (2 diffs)
• Singular/dyn_modules/gfanlib/gfanlib.cc (moved) (moved from Singular/dyn_modules/callgfanlib/gfanlib.cc) (4 diffs)
• Singular/dyn_modules/gfanlib/gitfan.cc (moved) (moved from Singular/dyn_modules/callgfanlib/gitfan.cc) (2 diffs)
• Singular/dyn_modules/gfanlib/gitfan.h (moved) (moved from Singular/dyn_modules/callgfanlib/gitfan.h) (2 diffs)
• Singular/dyn_modules/polymake/Makefile.am (added)
• Singular/dyn_modules/polymake/polymake_conversion.cc (moved) (moved from Singular/dyn_modules/callpolymake/polymake_conversion.cc) (3 diffs)
• Singular/dyn_modules/polymake/polymake_conversion.h (moved) (moved from Singular/dyn_modules/callpolymake/polymake_conversion.h) (2 diffs)
• Singular/dyn_modules/polymake/polymake_documentation.cc (moved) (moved from Singular/dyn_modules/callpolymake/polymake_documentation.cc) (2 diffs)
• Singular/dyn_modules/polymake/polymake_documentation.h (added)
• Singular/dyn_modules/polymake/polymake_wrapper.cc (moved) (moved from Singular/dyn_modules/callpolymake/polymake_wrapper.cc) (3 diffs)
• Singular/dyn_modules/pyobject/Makefile.am (added)
• Singular/dyn_modules/pyobject/pyobject.cc (moved) (moved from Singular/pyobject.cc) (2 diffs)
• Singular/dyn_modules/singmathic/Makefile.am (added)
• Singular/dyn_modules/singmathic/singmathic.cc (moved) (moved from Singular/singmathic.cc) (4 diffs)
• Singular/dyn_modules/staticdemo/Makefile.am (added)
• Singular/dyn_modules/staticdemo/staticdemo.cc (added)
• Singular/dyn_modules/syzextra/Makefile.am (modified) (1 diff)
• Singular/dyn_modules/syzextra/mod_main.cc (modified) (3 diffs)
• Singular/dyn_modules/syzextra/syzextra.cc (modified) (5 diffs)
• Singular/iparith.cc (modified) (4 diffs)
• Singular/iplib.cc (modified) (3 diffs)
• Singular/ipshell.cc (modified) (1 diff)
• Singular/links/semaphore.c (modified) (2 diffs)
• Singular/links/ssiLink.cc (modified) (1 diff)
• Singular/mod_lib.cc (modified) (1 diff)
• Singular/mod_lib.h (modified) (1 diff)
• Singular/pyobject_setup.cc (modified) (3 diffs)
• Tst/Short.lst (modified) (1 diff)
• Tst/Short/pyobject.res.gz.uu (modified) (1 diff)
• Tst/Short/pyobject.stat (modified) (1 diff)
• Tst/Short/ringutils_s.res.gz.uu (modified) (1 diff)
• bug_532_s.stat (deleted)
• configure.ac (modified) (2 diffs)
• kernel/GBEngine/Makefile.am (modified) (1 diff)
• kernel/combinatorics/Makefile.am (modified) (1 diff)
• kernel/fglm/Makefile.am (modified) (1 diff)
• kernel/groebner_walk/Makefile.am (modified) (1 diff)
• kernel/linear_algebra/Makefile.am (modified) (1 diff)
• kernel/maps/Makefile.am (modified) (1 diff)
• kernel/spectrum/Makefile.am (modified) (1 diff)
• libpolys/coeffs/longrat.cc (modified) (12 diffs)
• libpolys/coeffs/mpr_complex.cc (modified) (3 diffs)
• libpolys/coeffs/numbers.cc (modified) (1 diff)
• libpolys/coeffs/shortfl.cc (modified) (1 diff)
• libpolys/libpolys-config.in (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (10 diffs)
• libsingular-config.in (modified) (1 diff)
• m4/ax_python_embed.m4 (modified) (2 diffs)
• m4/options.m4 (modified) (1 diff)
• resources/feResource.cc (modified) (2 diffs)

HOWTO-libsingular

@@ -1 +1 @@
 The following is valid for Singular 4-x-x:
+(for technical details see http://www.singular.uni-kl.de/Manual/modules.pdf)
 
 ./configure --disable-static ....

Makefile.am

@@ -6 +6 @@
 
 SUBDIRS = resources omalloc xalloc $(USE_FACTORY) \
-libpolys kernel gfanlib \
-IntegerProgramming Singular dox \
-emacs debian redhat desktop
+libpolys gfanlib IntegerProgramming \
+kernel Singular \
+dox emacs debian redhat desktop
 
 EXTRA_DIST = README autogen.sh git-version-gen

Singular/LIB/modular.lib

@@ -32 +32 @@
 SEE ALSO:  link, tasks_lib, parallel_lib, modstd_lib, assprimeszerodim_lib
 
-KEYWORDS:  modular.lib; Modular techniques; Parallelization;
+KEYWORDS:  modular_lib; Modular techniques; Parallelization;
            Skeletons for parallelization; Distributed computing
 
@@ -61 +61 @@
 NOTE:     For the general algorithm and the role of the optional arguments
           primeTest, deleteUnluckyPrimes, pTest, and finalTest, see
-          @ref{modStd} and the reference given in @ref{modular.lib}. The
+          @ref{modStd} and the reference given in @ref{modular_lib}. The
           default for these arguments is that all tests succeed and that all
           primes are assumed to be lucky.

Singular/LIB/primdec.lib

@@ -22 +22 @@
     They work in any characteristic.@*
     Baserings must have a global ordering and no quotient ideal.
+    Exceptions: primdecGTZ, absPrimdecGTZ, minAssGTZ, primdecSY, minAssChar, radical accept non-global ordering.
 
 
@@ -64 +65 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   int @k;
   ideal inew=std(id);
@@ -89 +93 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   int @k,@i;
   def @P= basering;
@@ -154 +160 @@
 proc minSat(ideal inew, ideal h)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   int i,k;
   poly f=1;
@@ -200 +208 @@
 static proc quotMin(list tsil)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   int i,j,k,action;
   ideal verg;
@@ -260 +270 @@
 static proc testFactor(list act,poly p)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   poly keep=p;
 
@@ -284 +296 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   ideal @i;
   list @l;
@@ -402 +416 @@
 proc primaryTest (ideal i, poly p)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   int m=1;
   int n=nvars(basering);
@@ -495 +511 @@
 proc gcdTest(ideal act)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   int i,j;
   if(size(act)<=1)
@@ -516 +534 @@
 static proc splitPrimary(list l,ideal ser,int @wr,list sact)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   int i,j,k,s,r,w;
   list keepresult,act,keepprime;
@@ -705 +725 @@
 static proc splitCharp(list l)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   if((char(basering)==0)||(npars(basering)>0))
   {
@@ -833 +855 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   def   @P = basering;
   int uytrewq;
@@ -1290 +1315 @@
 proc extF(list l,list #)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
 //zero_dimensional primary decomposition after finite field extension
   def R=basering;
@@ -1381 +1408 @@
 //the radical of the intersection of the pe[l] is equal to the radical of i
 
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   def R=basering;
 
   //i has to be a reduced groebner basis
+  ASSUME(1, dim(i)==0);
   ideal F=finduni(i);
 
@@ -1470 +1500 @@
 //i.e. var(i)----->var(i)^(p^v[i])
 
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   if(homog(I)==1){return(maxideal(1));}
 
@@ -1508 +1540 @@
 //computes the prime decomposition of the special ideals
 //and transforms it back to a decomposition of i
-
+ 
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   def R=basering;
   list pr=zeroSp(i);
@@ -1553 +1587 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   int k,j;
   poly m;
@@ -1630 +1666 @@
 "
 {
+ ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
  int k,j;
  intvec m,n,v,w;
@@ -1754 +1792 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   int n,k,di;
   list resu,hilf;
@@ -1820 +1860 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
   ideal @ih,@jh;
   int npar=npars(basering);
@@ -1884 +1926 @@
 "
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
    def @P=basering;
    if(size(i)==0){return(list(ideal(0)));}
@@ -2010 +2054 @@
 static proc primT(ideal i)
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    //assumes that all generators of i are irreducible
    //i is standard basis
@@ -2037 +2084 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   if(size(i) == 0){return(list(ideal(0)));}
   string algorithm;    // Algorithm to be used
@@ -2327 +2377 @@
 "
 {
+
+  ASSUME(0, not isQuotientRing(basering) ) ;
   if(attrib(basering,"global")!=1)
   {
@@ -2333 +2385 @@
       );
   }
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   intvec op ;
   def  P = basering;
@@ -2433 +2487 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
   if(attrib(basering,"global")!=1)
   {
@@ -2439 +2494 @@
       );
   }
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   def  P = basering;
   ideal eq;
@@ -2560 +2617 @@
 proc algeDeco(ideal i, int w)
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
 //reduces primery decomposition over algebraic extensions to
 //the other cases
@@ -2680 +2740 @@
 static proc prepare_absprimdec(list primary)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   list resu,tempo;
   string absotto;
@@ -2704 +2767 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   intvec op,@vv;
   def  @P = basering;
@@ -3684 +3750 @@
 //the p^e th power of the coefficients of f
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    int i;
    poly g;
@@ -3704 +3773 @@
  EXAMPLE: example sep; shows an example
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    def R=basering;
    int k;
@@ -3754 +3826 @@
  EXAMPLE: example zeroRad; shows an example
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    if(homog(I)==1){return(maxideal(1));}
    //I needs to be a reduced standard basis
@@ -3776 +3851 @@
 
    option(redSB);
+   ASSUME(1, dim(I)==0);
    ideal F=finduni(I);//F[i] generates I intersected with K[var(i)]
 
@@ -3849 +3925 @@
 "
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
    if(attrib(basering,"global")!=1)
    {
@@ -3855 +3932 @@
       );
    }
+   ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    if((char(basering)<100)&&(char(basering)!=0))
    {
@@ -3952 +4031 @@
 "
 {
+
   M=prune(M);  //to obtain a small embedding
   ideal ann=quotient1(M,freemodule(nrows(M)));
@@ -3973 +4053 @@
 static proc int_ass_primary_e(ideal i, int e)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   if(homog(i)!=1)
   {
@@ -3993 +4076 @@
 static proc AnnExt_R(int n,list re)
 {
+
   if(n<nvars(basering))
   {
@@ -4015 +4099 @@
 static proc analyze(list pr)
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    int ii,jj;
    for(ii=1;ii<=size(pr) div 2;ii++)
@@ -4045 +4132 @@
 static proc simplifyIdeal(ideal i)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   def r=basering;
 
@@ -4149 +4239 @@
 static proc min_ass_prim_charsets0 (ideal PS)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   intvec op;
   matrix m=char_series(PS);  // We compute an irreducible
@@ -4250 +4343 @@
 static proc min_ass_prim_charsets1 (ideal PS)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   intvec op;
   def oldring=basering;
@@ -4389 +4485 @@
 static proc prim_dec(ideal I, int choose)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   if((choose<0) or (choose>3))
   {
@@ -4612 +4711 @@
 static proc pseudo_prim_dec_charsets (ideal I, ideal SI, int choo)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   list L;          // The list of minimal associated primes,
                    // each one given by a standard basis
@@ -4662 +4764 @@
 static proc pseudo_prim_dec_special_charsets (ideal SI,list V6, int choo)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   int i,j,l;
   list m;
@@ -4760 +4865 @@
 static proc pseudo_prim_dec_i (ideal SI, list L)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   list Q;
   if (size(L)==1)               // one minimal associated prime only
@@ -4829 +4937 @@
 static proc extraction (ideal SI, ideal SP)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   list indsets=indepSet(SP,0);
   poly f;
@@ -4934 +5045 @@
 static proc minsat(ideal SI, poly p)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   ideal fac=factorize(p,1);       //the irreducible factors of p
   fac=sort(fac)[1];
@@ -4980 +5094 @@
 static proc minsat_ppd(ideal SI, ideal fac)
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   fac=sort(fac)[1];
   int i,k;
@@ -5024 +5141 @@
 static proc minquot(list tsil)
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    intvec op;
    int i,j,k,action;
@@ -5094 +5214 @@
 static proc special_ideals_equal( ideal k1, ideal k2)
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    int j;
    if(size(k1)==size(k2))
@@ -5161 +5284 @@
 "
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
    if(size(#)>0)
    {
@@ -5237 +5361 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
   if (char(basering) != 0)
   {
@@ -5405 +5530 @@
 "
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
    if(size(#)>1)
    {
@@ -5480 +5606 @@
 "
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
    if(size(#)>0)
    {
@@ -5584 +5711 @@
 "
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
    if(size(#)>1)
    {
@@ -5637 +5765 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
   if(attrib(basering,"global")!=1)
   {
@@ -5643 +5772 @@
      );
   }
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   return(radical(i, 1));
 }
@@ -5671 +5802 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
   dbprint(printlevel - voice, "Radical, version 2006.05.08");
   if(attrib(basering,"global")!=1)
@@ -5854 +5986 @@
 static proc radicalKL(ideal I, ideal ser, list #)
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
 // ideal I     The ideal for which the radical is computed
 // ideal ser   Used to reduce components already obtained
@@ -5891 +6026 @@
 // obtained in intermediate steps.
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   ideal rad = 1;
   ideal equiRad = 1;
@@ -5973 +6111 @@
 //                    only equiradical is required.
 //                    It is used to set the value of done.)
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
 
   attrib(I, "isSB", 1);   // I needs to be a reduced standard basis
@@ -6246 +6386 @@
 // Output: ideal. Intersection of some primes of I different from the ones in P.
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   int k = 1;                     // Counter
   int good  = 0;                 // Checks if an element of P is in rad(I)
@@ -6313 +6456 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   int n, k, di;
   list resu, hilf;
@@ -6404 +6550 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   ideal @ih,@jh;
   int npar=npars(basering);
@@ -6450 +6599 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
   if(attrib(basering,"global")!=1)
   {
@@ -6456 +6606 @@
       );
   }
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   ideal j=std(i);
   int cod=nvars(basering)-dim(j);
@@ -6498 +6650 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
   if(attrib(basering,"global")!=1)
   {
@@ -6504 +6657 @@
       );
   }
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   ideal j=groebner(i);
   int cod=nvars(basering)-dim(j);
@@ -6534 +6689 @@
 "
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
    int i;
    pr=reconvList(pr);
@@ -6566 +6724 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
   if(attrib(basering,"global")!=1)
   {
@@ -6572 +6731 @@
     );
   }
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   def R=basering;
   poly q;
@@ -6683 +6844 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   intvec op,@vv;
   def  @P = basering;
@@ -7585 +7749 @@
 static proc newReduction(ideal @j, ideal ser, intvec @hilb, intvec @w, int jdim, int abspri, int @wr, list data)
 {
+   ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
+
    string @va;
    string quotring;
@@ -7882 +8050 @@
 // associated primes and the primary components corresponding to these primes.
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   ideal P = 1;
   list pd = list();
@@ -7922 +8093 @@
 static proc minAssSLIteration(ideal I, ideal P);
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   int k = 1;
   int good  = 0;
@@ -7974 +8148 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   int n, k, di;
   list resu, hilf;
@@ -8074 +8251 @@
 "
 {
+  ASSUME(0, not isQuotientRing(basering) ) ;
+  ASSUME(0, hasGlobalOrdering(basering) ) ;
+
   def   @P = basering;
   int uytrewq;

Singular/Makefile.am

@@ -5 +5 @@
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES)  $(GMP_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
 
-if HAVE_GFANLIB
-  USE_GFANLIB = ${builddir}/dyn_modules/callgfanlib/gfanlib.la ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
-else
-  USE_GFANLIB = 
-endif
-
-# AM_LDFLAGS = libSingular.la ${top_builddir}/kernel/libkernel.la
-
-########################### Dynamic Modules... #########################
 SUBDIRS = dyn_modules
 
-if ENABLE_P_PROCS_DYNAMIC
-  moduledir = $(libexecdir)/singular/MOD
-else !ENABLE_P_PROCS_DYNAMIC
-  moduledir = $(libdir)/singular
-endif !ENABLE_P_PROCS_DYNAMIC
-
-##########################################################################
-module_LTLIBRARIES = pyobject.la
-
-pyobject_la_SOURCES = pyobject.cc
-
-pyobject_la_CXXFLAGS = $(PYTHON_CSPEC)
-pyobject_la_CPPFLAGS = $(PYTHON_CPPFLAGS)  ${AM_CPPFLAGS}
-
-pyobject_la_LDFLAGS = $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) ${AM_LDFLAGS} $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
-###  -export-dynamic -shared -module -avoid-version (add to all DMs?)
-
-##########################################################################
-if PYTHON_USE
-  PY=pyobject.la  $(PYTHON_EXTRA_LIBS)  $(PYTHON_LSPEC) $(PYTHON_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) 
-else !PYTHON_USE
-  PY=
-endif !PYTHON_USE
-
-if SI_EMBED_PYTHON
- EMBED_PYOBJECT   = ${PY} ${builddir}/dyn_modules/syzextra/syzextra.la ${USE_GFANLIB}
-else !SI_EMBED_PYTHON
-  EMBED_PYOBJECT = 
-endif !SI_EMBED_PYTHON
+########################### Possible builtin modules... #########################
+BUILTIN_FLAGS = ${BUILTIN_LIBS}
 
 ########################### libSingular* #########################
@@ -96 +60 @@
    subexpr.cc\
    pyobject_setup.cc\
-   singmathic.cc\
    walk.cc\
    walk_ip.cc\
@@ -161 +124 @@
 
 libSingular_la_LDFLAGS    =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} -release ${PACKAGE_VERSION} ${PTHREAD_LDFLAGS}
-libSingular_la_LIBADD     =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${EMBED_PYOBJECT} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
+libSingular_la_LIBADD     =${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD} ${BUILTIN_FLAGS} ${top_builddir}/kernel/libkernel.la ${PTHREAD_LIBS}
 
 libSingular_includedir = ${includedir}/singular/Singular
@@ -185 +148 @@
 ########################### Singular* #########################
 
-EXTRA_PROGRAMS =  libparse Singulars
+EXTRA_PROGRAMS =  libparse Singulard
 
 # the "optional_programs" variable should be defined in the configure
@@ -197 +160 @@
 Singular_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
 
-Singular_LDADD = libSingular.la ${EMBED_PYOBJECT}
-
-Singular_LDFLAGS = -static ${EMBED_PYOBJECT}
-
-Singulars_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
-
-#  ${EMBED_PYOBJECT_LDFLAGS}  ${EMBED_PYOBJECT_LDFLAGS}
-Singulars_LDADD = libSingular.la ${EMBED_PYOBJECT}
-
-Singulars_LDFLAGS = -static ${AM_LDFLAGS} ${EMBED_PYOBJECT}
+Singular_LDADD = libSingular.la ${BUILTIN_FLAGS}
+
+Singular_LDFLAGS = -static ${AM_LDFLAGS} ${BUILTIN_FLAGS}
+
+Singulard_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
+
+Singulard_LDADD = libSingular.la ${BUILTIN_FLAGS}
+
+Singulard_LDFLAGS = -shared ${AM_LDFLAGS} ${BUILTIN_FLAGS}
 
 scriptdir = $(libexecdir)/singular/MOD
@@ -267 +229 @@
 
 test_SOURCES = test.cc
-# ${EMBED_PYOBJECT_LDFLAGS}
 test_LDADD = libSingular.la 
 

Singular/dyn_modules/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-SUBDIRS=bigintm syzextra callgfanlib callpolymake
+SUBDIRS=staticdemo bigintm syzextra pyobject gfanlib polymake singmathic
 
 

Singular/dyn_modules/bigintm/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../../m4
 
-# moduledir = $(libexecdir)/singular/MOD
-
-if ENABLE_P_PROCS_DYNAMIC
+if SI_BUILTIN_BIGINTM
   noinst_LTLIBRARIES=bigintm.la 
 #  check_LTLIBRARIES=bigintm.la 
-  
+  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION
+  P_PROCS_MODULE_LDFLAGS  = -module
+else
+  module_LTLIBRARIES=bigintm.la 
+  moduledir = $(libexecdir)/singular/MOD
+  P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 
+  P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+  # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 endif
 
@@ -14 +19 @@
 $(FLINT_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) 
 
-bigintm_la_SOURCES   = mod_main.cc bigintm.cc bigintm.h
-
-if ENABLE_P_PROCS_DYNAMIC
-  P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 
-else
-  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION
-endif
-
-bigintm_la_CPPFLAGS   = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
-
-if ENABLE_P_PROCS_DYNAMIC
-  P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
-  # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
-else
-  P_PROCS_MODULE_LDFLAGS = 
-endif
-
-bigintm_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
+bigintm_la_SOURCES  = mod_main.cc bigintm.cc bigintm.h
+bigintm_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
+bigintm_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS}
 
 # AM_COLOR_TESTS=always

Singular/dyn_modules/bigintm/mod_main.cc

@@ -1 @@
-/*
- * Developer's BB tests
- */
+#include <kernel/mod2.h>
 
-
-
-
-
-#include <kernel/mod2.h>
+#include <Singular/mod_lib.h>
 
 #include <Singular/blackbox.h>
@@ -47 +41 @@
 
 
-extern "C" 
+extern "C" int SI_MOD_INIT(bigintm)(SModulFunctions* psModulFunctions) 
 {
-  int mod_init(SModulFunctions* psModulFunctions) 
-  {
-    psModulFunctions->iiAddCproc(currPack->libname,(char*)"printBlackboxTypes",FALSE, printBlackboxTypes0);
-    psModulFunctions->iiAddCproc(currPack->libname,(char*)"bigintm_setup",FALSE, bigintm_setup0);
+   psModulFunctions->iiAddCproc(currPack->libname,(char*)"printBlackboxTypes",FALSE, printBlackboxTypes0);
+   psModulFunctions->iiAddCproc(currPack->libname,(char*)"bigintm_setup",FALSE, bigintm_setup0);
 
-    // Q: should we call 'bigintm_setup' here??!?!?
-    return 0;
-  }
+   // Q: should we call 'bigintm_setup' here??!?!?
+   return 0;
 }

Singular/dyn_modules/gfanlib/Makefile.am

@@ -3 +3 @@
 SOURCES = bbcone.cc bbcone.h bbfan.cc bbfan.h bbpolytope.cc bbpolytope.h gfan.h gitfan.cc gitfan.h gfanlib.cc
 
-MYINCLUDES =  -I${top_srcdir} -I${top_builddir} \
+MY_CPPFLAGS =  -I${top_srcdir} -I${top_builddir} \
 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
 ${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \
 ${FLINT_CFLAGS} ${NTL_CFLAGS} ${GMP_CFLAGS} 
 
-if HAVE_GFANLIB
+if SI_BUILTIN_GFANLIB
+  noinst_LTLIBRARIES=gfanlib.la
+##  moduledir = $(libdir)/singular
+  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION
+  P_PROCS_MODULE_LDFLAGS  = -module
+else
   module_LTLIBRARIES=gfanlib.la
-endif
-
-if ENABLE_P_PROCS_DYNAMIC
   moduledir = $(libexecdir)/singular/MOD
   P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 
 # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
-else
-  moduledir = $(libdir)/singular
-  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION 
+  P_PROCS_MODULE_LDFLAGS =  -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 endif
 
-P_PROCS_MODULE_LDFLAGS =  -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
+gfanlib_la_SOURCES  = $(SOURCES)
 
-gfanlib_la_SOURCES  = $(SOURCES)
-gfanlib_la_CPPFLAGS = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}
-gfanlib_la_LDFLAGS  = ${AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}
+gfanlib_la_CPPFLAGS = ${MY_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON}
+gfanlib_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS}
 
-gfanlib_la_LIBADD   = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
-
+if HAVE_GFANLIB
+ gfanlib_la_LIBADD   = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS}
+endif
 
 #AM_COLOR_TESTS=always

Singular/dyn_modules/gfanlib/bbcone.cc

@@ -1 +1 @@
 #include <kernel/mod2.h>
 
-#include <gfanlib/gfanlib.h>
-#include <gfanlib/gfanlib_q.h>
-
-#include <Singular/ipid.h>
-#include <Singular/ipshell.h>
-#include <Singular/blackbox.h>
+#if HAVE_GFANLIB
+
+#include <bbfan.h>
+#include <bbpolytope.h>
+
 #include <misc/intvec.h>
 #include <misc/sirandom.h>
@@ -12 +11 @@
 #include <coeffs/bigintmat.h>
 
-#include <bbfan.h>
-#include <bbpolytope.h>
+#include <Singular/ipid.h>
+#include <Singular/ipid.h>
+#include <Singular/ipshell.h>
+#include <Singular/blackbox.h>
+
 #include <sstream>
-
-#include "Singular/ipid.h"
 
 // #include <omalloc/omalloc.h>
@@ -23 +23 @@
 // #include <Singular/lists.h>
 // #include <Singular/subexpr.h>
+
+#include <gfanlib/gfanlib.h>
+#include <gfanlib/gfanlib_q.h>
+
 
 int coneID;
@@ -1961 +1965 @@
   coneID=setBlackboxStuff(b,"cone");
 }
+
+#endif

Singular/dyn_modules/gfanlib/bbcone.h

@@ -4 +4 @@
 #include <kernel/mod2.h>
 
-#include <gfanlib/gfanlib.h>
+#if HAVE_GFANLIB
+
 #include <misc/intvec.h>
 #include <coeffs/bigintmat.h>
+#include <Singular/ipid.h>
 
-#include <Singular/ipid.h>
+#include <gfanlib/gfanlib.h>
 
 extern int coneID;
@@ -38 +40 @@
 
 #endif
+#endif

Singular/dyn_modules/gfanlib/bbfan.cc

@@ -1 +1 @@
 #include <kernel/mod2.h>
+
+#if HAVE_GFANLIB
 
 #include <Singular/ipid.h>
@@ -20 +22 @@
 // #include <gfanlib/gfanlib.h>
 // #include <gfanlib/gfanlib_zfan.h>
-
 
 int fanID;
@@ -1062 +1063 @@
   //Print("created type %d (fan)\n",fanID);
 }
+
+#endif

Singular/dyn_modules/gfanlib/bbfan.h

@@ -4 +4 @@
 #include <kernel/mod2.h>
 
+#if HAVE_GFANLIB
+
+#include <Singular/ipid.h>
+
 #include <gfanlib/gfanlib.h>
-#include <Singular/ipid.h>
 
 extern int fanID;
@@ -19 +22 @@
 
 #endif
+#endif

Singular/dyn_modules/gfanlib/bbpolytope.cc

@@ -1 +1 @@
 #include <kernel/mod2.h>
 
-#include <gfanlib/gfanlib.h>
-#include <gfanlib/gfanlib_q.h>
+#if HAVE_GFANLIB
 
 #include <Singular/ipid.h>
@@ -20 +19 @@
 // #include <kernel/ring.h>
 // #include <kernel/polys.h>
+
+#include <gfanlib/gfanlib.h>
+#include <gfanlib/gfanlib_q.h>
 
 int polytopeID;
@@ -489 +491 @@
   //Print("created type %d (polytope)\n",polytopeID);
 }
+
+#endif

Singular/dyn_modules/gfanlib/bbpolytope.h

@@ -4 +4 @@
 #include <kernel/mod2.h>
 
+#if HAVE_GFANLIB
+
+#include <Singular/ipid.h>
 #include <gfanlib/gfanlib.h>
-#include <Singular/ipid.h>
 
 extern int polytopeID;
@@ -18 +20 @@
 
 #endif
+#endif

Singular/dyn_modules/gfanlib/gfan.cc

@@ -6 +6 @@
 
 #include <kernel/mod2.h>
+
+#if HAVE_GFANLIB
 
 #include <misc/options.h>
@@ -4526 +4528 @@
 //     WerrorS("Need wp ordering");
 // }
+
+#endif

Singular/dyn_modules/gfanlib/gfan.h

@@ -6 +6 @@
 #ifndef GFAN_H
 #define GFAN_H
+
+#include <kernel/mod2.h>
+
+#if HAVE_GFANLIB
 
 #include <misc/int64vec.h>
@@ -278 +282 @@
 // bool iv64isStrictlyPositive(int64vec *);
 #endif
+#endif

Singular/dyn_modules/gfanlib/gfanlib.cc

@@ +1 @@
+#include <kernel/mod2.h>
 
-
-
-
-#include <kernel/mod2.h>
+#if HAVE_GFANLIB
 
 #include <bbcone.h>
@@ -13 +11 @@
 #include <Singular/mod_lib.h>
 
+
 template class gfan::Vector<gfan::Integer>;
 template class gfan::Vector<gfan::Rational>;
@@ -18 +17 @@
 template class gfan::Matrix<gfan::Rational>;
 
-int SI_MOD_INIT(gfanlib)(SModulFunctions* p)
+extern "C" int SI_MOD_INIT(gfanlib)(SModulFunctions* p)
 {
   bbcone_setup(p);
@@ -27 +26 @@
 }
 
-#ifndef EMBED_PYTHON
-extern "C"
-{ 
-int mod_init(SModulFunctions* psModulFunctions)
-{ 
-  return SI_MOD_INIT(gfanlib)(psModulFunctions); 
-}
-}
 #endif

Singular/dyn_modules/gfanlib/gitfan.cc

@@ -12 +12 @@
 #include <kernel/mod2.h>
 
+#if HAVE_GFANLIB
+
+#include <bbcone.h>
+#include <bbfan.h>
+#include <gitfan.h>
+
 #include <Singular/ipid.h>
 #include <Singular/lists.h>
 #include <Singular/ipshell.h>
+
 #include <coeffs/bigintmat.h>
 
-#include <bbcone.h>
-#include <bbfan.h>
-#include <gitfan.h>
 
 namespace gitfan
@@ -370 +374 @@
   p->iiAddCproc("","nextAfaceToCheck",FALSE,nextAfaceToCheck);
 }
+
+#endif

Singular/dyn_modules/gfanlib/gitfan.h

@@ -4 +4 @@
 #include <kernel/mod2.h>
 
+#if HAVE_GFANLIB
+
 #include <bbcone.h>
 #include <bbfan.h>
+
 #include <Singular/ipid.h>
+
 
 namespace gitfan
@@ -51 +55 @@
 
 void gitfan_setup(SModulFunctions* p);
+#endif
 
 #endif

Singular/dyn_modules/polymake/polymake_conversion.cc

@@ +1 @@
+#include <kernel/mod2.h>
+
+#ifdef HAVE_POLYMAKE
+
 #include <gmpxx.h>
 
@@ -12 +16 @@
 #include <gfanlib/gfanlib_q.h>
 
-#include <kernel/mod2.h>
 #include <misc/intvec.h>
 #include <coeffs/numbers.h>
@@ -518 +521 @@
   return pf;
 }
+
+#endif

Singular/dyn_modules/polymake/polymake_conversion.h

@@ -3 +3 @@
 
 #include <kernel/mod2.h>
+
+#ifdef HAVE_POLYMAKE
 
 #include <gmpxx.h>
@@ -67 +69 @@
 
 #endif
+#endif

Singular/dyn_modules/polymake/polymake_documentation.cc

@@ +1 @@
+#include <kernel/mod2.h>
+
+#ifdef HAVE_POLYMAKE
+
+/*
+#include <polymake_conversion.h>
+
+#include <Singular/dyn_modules/gfanlib/bbcone.h>
+#include <Singular/dyn_modules/gfanlib/bbfan.h>
+#include <Singular/dyn_modules/gfanlib/bbpolytope.h>
+
+#include <Singular/blackbox.h>
+#include <Singular/ipshell.h>
+#include <Singular/subexpr.h>
+
+#include <string>
+*/
+
 #include <Singular/ipid.h>
+
 
 void init_polymake_help()
@@ -206 +225 @@
 
 }
+#endif

Singular/dyn_modules/polymake/polymake_wrapper.cc

@@ +1 @@
+#include <kernel/mod2.h>
+
+#ifdef HAVE_POLYMAKE
+
+#include <Singular/dyn_modules/gfanlib/bbcone.h>
+#include <Singular/dyn_modules/gfanlib/bbfan.h>
+#include <Singular/dyn_modules/gfanlib/bbpolytope.h>
+
+#include <Singular/blackbox.h>
+#include <Singular/ipshell.h>
+#include <Singular/subexpr.h>
+
 #include <polymake_conversion.h>
 #include <polymake_documentation.h>
 #include <polymake/Graph.h>
-
-#include <Singular/dyn_modules/callgfanlib/bbcone.h>
-#include <Singular/dyn_modules/callgfanlib/bbfan.h>
-#include <Singular/dyn_modules/callgfanlib/bbpolytope.h>
-
-#include <Singular/blackbox.h>
-#include <Singular/ipshell.h>
-#include <Singular/subexpr.h>
 
 polymake::Main* init_polymake=NULL;
@@ -1753 +1757 @@
 }
 
-
-extern "C" int mod_init(SModulFunctions* p)
+extern "C" int SI_MOD_INIT(polymake)(SModulFunctions* p)
 {
   if (init_polymake==NULL)
@@ -1808 +1811 @@
   return 0;
 }
+
+#endif /* HAVE_POLYMAKE */

Singular/dyn_modules/pyobject/pyobject.cc

@@ -707 +707 @@
      (char*)#name, FALSE, name);
 
-int SI_MOD_INIT(pyobject)(SModulFunctions* psModulFunctions)
+extern "C" int SI_MOD_INIT(pyobject)(SModulFunctions* psModulFunctions)
 {
   int tok = -1;
@@ -734 +734 @@
 #undef PYOBJECT_ADD_C_PROC
 
-#ifndef EMBED_PYTHON
-extern "C" {
-  int mod_init(SModulFunctions* psModulFunctions)
-  {
-    return SI_MOD_INIT(pyobject)(psModulFunctions);
-  }
-}
-#endif
-
 #endif /* HAVE_PYTHON */

Singular/dyn_modules/singmathic/singmathic.cc

@@ -1 @@
-// include header files
-
 #include <kernel/mod2.h>
+
+#ifdef HAVE_MATHICGB
+
 #include <misc/auxiliary.h>
 
@@ -11 +12 @@
 #include <Singular/ipid.h>
 #include <Singular/mod_lib.h>
-
-#ifdef HAVE_MATHICGB
 
 #include <mathicgb.h>
@@ -550 +549 @@
 }
 
-#else /* HAVE_MATHICGB */
+/* #else
 
 int SI_MOD_INIT(singmathic)(SModulFunctions* psModulFunctions)
@@ -561 +560 @@
   return 1;
 }
+*/
 
 #endif /* HAVE_MATHICGB */

Singular/dyn_modules/syzextra/Makefile.am

@@ -6 +6 @@
 $(FLINT_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) $(GOOGLE_PERFTOOLS_CFLAGS)
 
-module_LTLIBRARIES=syzextra.la 
-
-if ENABLE_P_PROCS_DYNAMIC
+if SI_BUILTIN_SYZEXTRA
+  noinst_LTLIBRARIES=syzextra.la
+  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION 
+  P_PROCS_MODULE_LDFLAGS = -module
+else
+  module_LTLIBRARIES=syzextra.la
   moduledir = $(libexecdir)/singular/MOD
   P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION 
 # Add under Mac OS X: -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
-else
-  moduledir = $(libdir)/singular
-  P_PROCS_CPPFLAGS_COMMON = -DSTATIC_VERSION 
+  P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 endif
-
-P_PROCS_MODULE_LDFLAGS = -module -export-dynamic -avoid-version -flat_namespace -weak_reference_mismatches weak -undefined dynamic_lookup
 
 SOURCES = mod_main.cc DebugPrint.cc DebugPrint.h myNF.cc myNF.h singularxx_defs.h syzextra.cc syzextra.h

Singular/dyn_modules/syzextra/mod_main.cc

@@ -1 @@
-
-
-
-
 #include <kernel/mod2.h>
 
@@ -1926 +1922 @@
 END_NAMESPACE
 
-
-int SI_MOD_INIT(syzextra)(SModulFunctions* psModulFunctions)
+extern "C" int SI_MOD_INIT(syzextra)(SModulFunctions* psModulFunctions) 
 {
 
@@ -1988 +1983 @@
   return 0;
 }
-
-#ifndef EMBED_PYTHON
-extern "C" {
-int mod_init(SModulFunctions* psModulFunctions)
-{
-  return SI_MOD_INIT(syzextra)(psModulFunctions);
-}
-}
-#endif

Singular/dyn_modules/syzextra/syzextra.cc

@@ -66 +66 @@
 BEGIN_NAMESPACE(SORT_c_ds)
 
-
-#ifdef _GNU_SOURCE
-static int cmp_c_ds(const void *p1, const void *p2, void *R)
-{
+#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || defined __FREEBSD__ || defined __BSD__ || defined OpenBSD3_1 || defined OpenBSD3_9)
+static int cmp_c_ds(void *R, const void *p1, const void *p2){
+#elif (defined _GNU_SOURCE || defined __GNU__ || defined __linux__)
+static int cmp_c_ds(const void *p1, const void *p2, void *R){
 #else
-static int cmp_c_ds(const void *p1, const void *p2)
-{
-  void *R = currRing;
-#endif
-
+static int cmp_c_ds(const void *p1, const void *p2){ void *R = currRing;
+#endif
+  assume(R != NULL);
   const int YES = 1;
   const int NO = -1;
@@ -81 +79 @@
   const ring r =  (const ring) R; // TODO/NOTE: the structure is known: C, lp!!!
 
-  assume( r == currRing );
+  assume( r == currRing ); // for now...
 
   const poly a = *(const poly*)p1;
@@ -154 +152 @@
 }
 
-
+/*
 static int cmp_poly(const poly &a, const poly &b)
 {
@@ -200 +198 @@
   return 0;
 }
+*/
 
 END_NAMESPACE
@@ -390 +389 @@
   const int sizeNew = IDELEMS(id);
 
-#ifdef _GNU_SOURCE
+#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || defined __FREEBSD__ || defined __BSD__ || defined OpenBSD3_1 || defined OpenBSD3_9)
+#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, r, cmp)
+#elif (defined _GNU_SOURCE || defined __GNU__ || defined __linux__)
 #define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, cmp, r)
 #else
-#define qsort_my(m, s, ss, r, cmp) qsort_r(m, s, ss, cmp)
+#define qsort_my(m, s, ss, r, cmp) qsort(m, s, ss, cmp)
 #endif
 

Singular/iparith.cc

@@ -7907 +7907 @@
             if (traceit&TRACE_CALL)
               Print("call %s(%s,%s)\n",iiTwoOps(op),
-              Tok2Cmdname(an->rtyp),Tok2Cmdname(bn->rtyp));
+              Tok2Cmdname(dArith2[i].arg1),Tok2Cmdname(dArith2[i].arg2));
             failed= ((iiConvert(at,dArith2[i].arg1,ai,a,an))
             || (iiConvert(bt,dArith2[i].arg2,bi,b,bn))
@@ -8092 +8092 @@
             if (!failed)
             {
+              if (traceit&TRACE_CALL)
+                Print("call %s(%s)\n",iiTwoOps(op),Tok2Cmdname(dArith1[i].arg));
               #ifdef PROC_BUG
               dArith1[i].p(res,a);
@@ -8112 +8114 @@
           else
           {
-            if (traceit&TRACE_CALL)
-              Print("call %s(%s)\n",iiTwoOps(op),Tok2Cmdname(an->rtyp));
             if (an->Next() != NULL)
             {
@@ -8262 +8262 @@
               if (traceit&TRACE_CALL)
                 Print("call %s(%s,%s,%s)\n",
-                  iiTwoOps(op),Tok2Cmdname(an->rtyp),
-                  Tok2Cmdname(bn->rtyp),Tok2Cmdname(cn->rtyp));
+                  iiTwoOps(op),Tok2Cmdname(dArith3[i].arg1),
+                  Tok2Cmdname(dArith3[i].arg2),Tok2Cmdname(dArith3[i].arg3));
               failed= ((iiConvert(at,dArith3[i].arg1,ai,a,an))
                 || (iiConvert(bt,dArith3[i].arg2,bi,b,bn))

Singular/iplib.cc

@@ -716 +716 @@
 }
 
-int SI_MOD_INIT(staticdemo)(SModulFunctions*){ PrintS("init of staticdemo\n"); return (0); }
-
-#define SI_GET_BUILTIN_MOD_INIT(name) \
- if (strcmp(libname, #name ".so") == 0){ int SI_MOD_INIT(name)(SModulFunctions*); return SI_MOD_INIT(name); }
+
+extern "C"
+{
+#  define SI_GET_BUILTIN_MOD_INIT0(name) int SI_MOD_INIT0(name)(SModulFunctions*);
+          SI_FOREACH_BUILTIN(SI_GET_BUILTIN_MOD_INIT0)
+#  undef  SI_GET_BUILTIN_MOD_INIT0
+};
+
 
 SModulFunc_t
 iiGetBuiltinModInit(const char* libname)
 {
-  SI_FOREACH_BUILTIN(SI_GET_BUILTIN_MOD_INIT)
+#  define SI_GET_BUILTIN_MOD_INIT(name) if (strcmp(libname, #name ".so") == 0){ return SI_MOD_INIT0(name); }
+          SI_FOREACH_BUILTIN(SI_GET_BUILTIN_MOD_INIT)
+#  undef  SI_GET_BUILTIN_MOD_INIT
 
   return NULL;
@@ -730 +736 @@
 
 
-#undef SI_GET_BUILTIN_MOD_INIT
 
 
@@ -1100 +1105 @@
       else            sModulFunctions.iiAddCproc = iiAddCproc;
       (*fktn)(&sModulFunctions);
-    }
-    else Werror("mod_init: %s\n", dynl_error());
-    if (BVERBOSE(V_LOAD_LIB)) Print( "// ** loaded %s \n", fullname);
-    currPack->loaded=1;
-    currPack=s;
-  }
-  RET=FALSE;
+      if (BVERBOSE(V_LOAD_LIB)) Print( "// ** loaded %s \n", fullname);
+      currPack->loaded=1;
+      currPack=s;
+      RET=FALSE;
+    }
+    else Werror("mod_init not found:: %s\nThis is probably not a dynamic module for Singular!\n", dynl_error());
+  }
 
   load_modules_end:

Singular/ipshell.cc

@@ -5824 +5824 @@
   if ((a->Typ()==INT_CMD)&&((long)a->Data()>=0))
   {
-    if ((TEST_V_ALLWARN) && (myynest==0)) WarnS("ASSUME at top level");
+    if ((TEST_V_ALLWARN) && (myynest==0)) WarnS("ASSUME at top level is of no use: see documentation");
     char       assume_yylinebuf[80];
     strncpy(assume_yylinebuf,my_yylinebuf,79);

Singular/links/semaphore.c

@@ -6 +6 @@
 
 #ifdef HAVE_SIMPLEIPC
+#include <semaphore.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 
 # include "simpleipc.h"
@@ -12 +21 @@
 #include <reporter/si_signals.h>
 
-#include <semaphore.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 

Singular/links/ssiLink.cc

@@ -63 +63 @@
 
 // 64 bit version:
-//#if SIZEOF_LONG == 8
-#if 0
+#if SIZEOF_LONG == 8
 #define MAX_NUM_SIZE 60
 #define POW_2_28 (1L<<60)

Singular/mod_lib.cc

@@ -1 @@
-
-
-
-
 #include <kernel/mod2.h>
 

Singular/mod_lib.h

@@ -2 +2 @@
 #define MOD_LIB_H
 
-// #include config.h
-#include <kernel/mod2.h> /* for EMBED_PYTHON, HAVE_MATHICGB */
+#define SI_MOD_INIT0(name) name##_mod_init
 
-#include <polys/mod_raw.h>  /* for lib_types */
-
-lib_types type_of_LIB(const char *newlib, char *fullname);
-
-
-#if HAVE_GFANLIB
-#define SI_BUILTIN_GFANLIB(add) add(gfanlib)
-#else
-#define SI_BUILTIN_GFANLIB(add)
+#ifdef STATIC_VERSION
+#  define SI_MOD_INIT(name) SI_MOD_INIT0(name)
+#elif defined(DYNAMIC_VERSION)
+#  define SI_MOD_INIT(name) mod_init
 #endif
 
-
-#ifdef EMBED_PYTHON
-#define SI_BUILTIN_PYOBJECT(add) add(pyobject)  add(syzextra)      SI_BUILTIN_GFANLIB(add)
-//TODO: the line above means that syzextra should be staticly embedded IFF pyobjects do so :(
-#else
-#define SI_BUILTIN_PYOBJECT(add)
-#endif
-
-#ifdef HAVE_MATHICGB
-# define SI_BUILTIN_MATHIC(add) add(singmathic)
-#else
-# define SI_BUILTIN_MATHIC(add)
-#endif
+// Note that STATIC_VERSION and DYNAMIC_VERSION should not be defined in the following config header mod2.h!
+#include <kernel/mod2.h> /* for SI_BUILTINMODULES_ADD */
 
 /// Data for @c type_of_LIB to determine built-in modules,
 /// use @c add(name) to add built-in library to macro
-#define SI_FOREACH_BUILTIN(add)\
-    add(staticdemo)\
-    SI_BUILTIN_MATHIC(add)\
-    SI_BUILTIN_PYOBJECT(add)
+#define SI_FOREACH_BUILTIN(add) SI_BUILTINMODULES_ADD(add)
 
-#define SI_MOD_INIT(name) name##_mod_init
+#include <polys/mod_raw.h>  /* for lib_types */
+lib_types type_of_LIB(const char *newlib, char *fullname);
 
 #endif
 
+/*
+#if HAVE_GFANLIB
+#define SI_BUILTIN_GFANLIB(add) add(gfanlib)
+#endif
+#ifdef HAVE_MATHICGB
+# define SI_BUILTIN_MATHIC(add) add(singmathic)
+#endif
+#ifdef EMBED_PYTHON
+//TODO: the line above means that syzextra should be staticly embedded IFF pyobjects do so :(((((
+#define SI_BUILTIN_PYOBJECT(add) add(pyobject) add(syzextra) SI_BUILTIN_GFANLIB(add) SI_BUILTIN_MATHIC(add)
+#endif
+*/

Singular/pyobject_setup.cc

@@ -13 +13 @@
 //*****************************************************************************
 
+#include <kernel/mod2.h>
 
-
-
-
-#include <kernel/mod2.h>
 #include <Singular/blackbox.h>
 #include <Singular/ipshell.h>
-
-//#ifdef EMBED_PYTHON
-//#include "pyobject.cc"
-//#endif
 
 static BOOLEAN pyobject_load()
@@ -53 +46 @@
 
 /// Explicitely load, if not loaded already
-BOOLEAN pyobject_ensure() {
+BOOLEAN pyobject_ensure() 
+{
 
   int tok = -1;
@@ -61 +55 @@
   return (bbx->blackbox_Init == pyobject_autoload?  pyobject_load(): FALSE);
 }
-
-
-

Tst/Short.lst

@@ -188 +188 @@
 Short/lres_s.tst
 Short/minor_s.tst
-Short/modstd_s.tst
 Short/modulo_s.tst
 Short/monodromy_s.tst

Tst/Short/pyobject.res.gz.uu

@@ -1 @@
-begin 664 pyobject.res.gz
-M'XL("`X&QE```W!Y;V)J96-T+G)E<P#M&FMOX\;QNW_%1B@@RM;I2$I\R(X5
-MY*Y%&Z"X%+T`_>"Z,B6O;?8HDB`I6TK1_]Z9?<R.'K;/*5H@0"Z(S-UY[,SL
-M[,SLD)]_^OT/GX00P4S\^8</HM>UW:C(%[V+D\\&$LX$3,[S,N^\P<4)_A6S
-MF:BWU>*?<MF-2ODT:KNL(X+Q3-#S9"3>OQ??MVU^7ZYDV8GJ3K1=DY?WHL@[
-MV61%*[+R5N1E)^]ETQ)A-*(5X`%(Q*7H97NT3,IXQO&K4@)^X,`)DRD=N>?I
-M2'._..GO,^];I,"?:987)P'-!8YA$#J&P5@I_/%!+K\@KWK;/52ED$U3.>6"
-MB5E5G%G&(,IW3@&%+JKE<MW(6PU;9F59=6)9E<NLDR7\+_K`H:^LUP?S]84F
-M;C4^8P$\P+X"A@MY5S52:#&*'(P43,[%S:XL-R1F---BXK:_*J"6QL#S5BAI
-MLZ+(%H5\FTB1%0G6=<+$5IA@J`7]_PH5DU!N?2<<<Z\@U1Y0K>HU;%);K63W
-M@*X`K(TW$"IXWZV\$XULUT4'#JOA<_F8%5YO<A;U!N3!(3BAQKLXF=(D\\(0
-MO!#<P--(`X[%#F2H#^0?-G*)TAF!EM5J!7[4BKNF6HG/(.VZR!JB46=12=:L
-M2Z^'(J^V=8.KG6;-?3LX%VHD<,!ECMG"R8B(>I_E(\0"*<MST1N"]8#$Z[/)
-MOIHDTG1&I(CI`%/'?^PKQ?XH.]%M:TG3P4B-JSO/L``.UF,(*61\QL3GLPH'
-M!`#+Z0#A[6Q37WD%3/=[`^#MAD08,>XQ<<\Z0%O`)A`,+*0GK:A#T;M;E\MY
-MF:TDFK5OYAWKE+&>NL@C,$CG69'_G'5Y55J4B<^"JES5W9:V:@*>9&8^@6_3
-M-`9_;3X%/6*\"?.NR<1%PDFDY#$>5N1MM^M=>@JC5[9<RK85$'571!PS28L"
-MC@9BX]$+AV+L/&P"!Z\H+DZN#.2:`"D"KH+KBY.0YL!=ZJ9:>L;*13'LS>?W
-MLL.5YW/8/B\$UF.+'_E.LRAPFD4A:@:Z_:UJOK1#C"M_J8KMA^JO.3Y#2JO@
-M6!?YH\0X9(G&S!SS?%57#1R$&N@659.S0Q/I$WHKEV`D.5<.IY3_4%3++UYO
-M@R?&'PR%&6_U>,`X:,LK^]H%YOFMS-".WL8+!F<;T'2(/V=;&#+2V"QN@U(`
-M)/=-)1>E;.:+K,U;;Y<EHTT4K:%STSH>&B\R4$8UY51JPPPD]IW)8V;^.&2.
-M_O0`T54V8/1&9K=;E!S"]:W-A>(I!^]92%'!9CPU>0>ID_B,=?0UI'-+:GW-
-MR1A/9OM8Z'+7YYA"J"2(V3F/X\.0N<?!@ZC9R&[=E!#K</]!I]-3F%)P3!C[
-M@IV>$OOD0"",C$%"""PPQ-/G].PQJ_3>)$#B'['($1LG+$$EX8%-D&Z^V,Y-
-MD+@435;>2P_<F1V(A`689#(2!W2P%SZ<`1T!AF(R%-%0Q$.1#$4Z%%.*"8FJ
-M9[@`Q2$SOC!+7XEV[L\/U;JX%4W>2E,YK"!T9?<2*HNG<T).CTJIZHV;`\`-
-M!HUU:>;?5)4DZ?D1AJXN25B"3'6"_$EB5-#VUE&($(+1?GBJ>#9/(1=@)L(<
-M5[7YAK)0"AO4RAKFW[LY.#(HHI[_>^D`[)2D.MI\6J]DDT-9)JH:"F_,6%0J
-MIPE+!-U3!3X2.HE25O1W#XW$HG_LP$S[*6B/Y&<:[^(D(@BX*$+>6<@[.M'3
-M4(-.+2@FR%A#WEN(3Y")AOS#0E*"1(;;Z2&(>=H4--:Z?(OHG'6J&7QKZ9V@
-MH*FAN=PE"GS?$%WN4P6^T?SR<E^+P`\="-DYFK%=:;8/,8K/#IE%1'/`+C9$
-M1T1(-.B;`XU2!]C7R.UX$/C';I!_DD51'8MU&H,B7(`7/'LOZF&F+VZ_`;J^
-M8F#&?4(.+?(I^I]&<C\.;\SDF[CSJ`L26X831K1?$,)AO.K/YWB#F<^A2,;G
-M(FM;-ZA:N/S0L+JE9U`T@PS;NG&!O&F8+SMZKI;V$0+.*B,`E$KLD0I8FBNJ
-M!10_=OB0M0_V&>M1^[RJ;M<%$6%$H6?Y9!]A9]9+N3>2&S=1D^BM%H6&^<]0
-M:-"(`=8+9:R'JOJBYU1Q;6SFQF`T&EBKN0FPDQM42WHVRM,8]>I?TU:"G[^M
-MM@_P3OD""0P6V^_+[8]8_GPR3"QI^NIJN[1N47:`PH,#%.()JK?F/VJ^!'@-
-MY86U1H8UE]6Z[+"NABH55IT0@3TOX?FY08):&%#P1+20?8K\+H>\!]=U?8&)
-MB'+L*!6A9@U)$RCQ`BE6F",=#[;HQ)*.=BEI43B*##UBIM")J@,$C!4KN5I`
-MS8D61>E41X%0D\/*#_U:61)KOAI<D.U5Z/:*T,!R^(S3N,_40N!DTY?)<(^)
-MCK9W[!]2_193?ETQ!09VEUU\&;LZ.QA#G?T%KCVON(?%'O_F$K]VEW!N,&%N
-M$'V-&V!8>S?;O<OH*\A'W7"&#92==-TJYGVCMW50Q]C7_642W9!2D$>/L\`F
-MHK#_WJQ4D+Q5F?A995Z3Q"F3L-U*1Z_$\Y<5>[$);A,5=<+AS$!N/;JI;S0#
-M7D!_F=S.#*SFF/C'FX:J^;C7.O06ZWMQEV_D[7<#H@]V^H9S36<Z.B[H85O3
-M0B'6T?EAO<Q@HNOS954^RD:E_:Y2[4HE$-14CW))N-'(S(A'WZT"SHI#NKE@
-MMY*D@S\^2,;QH13`6>QG.)&8=2+?+7/I!<-PZ%JA013L,D?>#A@JUH>-TB`"
-ME35/3T=^Q9:@+*!$I.1N`_P**:;T[QK;X'S#C1-:V6[LJZR%M,8%#P/;&I.^
-M[541QI1?(M2-7N>IJ7!CM[4T#5=5;NI7!J+_((O:B'5!-504SYXW@_8SO=J>
-MW_]/S1"_9(87A/HOS,""%[9XU9O3YM(?;H9%[?P.O%<UD['UC"A*EL9Y;>QZ
-M[$'L&E!:^FX--7EOH-O?37$5C$;C:^Q6>_Y07/4W_6OX<]4O:DB'5\$UCOH?
-M\=F_OKZFF!"';`G=A<>WS4VFB_>GO'O`"AU2^!J2+FZ">W\4Q!`%".CUGIJL
-MKK$2'_;<U8A54]@#MCCZ`1NC%A@S07A?J[5OOO"==>+PTYGE,:H!1&@.8SIS
-MJ]27U/\-$F;6!,T*MS.Q+A'7(_FRYGX@_F6;T!X,1S6XR+^)$`S7PH5)KKQ>
-M7K8=E(-X'7$V$&0$>-;<(?TY:[#.;9!,F,(-Y-^L53WH?2-AD]:"64<[8,W8
-M`)NQ2B.E#W$U^I!^C6PO\$<9#X`7I"I,[BB:'E64*<>5/E23A>B47YI+.)QV
-M6Z>$G@:T:0"P.`X<[N[IE`#,FJE[T1:DT7&?7JSSHGN74R\UP':K,EM7S?$E
-MSH'EK'D4,!P/N(W2Y%4;(1G\-=QW3)2F3/8I,Q&$,H5]V9LH<J*8XD<7*(?%
-M`&8AY:4IN^],0Z,6)F:C&/Q8I9C3M7B(]"M<!#[K#]C=?4772_BA]794G;*4
-M.<4WYR@+>N#F+'!(X,U6,7SO[P")`\`5'F@HXDZ9#:=3VO_0]Y_9_XH[@2I=
-M*)*U1!SLQ+<,,M*#;)X);R&VA0V*4+\.`B93,\<C58C=84/!XE3HNR9+Z(-[
-MLL"@L8^DT!NTS8W:04"[,?+<V,\[VG6-+R_H3<JF!BV`HR9#"O7P+!0NHDV^
-MN7D]`9^?DP/H-.SC)R*0.U=PH!MA??!"?'V25;MN2G`PQ"-&,;:,*2$61;;\
-MLJ@V\Q_KH(\?5"D.Q@Y>!`<774A4-?D^3`8#91W5YL(/L:Q]].K.B.6R6M4@
-MV:*0VHU<Q4(;E?`0S3X7"/V4;>>4'TM<IO74:TA]+"T:MNF%R.^$9]X0ZWV]
-M-.&$AR5WOA&''=@0O\`ZSL0Z]$N)+L16O!M$7W_XE5;\](>!2U,A7"H/'9J`
-MZ=$\%V('EA%19`CU!T"6@$>&D'T&%(8[T5"]HO?TN__C\;#GK?*V!4<;])Z+
-MAV'XAGBHUMHQB>Z[VFBBCN;Q8C#$EJM&T*]T7ROQAJ)/TE,3)&1?'878C<6/
-6%_'[Q'7K<:G`_K\[^0^V-F^/_B@`````
+begin 644 pyobject.res.gz
+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
+93_%S0_RB<--Y7"JP_^]._@/RC@7*L"@`````
 `
 end

Tst/Short/pyobject.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1340804707:3144- exported :3-1-4:x86_64-Linux:lts035:227368
-1 >> tst_memory_1 :: 1340804707:3144- exported :3-1-4:x86_64-Linux:lts035:3239936
-1 >> tst_memory_2 :: 1340804707:3144- exported :3-1-4:x86_64-Linux:lts035:3239936
-1 >> tst_timer_1 :: 1340804707:3144- exported :3-1-4:x86_64-Linux:lts035:9
+1 >> tst_memory_0 :: 1400685929:4.0.0, 64 bit:4.0.0:x86_64-Linux:dilbert:196488
+1 >> tst_memory_1 :: 1400685929:4.0.0, 64 bit:4.0.0:x86_64-Linux:dilbert:3203072
+1 >> tst_memory_2 :: 1400685929:4.0.0, 64 bit:4.0.0:x86_64-Linux:dilbert:3203072
+1 >> tst_timer_1 :: 1400685929:4.0.0, 64 bit:4.0.0:x86_64-Linux:dilbert:3

Tst/Short/ringutils_s.res.gz.uu

@@ -1 +1 @@
 begin 640 ringutils_s.res.gz
-M'XL(".&J;%,``W)I;F=U=&EL<U]S+G)E<P"-E=UNXC`0A>]YBMFH%P&Q(;$=
-M"$*)M+\2TNY*V[37)=N8UA)R2FRV??PZE,3C4"A(B`C.G.]XF$SRF^_+/P`0
-M9?!K^14\K72P$?^\Q2`__$(R,%_>"2FT/UP,FD_(,JB%?-AIL5%W*I#\.5"Z
-MT%T-S:"[9H&]CH.&XC6U/<H45<P"J)ZTJ*3O/1>U](96EF3P)<]O?__PP_%!
-MM%0YUZT2C'8R@=$(=HK#2DC]G]^O0$BE>5%"M895R=>KSF^>=2A9]6!1B&$A
-MI.DI8EM@FCB9?#[SZI0DV#<0:O-.H>;%9OPR+I^L%778!BW4WUVE!9?ZVA3Z
-MIM"@P18PV\#(M'F[M]^^^4=6-L6^/<_MD>D,F28V,C&>IK7\@=>]V/.CEAWG
-M)@Z#A)9!(AR<I*%5$6PL*_U>]IXQ&D+";'AJPH=N;!)?$)NZ[FA@R0S'IJEM
-M-TD^:'?/='Y^@%H=#9WQ<?^*M_&ON9ES<Z\>1*-15QOA2)\>"_53\$WYK>+K
-MM;AOPOG["CS8E-C#4MH=MD&79G3]%R1E']MO7?,8F4_=(0O/G(G@0\UZM\O)
-M<Q&7G2#VW)T1XU0,S_`IXK/P4CYU^"RR?(9V`FOX^ZW016A5_<5PDL1<$MH/
-L++:DN"7U.=-+.;'+02N#)7;U,]/=YC'2/"9VRH^&"[A:#%X!]!%M(7X&````
+M'XL("*!#@U,``W)I;F=U=&EL<U]S+G)E<P"-E5N/VC`0A=_Y%5/4AX!H2&R'
+M2Q&1>I60VDHM[?.2$K.UE-H0F]W]^9VP26R'PH*$B,B9\QU/)O;ZY\?5-P"(
+M4_BR>@]]HTU8B-_]16]=WR$IX)]W0@H3#!:]ZA?2%$HA[X]&%/I.AY(_AMID
+MIJVA*;37++3725A1^E5MAS)Q*J8AJ+T12@;]QZR4_8&5S5)XMU[_^OHIB$:U
+M:*77W#1*0.UX#,-A+8/,@%%[*/@#+T!H4#N0"HZ:OP7-.>1J>_S+)69'I[H2
+M;\)&2//`MQL04AN>Y57=)N>[39MDGK8AI>K$C",W9@3+Y:6L30&V?SQ^<^73
+M*DEX:CV4^%U"R;-B]#3*]]:*>FQ$"_W]J(S`5?[`P@`+$0VV@-G6Q_B`#B?[
+MP[-_;&43U[?C>3@SG3JF,QN9H">VEM_SLA-[?M:R\]S$8Y#(,DCL!B?+R*J(
+M:RR5^5_VCK$SOH39\!3#1WYLDMP0F_KNSJB3J1N;+FV[R>R%=G=,Y]<'J-'1
+MR!L?_U$\CW_)<<[Q+:]%PV%;&[N17OW)]&?!B_R#XKN=V%;A@E.%.]B4V,52
+MVBZV0N<XNL&3(V4OVQ]\\\0QG_A#%EU9$W$7->V\+A?717SVS&'/_1E!IVQP
+MA4\=/HMNY5./SV++9\Z>P"K^:5=H(S2J[L9PD<1\DK,_L,22DH;4Y4QNY20^
+@Q]DRV,P>&@R[6QU`U0%SU$$\6,#K1>\?U():S[@&````
 `
 end

configure.ac

@@ -121 +121 @@
 
 SING_CHECK_PLURAL
+
+SING_BUILTIN_MODULES
 
 ### the following is needed due to the use of om_sing_opt_show_mem in misc_ip.cc...
@@ -236 +238 @@
 AC_CONFIG_FILES([Singular/dyn_modules/bigintm/Makefile])
 AC_CONFIG_FILES([Singular/dyn_modules/syzextra/Makefile])
-AC_CONFIG_FILES([Singular/dyn_modules/callgfanlib/Makefile])
-AC_CONFIG_FILES([Singular/dyn_modules/callpolymake/Makefile])
+AC_CONFIG_FILES([Singular/dyn_modules/gfanlib/Makefile])
+AC_CONFIG_FILES([Singular/dyn_modules/polymake/Makefile])
+AC_CONFIG_FILES([Singular/dyn_modules/pyobject/Makefile])
+AC_CONFIG_FILES([Singular/dyn_modules/singmathic/Makefile])
+AC_CONFIG_FILES([Singular/dyn_modules/staticdemo/Makefile])
 
 AC_CONFIG_FILES([Singular/Makefile])

kernel/GBEngine/Makefile.am

@@ -7 +7 @@
 libGBEngine_la_SOURCES=khstd.cc kstdfac.cc kstd1.cc kstd2.cc kutil.cc nc.cc sca.cc gr_kstd2.cc kspoly.cc kpolys.cc syz.cc syz0.cc syz1.cc syz2.cc syz3.cc units.cc tgb.cc tgbgauss.cc f5data.cc f5lists.cc f5gb.cc f5c.cc ratgring.cc shiftgb.cc ringgb.cc janet.cc
 
-libGBEngine_la_includedir=$(includedir)/kernel/GBEngine
+libGBEngine_la_includedir=$(includedir)/singular/kernel/GBEngine
 libGBEngine_la_include_HEADERS=stairc.h syz.h kstdfac.h kutil.h khstd.h kstd1.h units.h ratgring.h shiftgb.h nc.h kInline.h tgb.h ringgb.h tgbgauss.h tgb_internal.h f5c.h f5data.h f5gb.h f5lists.h janet.h
 

kernel/combinatorics/Makefile.am

@@ -7 +7 @@
 libcombinatorics_la_SOURCES=hdegree.cc hilb.cc hutil.cc
 
-libcombinatorics_la_includedir=$(includedir)/kernel/combinatorics
+libcombinatorics_la_includedir=$(includedir)/singular/kernel/combinatorics
 libcombinatorics_la_include_HEADERS=hutil.h
 

kernel/fglm/Makefile.am

@@ -7 +7 @@
 libfglm_la_SOURCES=fglmzero.cc fglmvec.cc fglmgauss.cc fglmhom.cc fglmcomb.cc
 
-libfglm_la_includedir=$(includedir)/singular/fglm
+libfglm_la_includedir=$(includedir)/singular/kernel/fglm
 libfglm_la_include_HEADERS=fglm.h fglmgauss.h fglmvec.h
 

kernel/groebner_walk/Makefile.am

@@ -7 +7 @@
 libgroebner_walk_la_SOURCES=walkProc.cc walkMain.cc walkSupport.cc
 
-libgroebner_walk_la_includedir=$(includedir)/kernel/groebner_walk
+libgroebner_walk_la_includedir=$(includedir)/singular/kernel/groebner_walk
 libgroebner_walk_la_include_HEADERS=walkProc.h walkMain.h walkSupport.h
 

kernel/linear_algebra/Makefile.am

@@ -10 +10 @@
 
 
-liblinear_algebra_la_includedir=$(includedir)/kernel/linear_algebra
+liblinear_algebra_la_includedir=$(includedir)/singular/kernel/linear_algebra
 liblinear_algebra_la_include_HEADERS= \
   Minor.h MinorInterface.h MinorProcessor.h \

kernel/maps/Makefile.am

@@ -7 +7 @@
 libmaps_la_SOURCES=fast_maps.cc
 
-libmaps_la_includedir=$(includedir)/kernel/maps
+libmaps_la_includedir=$(includedir)/singular/kernel/maps
 libmaps_la_include_HEADERS=fast_maps.h
 

kernel/spectrum/Makefile.am

@@ -7 +7 @@
 libspectrum_la_SOURCES=GMPrat.cc multicnt.cc npolygon.cc semic.cc spectrum.cc splist.cc
 
-libspectrum_la_includedir=$(includedir)/kernel/spectrum
+libspectrum_la_includedir=$(includedir)/singular/kernel/spectrum
 libspectrum_la_include_HEADERS=GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h kmatrix.h
 

libpolys/coeffs/longrat.cc

@@ -17 +17 @@
 
 // 64 bit version:
-//#if SIZEOF_LONG == 8
-#if 0
+#if SIZEOF_LONG == 8
+//#if 0
 #define MAX_NUM_SIZE 60
 #define POW_2_28 (1L<<60)
@@ -265 +265 @@
   if ( SR_HDL(n) & SR_INT )
   {
-    term = SR_TO_INT(n);
+    int nn=SR_TO_INT(n);
+    if ((long)nn==SR_TO_INT(n))
+       term = nn;
+    else
+    {
+        mpz_t dummy;
+        mpz_init_set_si(dummy, SR_TO_INT(n));
+        term = make_cf(dummy);
+    }
   }
   else
@@ -534 +542 @@
   nlTest(i, r);
   nlNormalize(i,r);
-  if (SR_HDL(i) &SR_INT) return SR_TO_INT(i);
+  if (SR_HDL(i) & SR_INT)
+  {
+    int dummy = SR_TO_INT(i);
+    if((long)dummy == SR_TO_INT(i))
+        return SR_TO_INT(i);
+    else
+        return 0;
+  }
   if (i->s==3)
   {
@@ -563 +578 @@
   nlTest(i, r);
   nlNormalize(i,r);
-  if (SR_HDL(i) &SR_INT) return (i);
+  if (SR_HDL(i) & SR_INT) return (i);
   if (i->s==3)
   {
@@ -786 +801 @@
   {
     LONG bb=SR_TO_INT(b);
-    LONG c=SR_TO_INT(a)%bb;
+    LONG c=SR_TO_INT(a) % bb;
+    /*if(c < 0)
+    {
+        if(bb < 0)
+            c = c - bb;
+        else
+            c = c + bb;
+    }*/
+    /*if((((SR_TO_INT(a)) / (bb))*bb+c) != SR_TO_INT(a))
+    {
+        printf("\nERROR longrat:819\n");
+        printf("\na = %ld\n",SR_TO_INT(a));
+        printf("\nb = %ld\n",bb);
+        printf("\nc = %ld\n",c);
+    }*/
     return INT_TO_SR(c);
   }
   if (SR_HDL(a) & SR_INT)
   {
-    /* a is a small and b is a large int: -> a */
-    return a;
+    // a is a small and b is a large int: -> a
+    //  INCORRECT, IT COULD HAPPEN THAT b IS A SMALL NUMBER
+    number aa=ALLOC_RNUMBER();
+    mpz_init(aa->z);
+    mpz_set_si(aa->z, SR_TO_INT(a));
+    u=ALLOC_RNUMBER();
+#if defined(LDEBUG)
+    u->debug=123456;
+#endif
+    u->s = 3;
+    mpz_init(u->z);
+    mpz_mod(u->z,aa->z,b->z);
+    if (mpz_isNeg(u->z))
+    {
+      if (mpz_isNeg(b->z))
+        mpz_sub(u->z,aa->z,b->z);
+      else
+        mpz_add(u->z,aa->z,b->z);
+    }
+    /*mpz_t dummy;
+    mpz_init(dummy);
+    mpz_fdiv_q(dummy, aa->z, b->z);
+    mpz_mul(dummy, dummy, b->z);
+    mpz_add(dummy, dummy, u->z);
+    if(mpz_cmp(dummy,aa->z) != 0)
+    {
+        printf("\nERROR longrat:911\n");
+        printf("\na = ");n_Print(aa,r);
+        gmp_printf("\ndummy = %Zd",dummy);
+        mpz_clear(dummy);mpz_init(dummy);mpz_tdiv_q(dummy, a->z, b->z);
+        gmp_printf("\na div b = %Zd\n u = ", dummy);
+        n_Print(u,r);
+    }
+    mpz_clear(dummy);*/
+    mpz_clear(aa->z);
+    #if defined(LDEBUG)
+    aa->debug=654324;
+    #endif
+    FREE_RNUMBER(aa);
+    u=nlShort3(u);
+    nlTest(u,r);
+    return u;
   }
   number bb=NULL;
@@ -807 +876 @@
   u->s = 3;
   mpz_mod(u->z,a->z,b->z);
-  if (bb!=NULL)
-  {
-    mpz_clear(bb->z);
-#if defined(LDEBUG)
-    bb->debug=654324;
-#endif
-    FREE_RNUMBER(bb);
-  }
   if (mpz_isNeg(u->z))
   {
@@ -822 +883 @@
       mpz_add(u->z,u->z,b->z);
   }
+  if (bb!=NULL)
+  {
+    mpz_clear(bb->z);
+#if defined(LDEBUG)
+    bb->debug=654324;
+#endif
+    FREE_RNUMBER(bb);
+  }
+  /*mpz_t dummy;
+  mpz_init(dummy);
+    mpz_fdiv_q(dummy, a->z, b->z);
+    mpz_mul(dummy, dummy, b->z);
+    mpz_add(dummy, dummy, u->z);
+    if(mpz_cmp(dummy,a->z) != 0)
+    {
+        printf("\nERROR longrat:911\n");
+        printf("\na = ");n_Print(a,r);
+        gmp_printf("\ndummy = %Zd",dummy);
+        mpz_clear(dummy);mpz_init(dummy);mpz_tdiv_q(dummy, a->z, b->z);
+        gmp_printf("\na div b = %Zd\n u = ", dummy);
+        n_Print(u,r);
+    }
+    mpz_clear(dummy);*/
   u=nlShort3(u);
   nlTest(u,r);
@@ -2092 +2176 @@
   assume( getCoeffType(dst) == ID );
   assume( getCoeffType(src) == ID );
-
   if ((SR_HDL(a) & SR_INT)||(a==NULL))
   {
@@ -2693 +2776 @@
 
     nlInpGcd(cand, n, cf);
-
     assume( nlGreaterZero(cand,cf) );
 
@@ -2842 +2924 @@
     #else
     long nn=SR_TO_INT(n);
-    if ((nn<POW_2_28)||(nn>= -POW_2_28))
+    if ((nn<POW_2_28)&&(nn>= -POW_2_28))
       fprintf(f,"4 %ld ",nn);
     else
@@ -2899 +2981 @@
          s_readmpz(f,n->z);
          n->s=3; /*sub_type*/
+         #if SIZEOF_LONG == 8
+         n=nlShort3(n);
+         #endif
          return n;
        }
@@ -2925 +3010 @@
          s_readmpz_base (f,n->z, SSI_BASE);
          n->s=sub_type=3; /*subtype-5*/
+         #if SIZEOF_LONG == 8
+         n=nlShort3(n);
+         #endif
          return n;
        }

libpolys/coeffs/mpr_complex.cc

@@ -377 +377 @@
       if (SR_HDL(num) & SR_INT)
       {
-        r= SR_TO_INT(num);
+        //n_Print(num, src);printf("\n");
+        int nn = SR_TO_INT(num);
+        if((long)nn == SR_TO_INT(num))
+            r = SR_TO_INT(num);
+        else
+            r = gmp_float(SR_TO_INT(num));
+        //int dd = 20;
+        //gmp_printf("\nr = %.*Ff\n",dd,*r.mpfp());
+        //getchar();
       }
       else
@@ -436 +444 @@
       if (SR_HDL(num) & SR_INT)
       {
-        r= SR_TO_INT(num);
+        int nn = SR_TO_INT(num);
+        if((long)nn == SR_TO_INT(num))
+            r = SR_TO_INT(num);
+        else
+            r = gmp_float(SR_TO_INT(num));
       }
       else
@@ -446 +458 @@
         if (SR_HDL(num) & SR_INT)
         {
-          r= SR_TO_INT(num);
+          int nn = SR_TO_INT(num);
+          if((long)nn == SR_TO_INT(num))
+            r = SR_TO_INT(num);
+          else
+            r = gmp_float(SR_TO_INT(num));
         }
         else

libpolys/coeffs/numbers.cc

@@ -413 +413 @@
     assume(n->cfInpNeg!=NULL);
     assume(n->cfCopy!=NULL);
-    assume(n->cfRePart!=NULL);
-    assume(n->cfImPart!=NULL);
 
     assume(n->cfWriteLong!=NULL);

libpolys/coeffs/shortfl.cc

@@ -425 +425 @@
 #define SR_HDL(A) ((long)(A))
 #define IS_INT(A) ((A)->s==3)
-#define IS_IMM(A) (SR_HDL(A)&SR_INT)
+#define IS_IMM(A) (SR_HDL(A) & SR_INT)
 #define GET_NOM(A) ((A)->z)
 #define GET_DENOM(A) ((A)->n)

libpolys/libpolys-config.in

@@ -89 +89 @@
 
     --cflags)
-        ${ECHOn} " -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @FACTORY_INCLUDES@ @NTL_CFLAGS@ @GMP_CFLAGS@ "
+    #### @FACTORY_INCLUDES@ 
+        ${ECHOn} " -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ "
         ;;
 

libpolys/polys/ext_fields/algext.cc

@@ -98 +98 @@
 void     naWriteLong(number &a, const coeffs cf);
 void     naWriteShort(number &a, const coeffs cf);
-number   naRePart(number a, const coeffs cf);
-number   naImPart(number a, const coeffs cf);
 number   naGetDenom(number &a, const coeffs cf);
 number   naGetNumerator(number &a, const coeffs cf);
@@ -248 +246 @@
 BOOLEAN naDBTest(number a, const char *f, const int l, const coeffs cf)
 {
-  assume(getCoeffType(cf) == ID);
   if (a == NULL) return TRUE;
   p_Test((poly)a, naRing);
-  if((((poly)a)!=naMinpoly)
-  && p_Totaldegree((poly)a, naRing) >= p_Totaldegree(naMinpoly, naRing)
-  && (p_Totaldegree((poly)a, naRing)> 1)) // allow to output par(1)
-  {
-    dReportError("deg >= deg(minpoly) in %s:%d\n",f,l);
-    return FALSE;
+  if (getCoeffType(cf)==n_algExt)
+  {
+    if((((poly)a)!=naMinpoly)
+    && p_Totaldegree((poly)a, naRing) >= p_Totaldegree(naMinpoly, naRing)
+    && (p_Totaldegree((poly)a, naRing)> 1)) // allow to output par(1)
+    {
+      dReportError("deg >= deg(minpoly) in %s:%d\n",f,l);
+      return FALSE;
+    }
   }
   return TRUE;
@@ -348 +348 @@
   if (a != NULL) a = (number)p_Neg((poly)a, naRing);
   return a;
-}
-
-number naImPart(number a, const coeffs cf)
-{
-  naTest(a);
-  return NULL;
 }
 
@@ -486 +480 @@
   poly aPlusB = p_Add_q(p_Copy((poly)a, naRing),
                         p_Copy((poly)b, naRing), naRing);
-  definiteReduce(aPlusB, naMinpoly, cf);
+  //definiteReduce(aPlusB, naMinpoly, cf);
   return (number)aPlusB;
 }
@@ -497 +491 @@
   if (a == NULL) return (number)minusB;
   poly aMinusB = p_Add_q(p_Copy((poly)a, naRing), minusB, naRing);
-  definiteReduce(aMinusB, naMinpoly, cf);
+  //definiteReduce(aMinusB, naMinpoly, cf);
   return (number)aMinusB;
 }
@@ -724 +718 @@
 static BOOLEAN naCoeffIsEqual(const coeffs cf, n_coeffType n, void * param)
 {
-  if (ID != n) return FALSE;
+  if (n_algExt != n) return FALSE;
   AlgExtInfo *e = (AlgExtInfo *)param;
   /* for extension coefficient fields we expect the underlying
@@ -1421 +1415 @@
   e->r->ref ++; // increase the ref.counter for the ground poly. ring!
   const ring R = e->r; // no copy!
-  assume( R->qideal == e->r->qideal );
   cf->extRing  = R;
 
@@ -1445 +1438 @@
   cf->cfChineseRemainder= naChineseRemainder;
   cf->cfInt          = naInt;
-  cf->cfInpNeg          = naNeg;
+  cf->cfInpNeg       = naNeg;
   cf->cfAdd          = naAdd;
   cf->cfSub          = naSub;
@@ -1467 +1460 @@
   cf->cfGetNumerator = naGetNumerator;
   cf->cfRePart       = naCopy;
-  cf->cfImPart       = naImPart;
   cf->cfCoeffWrite   = naCoeffWrite;
   cf->cfNormalize    = naNormalize;
@@ -1503 +1495 @@
 template class IAccessor<snumber*>;
 
+/* --------------------------------------------------------------------*/
+#if 0
+void npolyCoeffWrite(const coeffs cf, BOOLEAN details)
+{
+  assume( cf != NULL );
+
+  const ring A = cf->extRing;
+
+  assume( A != NULL );
+  Print("// polynomial ring as coefficient ring :\n");
+  rWrite(A);
+  PrintLn();
+}
+number npolyMult(number a, number b, const coeffs cf)
+{
+  naTest(a); naTest(b);
+  if ((a == NULL)||(b == NULL)) return NULL;
+  poly aTimesB = p_Mult_q(p_Copy((poly)a, naRing),
+                          p_Copy((poly)b, naRing), naRing);
+  return (number)aTimesB;
+}
+
+number npolyDiv(number a, number b, const coeffs cf)
+{
+  naTest(a); naTest(b);
+  if (b == NULL) WerrorS(nDivBy0);
+  if (a == NULL) return NULL;
+  poly p=singclap_pdivide((poly)a,(poly)b,naRing);
+  return (number)p;
+}
+
+
+BOOLEAN npolyInitChar(coeffs cf, void * infoStruct)
+{
+  assume( infoStruct != NULL );
+
+  AlgExtInfo *e = (AlgExtInfo *)infoStruct;
+  /// first check whether cf->extRing != NULL and delete old ring???
+
+  assume(e->r                     != NULL);      // extRing;
+  assume(e->r->cf                 != NULL);      // extRing->cf;
+
+  assume( cf != NULL );
+
+  e->r->ref ++; // increase the ref.counter for the ground poly. ring!
+  const ring R = e->r; // no copy!
+  cf->extRing  = R;
+
+  /* propagate characteristic up so that it becomes
+     directly accessible in cf: */
+  cf->ch = R->cf->ch;
+
+  cf->cfCoeffString = naCoeffString;
+
+  cf->cfGreaterZero  = naGreaterZero;
+  cf->cfGreater      = naGreater;
+  cf->cfEqual        = naEqual;
+  cf->cfIsZero       = naIsZero;
+  cf->cfIsOne        = naIsOne;
+  cf->cfIsMOne       = naIsMOne;
+  cf->cfInit         = naInit;
+  cf->cfInit_bigint  = naInit_bigint;
+  cf->cfFarey        = naFarey;
+  cf->cfChineseRemainder= naChineseRemainder;
+  cf->cfInt          = naInt;
+  cf->cfInpNeg       = naNeg;
+  cf->cfAdd          = naAdd;
+  cf->cfSub          = naSub;
+  cf->cfMult         = npolyMult;
+  cf->cfDiv          = npolyDiv;
+  cf->cfPower        = naPower;
+  cf->cfCopy         = naCopy;
+
+  cf->cfWriteLong        = naWriteLong;
+
+  if( rCanShortOut(naRing) )
+    cf->cfWriteShort = naWriteShort;
+  else
+    cf->cfWriteShort = naWriteLong;
+
+  cf->cfRead         = naRead;
+  cf->cfDelete       = naDelete;
+  cf->cfSetMap       = naSetMap;
+  cf->cfGetDenom     = naGetDenom;
+  cf->cfGetNumerator = naGetNumerator;
+  cf->cfRePart       = naCopy;
+  cf->cfCoeffWrite   = npolyCoeffWrite;
+  cf->cfNormalize    = npolyNormalize;
+  cf->cfKillChar     = naKillChar;
+#ifdef LDEBUG
+  cf->cfDBTest       = naDBTest;
+#endif
+  cf->cfGcd          = naGcd;
+  cf->cfLcm          = naLcmContent;
+  cf->cfSize         = naSize;
+  cf->nCoeffIsEqual  = naCoeffIsEqual;
+  cf->cfInvers       = npolyInvers;
+  cf->cfIntDiv       = npolyDiv;
+  cf->convFactoryNSingN=naConvFactoryNSingN;
+  cf->convSingNFactoryN=naConvSingNFactoryN;
+  cf->cfParDeg = naParDeg;
+
+  cf->iNumberOfParameters = rVar(R);
+  cf->pParameterNames = (const char**)R->names;
+  cf->cfParameter = naParameter;
+  cf->has_simple_Inverse=FALSE;
+  /* cf->has_simple_Alloc= FALSE; */
+
+  if( nCoeff_is_Q(R->cf) )
+  {
+    cf->cfClearContent = naClearContent;
+    cf->cfClearDenominators = naClearDenominators;
+  }
+
+  return FALSE;
+}
+#endif

libsingular-config.in

@@ -89 +89 @@
 
     --cflags)
-        ${ECHOn} " -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @FACTORY_INCLUDES@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ "
+    #### @FACTORY_INCLUDES@ 
+        ${ECHOn} " -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ "
         ;;
 

m4/ax_python_embed.m4

@@ -236 +236 @@
 #            ax_python_includespec="${ax_python_includespec} $ax_python_execspec"
 #        fi
-        ax_python_cspec=`${PYTHON}-config --cflags | sed -e "s@ -arch i386@@" -e "s@ -arch x86_64@@" -e 's@ -g@@g' -e 's@ -mno-fused-madd@@g'`
+        ax_python_cspec=`${PYTHON}-config --cflags | sed -e 's@ -mno-fused-madd @ @g'`
         #   or -Qunused-arguments / clang :(
 #        ax_python_cspec="${ax_python_ccshared} ${ax_python_includespec}"
@@ -315 +315 @@
 #        AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_output}])
 
-        ax_python_lspec=`${PYTHON}-config --ldflags | sed -e "s@ -arch i386@@" -e "s@ -arch x86_64@@" -e 's@ -g@@g'`
+        ax_python_lspec=`${PYTHON}-config --ldflags`
         AC_SUBST([PYTHON_LSPEC], [${ax_python_lspec}])
         AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_lspec}])

m4/options.m4

@@ -289 +289 @@
 
 ])
+
+
+
+AC_DEFUN([SING_BUILTIN_MODULES],
+[
+## m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl
+ AC_MSG_CHECKING([built-in modules])
+
+ AC_ARG_VAR( [BUILTIN_LIBS], [LIB FLAGS for buildins] )
+ AC_ARG_WITH(builtinmodules, 
+   AS_HELP_STRING([--with-builtinmodules], [List of builtin modules (experimental), default: staticdemo,bigintm,syzextra]),
+   [if test "x$with_builtinmodules" == xyes; then
+    with_builtinmodules=syzextra
+   fi], 
+   [with_builtinmodules=""]
+ )
+ # staticdemo,bigintm,
+ # ,pyobject,gfanlib,polymake,singmathic
+
+ AH_TEMPLATE([SI_BUILTINMODULES_ADD],[Add(list) for Builtin modules])
+
+ #### TODO Dynamic Modules???
+  L=""
+  bi_staticdemo=false
+  bi_syzextra=false
+  bi_pyobject=false
+  bi_gfanlib=false
+  bi_polymake=false
+  bi_singmathic=false
+  bi_bigintm=false
+  
+  
+ if test -z "$with_builtinmodules"; then
+  AC_MSG_RESULT(no)
+ else
+  AC_MSG_RESULT(yes)
+  
+  L=""
+  
+  for a in ${with_builtinmodules//,/ }; 
+  do
+    AC_MSG_CHECKING([whether to build-in '$a'?])
+    
+      L+=" add($a)"
+      LL+=" $a"
+      BUILTIN_LIBS+=" dyn_modules/$a/$a.la"
+      AC_MSG_RESULT(yes)
+      
+# *) AC_MSG_ERROR([bad value ${enableval} for       --enable-debug]) ;;
+
+      case "${a}" in
+       staticdemo ) bi_staticdemo=true;;
+       syzextra ) bi_syzextra=true ;;
+       pyobject ) bi_pyobject=true ;;
+       gfanlib ) bi_gfanlib=true ;;
+       polymake ) bi_polymake=true ;;
+       singmathic ) bi_singmathic=true ;;
+       bigintm ) bi_bigintm=true ;;       
+      esac
+
+###### In case of out-of tree building: the build dir is empty in configure time!!!
+    if test ! -d "Singular/dyn_modules/$a"; then
+        AC_MSG_WARN([The directory 'Singular/dyn_modules/$a' is missing :(])
+##    else
+##      AC_MSG_RESULT(no)
+    fi
+    
+#    A=`echo "SI_BUILTIN_$a" | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:"  -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`      
+#    echo "A:: $A"
+#    AM_CONDITIONAL(m4_unquote([A]),[test -d "Singular/dyn_modules/$a"]) ## :(((
+  done # for
+
+  AC_DEFINE_UNQUOTED([SI_BUILTINMODULES],"$LL",[Refined list of builtin modules])
+
+ fi # else ("x$with_builtinmodules" != xno)
+ 
+ AC_MSG_CHECKING([SI_BUILTINMODULES_ADD(add)...])
+ AC_MSG_RESULT(${L:-unset})
+ 
+ AC_DEFINE_UNQUOTED([SI_BUILTINMODULES_ADD(add)],[$L],[Add(list) for Builtin modules])
+ AC_SUBST(BUILTIN_LIBS)
+ 
+ AM_CONDITIONAL([SI_BUILTIN_STATICDEMO], [test x$bi_staticdemo = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_SYZEXTRA], [test x$bi_syzextra = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_PYOBJECT], [test x$bi_pyobject = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_GFANLIB], [test x$bi_gfanlib = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_POLYMAKE], [test x$bi_polymake = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_SINGMATHIC], [test x$bi_singmathic = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_BIGINTM], [test x$bi_bigintm = xtrue])
+ 
+ AC_MSG_CHECKING([BUILTIN_LIBS...])
+ AC_MSG_RESULT(${BUILTIN_LIBS:-unset})
+])
+
+

resources/feResource.cc

@@ -66 +66 @@
    // path for dynamic modules, should match ProcDir:
    "%b/MOD;"
+   "%r/lib/singular/MOD;"
+   "%r/libexec/singular/MOD;"
+   LIB_DIR "/singular/MOD;"
    LIBEXEC_DIR "/singular/MOD;"
    "%b",
@@ -74 +77 @@
   {"ProcDir",   'P',    feResPath,  "SINGULAR_PROCS_DIR",
      "%b/MOD;"
-     LIBEXEC_DIR "/singular/MOD;"
+     "%r/lib/singular/MOD;"
+     "%r/libexec/singular/MOD;"
      LIB_DIR "/singular/MOD;"   /*debian: -> /usr/lib/singular/MOD */
-     "%r/libexec/singular/MOD",                  (char *)""},
+     LIBEXEC_DIR "/singular/MOD" ,                  (char *)""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
   {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share/",          (char *)""},