Changeset daa13f in git

Timestamp:

Mar 10, 2014, 2:16:22 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

91dd8a5ef5bb06f9f51df16f59786c2ff90de8ca

Parents:

70d976d3bfd86a066c9e62325769fb948f8735249bb56c19a835494d592e023dcce31c901eceefc5

Message:

Merge pull request #536 from mmklee/factory_noPP

Factory no pp

Files:

• Singular/HOWTO.FindMemoryHoles (modified) (1 diff)
• Singular/iparith.cc (modified) (2 diffs)
• factory/Makefile.am (modified) (1 diff)
• factory/configure.ac (modified) (4 diffs)
• factory/test.cc (modified) (3 diffs)

Singular/HOWTO.FindMemoryHoles

@@ -1 @@
-Here is a first short HowTo on how to locate memory holes in Singular:
-1.) Make sure you build with -DOM_TRACK=5 (e.g. use Singulart, Singularg).
+Here is a HowTo for locating memory holes in Singular:
+
+0.) disable optimization and define flag OM_TRACK=5 :
+     set  
+       CXXFLAGS=" -O0 -DOM_TRACK=5 " 
+         CFLAGS=" -O0 -DOM_TRACK=5 " 
+     explicitly, since configure option '--disable-optimizationflags' does not enable -O0
+
+1.) configure Singular with options 
+     " --enable-debug --with-track-fl --with-track-backtrace " 
+     or similar (see available options from 'cd omalloc/ && ./configure --help )
 2.) Use system("mtrack", [<level>, [<filename>]]) to get a report about
     unused memory, where

Singular/iparith.cc

@@ -2526 +2526 @@
   const int n = L->nr; assume (n >= 0);
   std::vector<ideal> V(n + 1);
- 
+
   for(int i = n; i >= 0; i--) V[i] = (ideal)(L->m[i].Data());
-   
+
   res->data=interpolation(V, (intvec*)v->Data());
   setFlag(res,FLAG_STD);
@@ -5114 +5114 @@
   switch (t)
   {
-    case INT_CMD:        res->data=omStrDup("int"); break;
-    case POLY_CMD:       res->data=omStrDup("poly"); break;
-    case VECTOR_CMD:     res->data=omStrDup("vector"); break;
-    case STRING_CMD:     res->data=omStrDup("string"); break;
-    case INTVEC_CMD:     res->data=omStrDup("intvec"); break;
-    case IDEAL_CMD:      res->data=omStrDup("ideal"); break;
-    case MATRIX_CMD:     res->data=omStrDup("matrix"); break;
-    case MODUL_CMD:      res->data=omStrDup("module"); break;
-    case MAP_CMD:        res->data=omStrDup("map"); break;
-    case PROC_CMD:       res->data=omStrDup("proc"); break;
-    case RING_CMD:       res->data=omStrDup("ring"); break;
-    case QRING_CMD:      res->data=omStrDup("qring"); break;
-    case INTMAT_CMD:     res->data=omStrDup("intmat"); break;
-    case BIGINTMAT_CMD:  res->data=omStrDup("bigintmat"); break;
-    case NUMBER_CMD:     res->data=omStrDup("number"); break;
-    case BIGINT_CMD:     res->data=omStrDup("bigint"); break;
-    case LIST_CMD:       res->data=omStrDup("list"); break;
-    case PACKAGE_CMD:    res->data=omStrDup("package"); break;
-    case LINK_CMD:       res->data=omStrDup("link"); break;
-    case RESOLUTION_CMD: res->data=omStrDup("resolution");break;
+    case INT_CMD:
+    case POLY_CMD:
+    case VECTOR_CMD:
+    case STRING_CMD:
+    case INTVEC_CMD:
+    case IDEAL_CMD:
+    case MATRIX_CMD:
+    case MODUL_CMD:
+    case MAP_CMD:
+    case PROC_CMD:
+    case RING_CMD:
+    case QRING_CMD:
+    case INTMAT_CMD:
+    case BIGINTMAT_CMD:
+    case NUMBER_CMD:
+    case BIGINT_CMD:
+    case LIST_CMD:
+    case PACKAGE_CMD:
+    case LINK_CMD:
+    case RESOLUTION_CMD:
+         res->data=omStrDup(Tok2Cmdname(t)); break;
     case DEF_CMD:
     case NONE:           res->data=omStrDup("none"); break;

factory/Makefile.am

@@ -8 +8 @@
 
 libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la \
-$(OMALLOC_LDFLAGS) $(OMALLOC_R_LDADD) $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
+$(RESOURCES_LDFLAGS) $(OMALLOC_LDFLAGS) $(OMALLOC_R_LDADD) $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
 
 libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}

factory/configure.ac

@@ -350 +350 @@
     OMALLOC_CFLAGS="$OMALLOC_CFLAGS -I${with_omalloc_extra_dir}"
     OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc"
-    if test "x$with_Singular" = xyes; then
-      OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/resources"
-    fi 
   fi
   
@@ -367 +364 @@
 #  OMALLOC_G_LDADD="-lresources_g -lomalloc_g"
   OMALLOC_R_LDADD="-lomalloc"
-  if test "x$with_Singular" = xyes; then
-    OMALLOC_R_LDADD="$OMALLOC_R_LDADD -lresources"
-  fi
 
   AC_DEFINE(HAVE_OMALLOC, 1, [omalloc support])
@@ -381 +375 @@
   AC_MSG_RESULT(no)
 fi
+
+if test "x$ENABLE_OMALLOC" = xyes && test "x$with_Singular" = xyes; then
+  RESOURCES_LDFLAGS="$RESOURCES_LDFLAGS -L${with_omalloc_dir}/resources -L${with_omalloc_extra_dir}/resources -lresources "
+  AC_SUBST(RESOURCES_LDFLAGS)
+fi 
 
 AM_CONDITIONAL([ENABLE_OMALLOC],[test "x$ENABLE_OMALLOC" = xyes])
@@ -440 +439 @@
 #AC_SUBST(uninstalltargets)
 
-factory_version="3.1.3"
+factory_version="4.0.0"
 factory_configuration="'$ac_configure_args' in `pwd`"
 AC_SUBST(factory_version)

factory/test.cc

@@ -1 +1 @@
 #include <factory/factory.h>
+#ifdef SINGULAR
+#include <resources/feFopen.h>
+#endif
 #include "cf_assert.h"
 
@@ -76 +79 @@
 }*/
 
+#ifdef SINGULAR
+extern void feInitResources(const char* argv0 = NULL);
+#endif
+
 int main( int, char *argv[] )
 {
@@ -88 +95 @@
     return(1);
   }
+
+#ifdef SINGULAR
+  feInitResources(argv[0]);
+#endif
 
 //  On (SW_USE_EZGCD); On (SW_USE_EZGCD_P); // TODO&NOTE: these switches lead to failed tests (with nonzero p)!