Changeset 643b1eb in git

Timestamp:

May 10, 2011, 3:30:09 PM (12 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b58d4735ba8885b68e60e175df833c691cd3c04e

Parents:

06541226e172777614f7a62af88d739f6cea424c

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-10 15:30:09+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:41+01:00

Message:

include ftmpl_inst.cc in libsingcf.a (template instantiations)

- disabled memutil by default in factory
- include readcf.og in the debug version of factory
- check for ntl in libpolys

Files:

• factory/GNUmakefile.in (modified) (2 diffs)
• factory/configure.in (modified) (1 diff)
• libpolys/coeffs/Makefile.am (modified) (2 diffs)
• libpolys/coeffs/test.cc (modified) (2 diffs)
• libpolys/configure.ac (modified) (1 diff)

factory/GNUmakefile.in

@@ -200 +200 @@
                 bifac.cc \
                 lgs.cc \
-                singext.cc
+                singext.cc \
+                ftmpl_inst.cc
 
 useiofactorysrc := \
@@ -216 +217 @@
 factoryobj1 :=  $(factorysrc:%.cc=%.o)
 factoryobj :=   $(factoryobj1:%.y=%.o)
-factorygobj :=  $(factorysrc:%.cc=%.og)
+factorygobj1 :=  $(factorysrc:%.cc=%.og)
+factorygobj :=  $(factorygobj1:%.y=%.og)
 factorypobj :=  $(factorysrc:%.cc=%.op)
 factorydep :=   $(factorysrc:%.cc=%.d)

factory/configure.in

@@ -389 +389 @@
     
 # memory manager
-if test "x$with_memman" != xno; then
+if test "x$with_memman" = xyes; then
   alltargets="$alltargets mem"
   installtargets="$installtargets installmem"

libpolys/coeffs/Makefile.am

@@ -20 +20 @@
         mpr_complex.h mpr_global.h
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS}
+INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
 
 SOURCES = \
@@ -46 +46 @@
 test_g_SOURCES = test.cc
 
-test_LDADD   = -lcoeffs ${GMP_LIBS} -lresources -lreporter -lmisc -lsingcf -lomalloc
-test_g_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g -lsingcf_g -lomalloc_debug
+test_LDADD   = -lcoeffs ${GMP_LIBS} ${NTL_LIBS} -lresources -lreporter -lmisc -lsingcf -lomalloc
+test_g_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g -lsingcf_g -lomalloc_debug
 
 

libpolys/coeffs/test.cc

@@ -18 +18 @@
 #include <coeffs/rintegers.h>
 #ifdef HAVE_FACTORY
-#include <factory/factory.h>
+int initializeGMP(){ return 1; }
 #endif
 
@@ -24 +24 @@
 
 using namespace std;
-
-// template stuff
-#ifdef HAVE_FACTORY
-  #include <factory/templates/ftmpl_list.cc>
-  #include <factory/templates/ftmpl_array.cc>
-  #include <factory/templates/ftmpl_factor.cc>
-  #include <factory/templates/ftmpl_functions.h>
-  #include <factory/templates/ftmpl_matrix.cc>
-  template class Factor<CanonicalForm>;
-  template class List<CFFactor>;
-  template class ListItem<CFFactor>;
-  template class ListItem<CanonicalForm>;
-  template class ListIterator<CFFactor>;
-  template class List<CanonicalForm>;
-  template class List<List<CanonicalForm> >;
-  template class ListIterator<CanonicalForm>;
-  template class Array<CanonicalForm>;
-  template class List<MapPair>;
-  template class ListItem<MapPair>;
-  template class ListIterator<MapPair>;
-  template class Matrix<CanonicalForm>;
-  template class SubMatrix<CanonicalForm>;
-  template class Array<REvaluation>;
-  template bool find ( const List<CanonicalForm> &, const CanonicalForm&);
-  template List<CFFactor> Union ( const List<CFFactor>&, const List<CFFactor>& );
-  template int operator == ( const Factor<CanonicalForm>&, const Factor<CanonicalForm>& );
-
-  template CanonicalForm tmax ( const CanonicalForm&, const CanonicalForm& );
-  template CanonicalForm tmin ( const CanonicalForm&, const CanonicalForm& );
-
-  template Variable tmax ( const Variable&, const Variable& );
-  template Variable tmin ( const Variable&, const Variable& );
-
-  template int tmax ( const int&, const int& );
-  template int tmin ( const int&, const int& );
-  template int tabs ( const int& );
-
-  int initializeGMP()
-  { return 1; }
-#endif
 
 #pragma GCC diagnostic ignored "-Wwrite-strings"

libpolys/configure.ac

@@ -20 +20 @@
 # Checks for libraries.
 LB_CHECK_GMP(3.1.1,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
+
+LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 
 # Checks for library functions.