Changeset 2ac2935 in git

Timestamp:

Dec 7, 2012, 3:41:00 PM (10 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

ec1006cbd9971c4271d05aefada775ef29d762a6

Parents:

7e18d198148353f88708cfa20f738ac338cb1f556554ca42ebe1277c9afe7990970390905a6e1cf0

Message:

Merge conflict resolved

Files:

• .gdbinit (modified) (1 diff)
• IntegerProgramming/binomial.cc (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Singular/Makefile.am (modified) (5 diffs)
• Singular/Minor.cc (modified) (4 diffs)
• Singular/blackbox.h (modified) (2 diffs)
• Singular/extra.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (1 diff)
• Singular/ipid.cc (modified) (2 diffs)
• Singular/links/ndbm.cc (modified) (1 diff)
• Singular/minpoly.cc (modified) (2 diffs)
• Singular/misc_ip.cc (modified) (1 diff)
• Singular/pyobject.cc (modified) (5 diffs)
• Singular/pyobject_setup.cc (modified) (1 diff)
• Singular/tesths.cc (modified) (1 diff)
• Tst/New/ring_create_bug.tst (added)
• configure.ac (modified) (1 diff)
• dyn_modules/bigintm/Makefile.am (modified) (1 diff)
• dyn_modules/syzextra/Makefile.am (modified) (1 diff)
• dyn_modules/syzextra/mod_main.cc (modified) (1 diff)
• factory/Makefile.am (modified) (2 diffs)
• factory/configure.ac (modified) (1 diff)
• factory/facFqBivar.cc (modified) (12 diffs)
• findexec/configure.ac (modified) (1 diff)
• libpolys/coeffs/Makefile.am (modified) (1 diff)
• libpolys/coeffs/longrat.cc (modified) (2 diffs)
• libpolys/configure.ac (modified) (1 diff)
• libpolys/misc/auxiliary.h.in (modified) (1 diff)
• libpolys/misc/mylimits.h (modified) (1 diff)
• libpolys/polys/Makefile.am (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (3 diffs)
• libpolys/polys/monomials/monomials.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)
• libpolys/polys/nc/old.gring.cc (modified) (2 diffs)
• numeric/mpr_base.cc (modified) (1 diff)
• omalloc/Makefile.am (modified) (6 diffs)
• omalloc/configure.ac (modified) (1 diff)
• xalloc/configure.ac (modified) (1 diff)

.gdbinit

@@ -6 +6 @@
 ### http://sourceware.org/gdb/onlinedocs/gdb/Define.html#Define
 
-# print poly
+# print poly ring
 define pp
+  if $argc > 0
+    print $arg0
+    if $arg0 != 0 
+      print *$arg0
 
-if $argc > 0
-  print $arg0
-  if $arg0 != 0 
-    print *$arg0
-
-if $argc == 2
-  call p_Write($arg0, $arg1)
-end
+      if $argc == 2
+        call p_Write($arg0, $arg1)
+      else
+        call p_Write($arg0, currRing)
+      end
+    end
   end
 end
-
-
-end
      
+run
+backtrace

IntegerProgramming/binomial.cc

@@ -1847 +1847 @@
 
   exponent_vector[i]*=-1;
-
+  return *this;
 }
 

Makefile.am

@@ -37 +37 @@
 
 bin_SCRIPTS = libsingular-config
+

Singular/Makefile.am

@@ -208 +208 @@
 endif
 
-AMLDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
+AMLDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys  -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
 
 Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
@@ -222 +222 @@
 Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h 
 
-Singular_LDADD = libSingular.la ${abs_top_builddir}/numeric/libnumeric.la ${abs_top_builddir}/kernel/libkernel.la ${abs_top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-Singularg_LDADD = libSingular_g.la ${abs_top_builddir}/numeric/libnumeric_g.la ${abs_top_builddir}/kernel/libkernel_g.la ${abs_top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
+Singular_LDADD = libSingular.la ${top_builddir}/numeric/libnumeric.la ${top_builddir}/kernel/libkernel.la ${top_builddir}/libpolys/polys/libpolys.la -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
+Singularg_LDADD = libSingular_g.la ${top_builddir}/numeric/libnumeric_g.la ${top_builddir}/kernel/libkernel_g.la ${top_builddir}/libpolys/polys/libpolys_g.la -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(FLINT_LIBS) $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
 Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
@@ -311 +311 @@
 ########################### TEST #########################
 
-TESTS_ENVIRONMENT = SINGULARPATH='${abs_top_builddir}/Singular/LIB:${abs_top_srcdir}/Singular/LIB:${abs_top_builddir}/libpolys/polys/.libs:${abs_top_builddir}/factory/gftables'
-TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}' 
+TESTS_ENVIRONMENT = SINGULARPATH='${top_builddir}/Singular/LIB:${top_srcdir}/Singular/LIB:${top_builddir}/libpolys/polys/.libs:${top_builddir}/factory/gftables'
+TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${top_builddir}'
 
 if WANT_DEBUG
@@ -371 +371 @@
 
 feOpt.inc: feOptGen
-        ${abs_builddir}/feOptGen
+        ${builddir}/feOptGen
 
 feOptES.inc: feOptES
-        ${abs_builddir}/feOptES
+        ${builddir}/feOptES
 
 feOptTS.inc: feOptTS
-        ${abs_builddir}/feOptTS
+        ${builddir}/feOptTS
 
 plural_cmd.inc iparith.inc: gentable1
-        ${abs_builddir}/gentable1
+        ${builddir}/gentable1
 
 # # fake rule to fix parallel make http://www.gnu.org/s/hello/manual/automake/Multiple-Outputs.html
@@ -386 +386 @@
 
 
-gftables: ${abs_top_srcdir}/factory/gftables
-        ln -snf ${abs_top_srcdir}/factory/gftables ${abs_builddir}/gftables
-
-MOD: ${abs_top_builddir}/libpolys/polys/.libs
-        ln -snf ${abs_top_builddir}/libpolys/polys/.libs/ ${abs_builddir}/MOD
-
+gftables: ${top_srcdir}/factory/gftables
+        ln -snf ${top_srcdir}/factory/gftables ${builddir}/gftables
+
+MOD: ${top_builddir}/libpolys/polys/.libs
+        ln -snf ${top_builddir}/libpolys/polys/.libs/ ${builddir}/MOD
 
 if PYTHON_USE

Singular/Minor.cc

@@ -147 +147 @@
   /* We should never reach this line of code. */
   assume(false);
+  return -1;
 }
 
@@ -178 +179 @@
   /* We should never reach this line of code. */
   assume(false);
+  return -1;
 }
 
@@ -251 +253 @@
   /* We should never reach this line of code. */
   assume(false);
+  return -1;
 }
 
@@ -282 +285 @@
   /* We should never reach this line of code. */
   assume(false);
+  return -1;
 }
 

Singular/blackbox.h

@@ -58 +58 @@
 
 /// default procedure blackboxDefaultOp3, to be called as "default:" branch
-BOOLEAN blackboxDefaultOp3(int op,leftv l, leftv r1,leftv r2, leftv r3);
+BOOLEAN blackbox_default_Op3(int op,leftv l, leftv r1,leftv r2, leftv r3);
 
 /// default procedure blackboxDefaultOpM, to be called as "default:" branch
@@ -70 +70 @@
 /// return the name to the type given by t (r/o)
 const char *    getBlackboxName(const int t);
-/// used by scanner: returns ROOTDECL for known types (and the type number in t)
+/// used by scanner: returns ROOT_DECL for known types 
+/// (and the type number in @c tok)
 int blackboxIsCmd(const char *n, int & tok);
 /// define a new type

Singular/extra.cc

@@ -3180 +3180 @@
         {
           if(strcmp(sys_cmd, "AltVarStart") == 0)
-            res->data = (void*)scaFirstAltVar(r);
+            res->data = (void*)(long)scaFirstAltVar(r);
           else
-            res->data = (void*)scaLastAltVar(r);
+            res->data = (void*)(long)scaLastAltVar(r);
           return FALSE;
         }

Singular/iparith.cc

@@ -5206 +5206 @@
   }
   return TRUE;
+}
+
+BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport)
+{
+  leftv v =  (leftv)omAlloc0Bin(sleftv_bin);
+  v->data = (char*)libname;
+  v->rtyp = STRING_CMD;
+  BOOLEAN res = jjLOAD(NULL, v, autoexport); 
+  omFreeBin(v, sleftv_bin);
+
+  return res;
 }
 

Singular/ipid.cc

@@ -194 +194 @@
   IDLEV(h)  = level;
   IDNEXT(h) = this;
+  BOOLEAN at_start=(this==IDROOT);
   h->id_i=iiS2I(s);
   if (init)
@@ -221 +222 @@
   }
   // --------------------------------------------------------
+  if (at_start)
+    IDNEXT(h) = IDROOT;
   return  h;
 }

Singular/links/ndbm.cc

@@ -291 +291 @@
 #endif
     }
-    if (((short *)db->dbm_pagbuf)[0] != 0)
+    short tmp;
+    memcpy(&tmp, db->dbm_pagbuf, sizeof(short));
+    if (tmp != 0)
     {
       item = makdatum(db->dbm_pagbuf, db->dbm_keyptr);

Singular/minpoly.cc

@@ -7 +7 @@
 
 #include<cmath>
+#include <cstdlib>
 #include "config.h"
 #include<kernel/mod2.h>
@@ -385 +386 @@
     }
   }
+  abort();
 }
 

Singular/misc_ip.cc

@@ -1117 +1117 @@
     type = nRegister(n_transExt, ntInitChar);
     assume(type == n_transExt);
+     
+    (void)type;
   }
 #endif

Singular/pyobject.cc

@@ -15 +15 @@
 #include "config.h"
 #include <kernel/mod2.h>
+  //#include <misc/auxiliary.h>
+  //#include "newstruct.h"
+
+#include <Python.h>
+
+#include <Singular/ipid.h>
+#include <Singular/blackbox.h>
+#include <Singular/lists.h>
+#include <Singular/ipid.h>
+#include <Singular/ipshell.h>
+#include <Singular/newstruct.h>
+
+
 #include <misc/auxiliary.h>
-#include "newstruct.h"
 
 #include <omalloc/omalloc.h>
 
 #include <kernel/febase.h>
-#include <kernel/intvec.h>
+#include <misc/intvec.h>
 
 #include "subexpr.h"
@@ -27 +39 @@
 #include "ipid.h"
 #include "blackbox.h"
-
-#include <Python.h>
+#include "ipshell.h"
+
+
+
+
+  //#include <Python.h>
 // #include <iterator>             // std::distance
 // #include <stdio.h>
@@ -48 +64 @@
   /// Initialize unique (singleton) python interpreter instance, 
   /// and set Singular type identifier
-  static void init(id_type num ) { instance().m_id = num; }
+  static void init(id_type num) { instance().m_id = num; }
 
   /// Get Singular type identitfier 
@@ -587 +603 @@
     return FALSE;
 
-  return blackboxDefaultOp3(op, res, arg1, arg2, arg3);
+  return blackbox_default_Op3(op, res, arg1, arg2, arg3);
 }
 
@@ -686 +702 @@
 
 
-// forward declaration
-int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
-               BOOLEAN(*func)(leftv res, leftv v));
-
-#define ADD_C_PROC(name) iiAddCproc("", (char*)#name, FALSE, name);
-
-
-void pyobject_init() 
-{
-  blackbox *b = (blackbox*)omAlloc0(sizeof(blackbox));
-  b->blackbox_destroy = pyobject_destroy;
-  b->blackbox_String  = pyobject_String;
-  b->blackbox_Init    = pyobject_Init;
-  b->blackbox_Copy    = pyobject_Copy;
-  b->blackbox_Assign  = pyobject_Assign;
-  b->blackbox_Op1     = pyobject_Op1;
-  b->blackbox_Op2     = pyobject_Op2;
-  b->blackbox_Op3     = pyobject_Op3;
-  b->blackbox_OpM     = pyobject_OpM;
-  b->data             = omAlloc0(newstruct_desc_size());
-
-  PythonInterpreter::init(setBlackboxStuff(b,"pyobject"));
-
-  ADD_C_PROC(python_import);
-  ADD_C_PROC(python_eval);
-  ADD_C_PROC(python_run);
-}
-
-extern "C" { void mod_init() { pyobject_init(); } }
-
+
+blackbox* pyobject_blackbox(int& tok) {
+  if(blackboxIsCmd("pyobject", tok) != ROOT_DECL) 
+  {
+    tok = setBlackboxStuff((blackbox*)omAlloc0(sizeof(blackbox)), 
+                           "pyobject");
+  }
+  return getBlackboxStuff(tok);
+}
+
+
+
+#define PYOBJECT_ADD_C_PROC(name) \
+  add_C_proc(currPack->libname, (char*)#name, FALSE, name);
+
+typedef  BOOLEAN (*func_type)(leftv, leftv);
+void pyobject_init(int (*add_C_proc)(const char*, const char*, BOOLEAN,
+                                     func_type) )
+{
+  int tok = -1;
+  blackbox* bbx = pyobject_blackbox(tok);
+  if (bbx->blackbox_Init != pyobject_Init) 
+  {
+    bbx->blackbox_destroy = pyobject_destroy;
+    bbx->blackbox_String  = pyobject_String;
+    bbx->blackbox_Init    = pyobject_Init;
+    bbx->blackbox_Copy    = pyobject_Copy;
+    bbx->blackbox_Assign  = pyobject_Assign;
+    bbx->blackbox_Op1     = pyobject_Op1;
+    bbx->blackbox_Op2     = pyobject_Op2;
+    bbx->blackbox_Op3     = pyobject_Op3;
+    bbx->blackbox_OpM     = pyobject_OpM;
+    bbx->data             = omAlloc0(newstruct_desc_size());
+    
+    PythonInterpreter::init(tok);
+
+    PYOBJECT_ADD_C_PROC(python_import);
+    PYOBJECT_ADD_C_PROC(python_eval);
+    PYOBJECT_ADD_C_PROC(python_run); 
+  }
+}
+#undef PYOBJECT_ADD_C_PROC
+
+#ifndef EMBED_PYTHON
+extern "C" { 
+  void mod_init(SModulFunctions* psModulFunctions)
+  { 
+    pyobject_init(psModulFunctions->iiAddCproc); 
+  }
+}
+#endif

Singular/pyobject_setup.cc

@@ -16 +16 @@
 #include <kernel/mod2.h>
 #include <kernel/febase.h>
+#include <Singular/blackbox.h>
+#include <Singular/ipshell.h>
 
 /* whether pyobject module is linked statically or dynamically */
+
+#ifdef EMBED_PYTHON // Case: we include the pyobject interface in the binary
+
 #ifdef HAVE_PYTHON
+#include "pyobject.cc"
+static BOOLEAN pyobject_load()
+{
+   pyobject_init(iiAddCproc);
+   return FALSE;
+}
 
-  #if defined(HAVE_STATIC) 
-    #ifdef HAVE_STATIC_PYTHON
-      #define HAVE_STATIC_PYOBJECT
-    #endif
-  #else
-    #ifdef EMBED_PYTHON
-      #define HAVE_STATIC_PYOBJECT
-    #else
-      #define HAVE_DYNAMIC_PYOBJECT
-    #endif
-  #endif 
+#else // Forced embedding, but no (development version of) python available!
+static BOOLEAN pyobject_load() { return TRUE; } 
 #endif
 
-# ifdef HAVE_STATIC_PYOBJECT // Case: link pyobject interface statically
-#include "pyobject.cc"
-void pyobject_setup() { pyobject_init(); }
+
+# else // Case: pyobject may be loaded from a dynamic module (prefered variant)
+// Note: we do not need python at compile time.
+static BOOLEAN pyobject_load()
+{
+  BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport);
+  return jjLOADLIB("pyobject.so", TRUE);
+}
+#endif
 
 
-# elif defined(HAVE_DYNAMIC_PYOBJECT) // Case: pyobject is dynamic module (prefered variant)
 
-// forward declaration for Singular/iplib.cc
-void* binary_module_function(const char* lib, const char* func); 
-void pyobject_setup()
+/// blackbox support - initialization via autoloading
+void* pyobject_autoload(blackbox* bbx)
 {
-  void* fktn = binary_module_function("pyobject", "mod_init");
-  if (fktn) (* reinterpret_cast<void (*)()>(fktn) )();
-  else Werror("python related functions are not available");
+  if (pyobject_load()) return NULL;
+  return bbx->blackbox_Init(bbx);
 }
 
-#else                // Case: no python
-void pyobject_setup() { }
+void pyobject_default_destroy(blackbox  *b, void *d)
+{
+  Werror("Python-based functionality not available!");
+}
 
-#endif  // HAVE_PYTHON
+// Setting up an empty blackbox type, which can be filled with pyobject
+void pyobject_setup() 
+{
+  blackbox *bbx = (blackbox*)omAlloc0(sizeof(blackbox));
+  bbx->blackbox_Init = pyobject_autoload;
+  bbx->blackbox_destroy = pyobject_default_destroy;
+  setBlackboxStuff(bbx, "pyobject");
+}
 

Singular/tesths.cc

@@ -43 +43 @@
 #include "fegetopt.h"
 
-// #include "pyobject_setup.h"
+#include "pyobject_setup.h"
 
 #include <unistd.h>

configure.ac

@@ -13 +13 @@
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 

dyn_modules/bigintm/Makefile.am

@@ -31 +31 @@
 
 AMLDFLAGS       = 
-# -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
-# -L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
+# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
+# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
 
 

dyn_modules/syzextra/Makefile.am

@@ -31 +31 @@
 
 AMLDFLAGS       = 
-# -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel \
-# -L${abs_top_builddir}/libpolys/polys $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
+# -L${top_builddir}/Singular -L${top_builddir}/numeric -L${top_builddir}/kernel \
+# -L${top_builddir}/libpolys/polys $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
 
 

dyn_modules/syzextra/mod_main.cc

@@ -934 +934 @@
   
   NoReturn(res);
+  return false;
 }
 

factory/Makefile.am

@@ -18 +18 @@
 
 libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS}
-libfactory_la_LIBADD     = ${abs_builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
+libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
 libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
 libfactory_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${CXXTEMPLFLAGS}
-libfactory_g_la_LIBADD   = ${abs_builddir}/libfac/libfac_g.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
+libfactory_g_la_LIBADD   = ${builddir}/libfac/libfac_g.la $(FLINT_LIBS) ${GMP_LIBS} ${NTL_LIBS}
 libfactory_g_la_LDFLAGS  = -release ${PACKAGE_VERSION}
 
@@ -304 +304 @@
 check_PROGRAMS = $(TESTS)
 
-AMLDFLAGS =  -L${abs_builddir}
+AMLDFLAGS =  -L${builddir}
 
 TESTSSOURCES = test.cc

factory/configure.ac

@@ -22 +22 @@
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 

factory/facFqBivar.cc

@@ -6364 +6364 @@
   {
 #ifdef HAVE_FLINT
-    nmod_mat_clear (FLINTN);
+    if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+      nmod_mat_clear (FLINTN);
 #endif
     delete [] bounds;
@@ -6379 +6380 @@
   {
 #ifdef HAVE_FLINT
-    nmod_mat_clear (FLINTN);
+    if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+      nmod_mat_clear (FLINTN);
 #endif
     delete [] bounds;
@@ -6427 +6429 @@
       if (result.length() == nmod_mat_ncols (FLINTN))
       {
-        nmod_mat_clear (FLINTN);
+        if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+          nmod_mat_clear (FLINTN);
 #else
       if (result.length() == NTLN.NumCols())
@@ -6441 +6444 @@
       if (result.length() == NTLNe.NumCols())
       {
-#ifdef HAVE_FLINT
-        nmod_mat_clear (FLINTN);
-#endif
         delete [] factorsFoundIndex;
         delete [] bounds;
@@ -6504 +6504 @@
       if (result.length() == NTLNe.NumCols())
       {
-#ifdef HAVE_FLINT
-        nmod_mat_clear (FLINTN);
-#endif
         delete [] factorsFoundIndex;
         delete [] bounds;
@@ -6582 +6579 @@
     if (result.length() == NTLNe.NumCols())
     {
-#ifdef HAVE_FLINT
-      nmod_mat_clear (FLINTN);
-#endif
       delete [] bounds;
       return Union (result, smallFactors);
@@ -6728 +6722 @@
     {
 #ifdef HAVE_FLINT
-      nmod_mat_clear (FLINTN);
+      if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+        nmod_mat_clear (FLINTN);
 #endif
       delete [] bounds;
@@ -6747 +6742 @@
     {
 #ifdef HAVE_FLINT
-      nmod_mat_clear (FLINTN);
+      if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+        nmod_mat_clear (FLINTN);
 #endif
       result.append (bufF);
@@ -6753 +6749 @@
     }
 #ifdef HAVE_FLINT
-    nmod_mat_clear (FLINTN);
+    if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+      nmod_mat_clear (FLINTN);
 #endif
     return Union (result, henselLiftAndLatticeRecombi (bufF, bufUniFactors,
@@ -6812 +6809 @@
       if (result.length()== NTLNe.NumCols())
       {
-#ifdef HAVE_FLINT
-        nmod_mat_clear (FLINTN);
-#endif
         delete [] bounds;
         result= Union (result, smallFactors);
@@ -6871 +6865 @@
         if (result.length() == NTLNe.NumCols())
         {
-#ifdef HAVE_FLINT
-          nmod_mat_clear (FLINTN);
-#endif
           delete [] bounds;
           result= Union (result, smallFactors);
@@ -6891 +6882 @@
   bounds= computeBounds (F, d, isIrreducible);
 #ifdef HAVE_FLINT
-  nmod_mat_clear (FLINTN);
+  if (alpha.level() == 1 || (alpha.level() != 1 && reduceFq2Fp))
+    nmod_mat_clear (FLINTN);
 #endif
   if (isIrreducible)

findexec/configure.ac

@@ -9 +9 @@
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 

libpolys/coeffs/Makefile.am

@@ -51 +51 @@
 endif
 
-AMLDFLAGS = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${abs_top_builddir}/../findexec
+AMLDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
 
 TESTS_ENVIRONMENT = SINGULARPATH='${top_srcdir}/../factory:${top_builddir}/../factory'

libpolys/coeffs/longrat.cc

@@ -2545 +2545 @@
     if (mpz_cmp(tmp,P)<0)
     {
-       // return N/B
-       z=ALLOC_RNUMBER();
-       #ifdef LDEBUG
-       z->debug=123456;
-       #endif
        if (mpz_isNeg(B))
        {
@@ -2555 +2550 @@
          mpz_neg(N,N);
        }
-       mpz_init_set(z->z,N);
-       mpz_init_set(z->n,B);
-       z->s = 0;
-       nlNormalize(z,r);
+       // check for gcd(N,B)==1
+       mpz_gcd(tmp,N,B);
+       if (mpz_cmp_ui(tmp,1)==0)
+       {
+         // return N/B
+         z=ALLOC_RNUMBER();
+         #ifdef LDEBUG
+         z->debug=123456;
+         #endif
+         mpz_init_set(z->z,N);
+         mpz_init_set(z->n,B);
+         z->s = 0;
+         nlNormalize(z,r);
+       }
+       else
+       {
+         // return nN (the input) instead of "fail"
+         z=nlCopy(nN,r);
+       }
        break;
     }

libpolys/configure.ac

@@ -9 +9 @@
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 

libpolys/misc/auxiliary.h.in

@@ -161 +161 @@
 // #endif
 
-static const int MAX_INT_LEN= 11;
 typedef void* ADDRESS;
 

libpolys/misc/mylimits.h

@@ -9 +9 @@
 #define _MYLIMITS_H
 
+/* Maximum/minimum value an `signed int' (in Singular interpreter) can hold. */
+const int MAX_INT_VAL = 0x7fffffff;
+const int MAX_INT_LEN = 11;
 #include <limits.h>
-#define MAX_INT_VAL 0x7fffffff
 
 #endif /* _MYLIMITS_H */

libpolys/polys/Makefile.am

@@ -155 +155 @@
 
 templates_p_Procs_Generate_LDADD    = -lreporter -lmisc -lomalloc -lfindexec
-templates_p_Procs_Generate_LDFLAGS  = -L${abs_builddir} -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${top_builddir}/misc -L${abs_top_builddir}/../omalloc -L${abs_top_builddir}/../findexec
+templates_p_Procs_Generate_LDFLAGS  = -L${builddir} -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
 
 templates/p_Procs.inc: templates/p_Procs_Generate

libpolys/polys/ext_fields/transext.cc

@@ -1239 +1239 @@
 void ntNormalize (number &a, const coeffs cf)
 {
-  if ((a!=NULL)&&(DEN(a)!=NULL))
+  if ((a!=NULL))
   {
     definiteGcdCancellation(a, cf, FALSE);
@@ -1862 +1862 @@
     ntNormalize(n, cf);
 
-    fraction f = (fraction)n;
+    fraction f = (fraction)ntGetDenom (n, cf);
 
     assume( f != NULL );
 
-    const poly den = DEN(f);
+    const poly den = NUM(f);
 
     if( den == NULL ) // ?? / 1 ?
@@ -1879 +1879 @@
       // TODO: move the following to factory?
       poly gcd = singclap_gcd(p_Copy(cand, R), p_Copy(den, R), R); // gcd(cand, den) is monic no mater leading coeffs! :((((
+      if (nCoeff_is_Q (Q))
+      {
+        number LcGcd= n_Gcd (p_GetCoeff (cand, R), p_GetCoeff(den, R), Q);
+        gcd = p_Mult_nn(gcd, LcGcd, R);
+      }
 //      assume( n_IsOne(pGetCoeff(gcd), Q) ); // TODO: this may be wrong...
       cand = p_Mult_q(cand, p_Copy(den, R), R); // cand *= den

libpolys/polys/monomials/monomials.h

@@ -42 +42 @@
 // next
 #define pNext(p)            ((p)->next)
-#define pIter(p)            ((p) = (p)->next)
+#define pIter(p)            (void)((p) = (p)->next)
 
 // coeff

libpolys/polys/monomials/p_polys.cc

@@ -1908 +1908 @@
 static number p_InitContent(poly ph, const ring r);
 
-#define CLEARENUMERATORS 0
+#define CLEARENUMERATORS 1
 
 void p_Content(poly ph, const ring r)

libpolys/polys/nc/old.gring.cc

@@ -2463 +2463 @@
   matrix M = r->GetNC()->MT[UPMATELEM(i,j,rN)];
   /*  return(M); */
+/*
   int sizeofres;
   if (metric==0)
@@ -2472 +2473 @@
     sizeofres=sizeof(number);
   }
+*/
   matrix res=mpNew(size,size);
   int s;

numeric/mpr_base.cc

@@ -727 +727 @@
   assume( i > 0 );
   poly iter= p;
-  for ( int j= 1; (j < i) && (iter!=NULL); j++ ) iter= pIter(iter);
+  for ( int j= 1; (j < i) && (iter!=NULL); j++ ) pIter(iter);
   return iter;
 }

omalloc/Makefile.am

@@ -33 +33 @@
 EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h omMmap.c
 
-AM_CPPFLAGS =-I${abs_top_srcdir}/.. -I${abs_top_builddir}/..
+AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..
 
 libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
@@ -67 +67 @@
 ## Test program
 ##
-# AM_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
+# AM_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
 
 
@@ -92 +92 @@
 omtTest_s_g_CFLAGS  = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
 omtTest_s_g_LDADD   = libomalloc_g.la
-omtTest_s_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
+omtTest_s_g_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
 
 omtTest_s_m_CPPFLAGS= ${AM_CPPFLAGS} -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
 omtTest_s_m_SOURCES = $(OMTTESTSSOURCES)
 omtTest_s_m_LDADD   = libomalloc_g.la
-omtTest_s_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
+omtTest_s_m_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
 
 omtTest_s_r_SOURCES = $(OMTTESTSSOURCES)
@@ -103 +103 @@
 omtTest_s_r_CFLAGS  = -O3 ${PIPE}
 omtTest_s_r_LDADD   = libomalloc.la
-omtTest_s_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc -static
+omtTest_s_r_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc -static
 
 
@@ -111 +111 @@
 omtTest_d_g_CFLAGS  = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE}
 omtTest_d_g_LDADD   = libomalloc_g.la
-omtTest_d_g_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
+omtTest_d_g_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
 
 omtTest_d_m_CPPFLAGS= ${AM_CPPFLAGS} -DOM_TEST_MALLOC  -DHAVE_CONFIG_H
 omtTest_d_m_SOURCES = $(OMTTESTSSOURCES)
 omtTest_d_m_LDADD   = libomalloc_g.la
-omtTest_d_m_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
+omtTest_d_m_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc
 
 omtTest_d_r_SOURCES = $(OMTTESTSSOURCES)
@@ -122 +122 @@
 omtTest_d_r_CFLAGS  = -O3 ${PIPE}
 omtTest_d_r_LDADD   = libomalloc.la
-omtTest_d_r_LDFLAGS = -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/../omalloc
+omtTest_d_r_LDFLAGS = -L${top_builddir}/omalloc -L${top_builddir}/../omalloc

omalloc/configure.ac

@@ -16 +16 @@
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 

xalloc/configure.ac

@@ -8 +8 @@
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) # -Wno-extra-portability -Werror silent-rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])