Changeset 9996416 in git
- Timestamp:
- May 8, 2014, 6:49:29 PM (10 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 363d885bb6d9637313797fa5d3e6b46bf43d4275
- Parents:
- f6d7904b37d591229fb79d7b510e9b82d9bee898
- git-author:
- Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-08 18:49:29+02:00
- git-committer:
- Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-26 18:59:33+02:00
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.am
rf6d790 r9996416 6 6 7 7 SUBDIRS = resources omalloc xalloc $(USE_FACTORY) \ 8 libpolys kernel gfanlib\9 IntegerProgramming Singular dox\10 emacs debian redhat desktop8 libpolys gfanlib IntegerProgramming \ 9 kernel Singular \ 10 dox emacs debian redhat desktop 11 11 12 12 EXTRA_DIST = README autogen.sh git-version-gen -
Singular/Makefile.am
rf6d790 r9996416 9 9 ########################### Possible builtin modules... ######################### 10 10 BUILTIN_FLAGS = ${BUILTIN_LIBS} 11 ## ${EMBED_SYZEXTRA} ${EMBED_PYOBJECT} ${EMBED_GFANLIB} ${EMBED_PM} 12 13 ## EMBED_SYZEXTRA = 14 if SI_BUILTIN_SYZEXTRA 15 BUILTIN_FLAGS += ${builddir}/dyn_modules/syzextra/syzextra.la 16 endif 17 18 ## EMBED_GFANLIB = 19 if HAVE_GFANLIB 20 GF = ${builddir}/dyn_modules/callgfanlib/gfanlib.la 21 endif 22 23 if SI_BUILTIN_GFANLIB 24 BUILTIN_FLAGS += ${GF} 25 endif 26 27 28 ## EMBED_PM 29 if SI_BUILTIN_PM 30 PM=${builddir}/dyn_modules/callpolymake/polymake.la 31 endif 32 33 if SING_HAVE_POLYMAKE 34 BUILTIN_FLAGS += ${PM} 35 endif 36 37 ## EMBED_PYOBJECT = 38 if SI_BUILTIN_PYOBJECT 39 if SI_EMBED_PYTHON 40 if PYTHON_USE 41 BUILTIN_FLAGS += ${builddir}/dyn_modules/pyobject/pyobject.la 42 endif 43 endif 44 endif 11 12 # if SI_BUILTIN_SYZEXTRA 13 # BUILTIN_FLAGS += ${builddir}/dyn_modules/syzextra/syzextra.la 14 # endif 15 16 # if HAVE_GFANLIB 17 # GF = ${builddir}/dyn_modules/callgfanlib/gfanlib.la 18 # endif 19 # if SI_BUILTIN_GFANLIB 20 # BUILTIN_FLAGS += ${GF} 21 # endif 22 23 # if SI_BUILTIN_PM 24 # PM=${builddir}/dyn_modules/callpolymake/polymake.la 25 # endif 26 # if SING_HAVE_POLYMAKE 27 # BUILTIN_FLAGS += ${PM} 28 # endif 29 30 # if SI_BUILTIN_PYOBJECT 31 # if SI_EMBED_PYTHON 32 # if PYTHON_USE 33 # BUILTIN_FLAGS += ${builddir}/dyn_modules/pyobject/pyobject.la 34 # endif 35 # endif 36 # endif 45 37 46 38 ########################### libSingular* ######################### -
Singular/dyn_modules/Makefile.am
rf6d790 r9996416 1 1 ACLOCAL_AMFLAGS = -I ../m4 2 2 3 SUBDIRS=bigintm syzextra gfanlib polymake pyobject3 SUBDIRS=bigintm syzextra pyobject gfanlib polymake 4 4 5 5 -
Singular/dyn_modules/gfanlib/Makefile.am
rf6d790 r9996416 3 3 SOURCES = bbcone.cc bbcone.h bbfan.cc bbfan.h bbpolytope.cc bbpolytope.h gfan.h gitfan.cc gitfan.h gfanlib.cc 4 4 5 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} \5 MY_CPPFLAGS = -I${top_srcdir} -I${top_builddir} \ 6 6 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \ 7 7 ${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \ … … 27 27 gfanlib_la_SOURCES = $(SOURCES) 28 28 29 gfanlib_la_CPPFLAGS = ${ AM_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON}30 gfanlib_la_LDFLAGS = ${ AM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}29 gfanlib_la_CPPFLAGS = ${MY_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON} 30 gfanlib_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS} 31 31 32 gfanlib_la_LIBADD = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS} 32 if HAVE_GFANLIB 33 gfanlib_la_LIBADD = ${abs_top_builddir}/gfanlib/libgfan.la ${CDDGMPLDFLAGS} 34 endif 33 35 34 36 #AM_COLOR_TESTS=always -
Singular/dyn_modules/gfanlib/bbcone.cc
rf6d790 r9996416 1 1 #include <kernel/mod2.h> 2 2 3 #include <gfanlib/gfanlib.h> 4 #include <gfanlib/gfanlib_q.h> 5 6 #include <Singular/ipid.h> 7 #include <Singular/ipshell.h> 8 #include <Singular/blackbox.h> 3 #if HAVE_GFANLIB 4 5 #include <bbfan.h> 6 #include <bbpolytope.h> 7 9 8 #include <misc/intvec.h> 10 9 #include <misc/sirandom.h> … … 12 11 #include <coeffs/bigintmat.h> 13 12 14 #include <bbfan.h> 15 #include <bbpolytope.h> 13 #include <Singular/ipid.h> 14 #include <Singular/ipid.h> 15 #include <Singular/ipshell.h> 16 #include <Singular/blackbox.h> 17 16 18 #include <sstream> 17 18 #include "Singular/ipid.h"19 19 20 20 // #include <omalloc/omalloc.h> … … 23 23 // #include <Singular/lists.h> 24 24 // #include <Singular/subexpr.h> 25 26 #include <gfanlib/gfanlib.h> 27 #include <gfanlib/gfanlib_q.h> 28 25 29 26 30 int coneID; … … 1961 1965 coneID=setBlackboxStuff(b,"cone"); 1962 1966 } 1967 1968 #endif -
Singular/dyn_modules/gfanlib/bbcone.h
rf6d790 r9996416 4 4 #include <kernel/mod2.h> 5 5 6 #include <gfanlib/gfanlib.h> 6 #if HAVE_GFANLIB 7 7 8 #include <misc/intvec.h> 8 9 #include <coeffs/bigintmat.h> 10 #include <Singular/ipid.h> 9 11 10 #include < Singular/ipid.h>12 #include <gfanlib/gfanlib.h> 11 13 12 14 extern int coneID; … … 38 40 39 41 #endif 42 #endif -
Singular/dyn_modules/gfanlib/bbfan.cc
rf6d790 r9996416 1 1 #include <kernel/mod2.h> 2 3 #if HAVE_GFANLIB 2 4 3 5 #include <Singular/ipid.h> … … 20 22 // #include <gfanlib/gfanlib.h> 21 23 // #include <gfanlib/gfanlib_zfan.h> 22 23 24 24 25 int fanID; … … 1062 1063 //Print("created type %d (fan)\n",fanID); 1063 1064 } 1065 1066 #endif -
Singular/dyn_modules/gfanlib/bbfan.h
rf6d790 r9996416 4 4 #include <kernel/mod2.h> 5 5 6 #if HAVE_GFANLIB 7 8 #include <Singular/ipid.h> 9 6 10 #include <gfanlib/gfanlib.h> 7 #include <Singular/ipid.h>8 11 9 12 extern int fanID; … … 19 22 20 23 #endif 24 #endif -
Singular/dyn_modules/gfanlib/bbpolytope.cc
rf6d790 r9996416 1 1 #include <kernel/mod2.h> 2 2 3 #include <gfanlib/gfanlib.h> 4 #include <gfanlib/gfanlib_q.h> 3 #if HAVE_GFANLIB 5 4 6 5 #include <Singular/ipid.h> … … 20 19 // #include <kernel/ring.h> 21 20 // #include <kernel/polys.h> 21 22 #include <gfanlib/gfanlib.h> 23 #include <gfanlib/gfanlib_q.h> 22 24 23 25 int polytopeID; … … 489 491 //Print("created type %d (polytope)\n",polytopeID); 490 492 } 493 494 #endif -
Singular/dyn_modules/gfanlib/bbpolytope.h
rf6d790 r9996416 4 4 #include <kernel/mod2.h> 5 5 6 #if HAVE_GFANLIB 7 8 #include <Singular/ipid.h> 6 9 #include <gfanlib/gfanlib.h> 7 #include <Singular/ipid.h>8 10 9 11 extern int polytopeID; … … 18 20 19 21 #endif 22 #endif -
Singular/dyn_modules/gfanlib/gfan.cc
rf6d790 r9996416 6 6 7 7 #include <kernel/mod2.h> 8 9 #if HAVE_GFANLIB 8 10 9 11 #include <misc/options.h> … … 4526 4528 // WerrorS("Need wp ordering"); 4527 4529 // } 4530 4531 #endif -
Singular/dyn_modules/gfanlib/gfan.h
rf6d790 r9996416 6 6 #ifndef GFAN_H 7 7 #define GFAN_H 8 9 #include <kernel/mod2.h> 10 11 #if HAVE_GFANLIB 8 12 9 13 #include <misc/int64vec.h> … … 278 282 // bool iv64isStrictlyPositive(int64vec *); 279 283 #endif 284 #endif -
Singular/dyn_modules/gfanlib/gfanlib.cc
rf6d790 r9996416 1 #include <kernel/mod2.h> 1 2 2 3 4 5 #include <kernel/mod2.h> 3 #if HAVE_GFANLIB 6 4 7 5 #include <bbcone.h> … … 12 10 #include <Singular/ipid.h> 13 11 #include <Singular/mod_lib.h> 12 14 13 15 14 template class gfan::Vector<gfan::Integer>; … … 27 26 } 28 27 28 29 ###### TODO!!!!! 29 30 #ifndef EMBED_PYTHON 30 31 extern "C" … … 36 37 } 37 38 #endif 39 #endif -
Singular/dyn_modules/gfanlib/gitfan.cc
rf6d790 r9996416 12 12 #include <kernel/mod2.h> 13 13 14 #if HAVE_GFANLIB 15 16 #include <bbcone.h> 17 #include <bbfan.h> 18 #include <gitfan.h> 19 14 20 #include <Singular/ipid.h> 15 21 #include <Singular/lists.h> 16 22 #include <Singular/ipshell.h> 23 17 24 #include <coeffs/bigintmat.h> 18 25 19 #include <bbcone.h>20 #include <bbfan.h>21 #include <gitfan.h>22 26 23 27 namespace gitfan … … 370 374 p->iiAddCproc("","nextAfaceToCheck",FALSE,nextAfaceToCheck); 371 375 } 376 377 #endif -
Singular/dyn_modules/gfanlib/gitfan.h
rf6d790 r9996416 4 4 #include <kernel/mod2.h> 5 5 6 #if HAVE_GFANLIB 7 6 8 #include <bbcone.h> 7 9 #include <bbfan.h> 10 8 11 #include <Singular/ipid.h> 12 9 13 10 14 namespace gitfan … … 51 55 52 56 void gitfan_setup(SModulFunctions* p); 57 #endif 53 58 54 59 #endif -
Singular/dyn_modules/polymake/Makefile.am
rf6d790 r9996416 28 28 endif 29 29 30 if SING_HAVE_POLYMAKE 30 31 # forcefully enable exceptions for polymake 31 CXXFLAGS += $(POLYMAKE_CXXFLAGS) 32 CXXFLAGS+= $(POLYMAKE_CXXFLAGS) 33 PM_CXXFLAGS= ${POLYMAKE_CXXFLAGS} 34 P_PROCS_MODULE_LDFLAGS+= ${PM_LDFLAGS} 35 polymake_la_LIBADD= ${PM_LIBS} 36 endif 37 38 polymake_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS} 32 39 33 40 polymake_la_SOURCES = $(SOURCES) 34 41 35 polymake_la_CPPFLAGS = ${AM_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON} ${P OLYMAKE_CXXFLAGS}36 polymake_la_CXXFLAGS = ${P OLYMAKE_CXXFLAGS}37 polymake_la_CFLAGS = ${P OLYMAKE_CXXFLAGS}42 polymake_la_CPPFLAGS = ${AM_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON} ${PM_CXXFLAGS} 43 polymake_la_CXXFLAGS = ${PM_CXXFLAGS} 44 polymake_la_CFLAGS = ${PM_CXXFLAGS} 38 45 39 polymake_la_LDFLAGS = ${PM_LDFLAGS} ${P_PROCS_MODULE_LDFLAGS}40 polymake_la_LIBADD = ${PM_LIBS} -
Singular/dyn_modules/polymake/polymake_conversion.cc
rf6d790 r9996416 1 #include <kernel/mod2.h> 2 3 #ifdef HAVE_POLYMAKE 4 1 5 #include <gmpxx.h> 2 6 … … 12 16 #include <gfanlib/gfanlib_q.h> 13 17 14 #include <kernel/mod2.h>15 18 #include <misc/intvec.h> 16 19 #include <coeffs/numbers.h> … … 518 521 return pf; 519 522 } 523 524 #endif -
Singular/dyn_modules/polymake/polymake_conversion.h
rf6d790 r9996416 3 3 4 4 #include <kernel/mod2.h> 5 6 #ifdef HAVE_POLYMAKE 5 7 6 8 #include <gmpxx.h> … … 67 69 68 70 #endif 71 #endif -
Singular/dyn_modules/polymake/polymake_documentation.cc
rf6d790 r9996416 1 #include <kernel/mod2.h> 2 3 #ifdef HAVE_POLYMAKE 4 5 /* 6 #include <polymake_conversion.h> 7 8 #include <Singular/dyn_modules/gfanlib/bbcone.h> 9 #include <Singular/dyn_modules/gfanlib/bbfan.h> 10 #include <Singular/dyn_modules/gfanlib/bbpolytope.h> 11 12 #include <Singular/blackbox.h> 13 #include <Singular/ipshell.h> 14 #include <Singular/subexpr.h> 15 16 #include <string> 17 */ 18 1 19 #include <Singular/ipid.h> 20 2 21 3 22 void init_polymake_help() … … 206 225 207 226 } 227 #endif -
Singular/dyn_modules/polymake/polymake_documentation.h
rf6d790 r9996416 4 4 #include <kernel/mod2.h> 5 5 6 #include <polymake_conversion.h> 7 8 #include <Singular/dyn_modules/callgfanlib/bbcone.h> 9 #include <Singular/dyn_modules/callgfanlib/bbfan.h> 10 #include <Singular/dyn_modules/callgfanlib/bbpolytope.h> 11 12 #include <Singular/blackbox.h> 13 #include <Singular/ipshell.h> 14 #include <Singular/subexpr.h> 15 #include <Singular/ipid.h> 16 17 #include <string> 6 #ifdef HAVE_POLYMAKE 18 7 19 8 void init_polymake_help(); 20 9 21 10 #endif 11 #endif -
Singular/dyn_modules/polymake/polymake_wrapper.cc
rf6d790 r9996416 1 #include <kernel/mod2.h> 2 3 #ifdef HAVE_POLYMAKE 4 5 #include <Singular/dyn_modules/gfanlib/bbcone.h> 6 #include <Singular/dyn_modules/gfanlib/bbfan.h> 7 #include <Singular/dyn_modules/gfanlib/bbpolytope.h> 8 9 #include <Singular/blackbox.h> 10 #include <Singular/ipshell.h> 11 #include <Singular/subexpr.h> 12 1 13 #include <polymake_conversion.h> 2 14 #include <polymake_documentation.h> 3 15 #include <polymake/Graph.h> 4 5 #include <Singular/dyn_modules/callgfanlib/bbcone.h>6 #include <Singular/dyn_modules/callgfanlib/bbfan.h>7 #include <Singular/dyn_modules/callgfanlib/bbpolytope.h>8 9 #include <Singular/blackbox.h>10 #include <Singular/ipshell.h>11 #include <Singular/subexpr.h>12 16 13 17 polymake::Main* init_polymake=NULL; … … 1808 1812 return 0; 1809 1813 } 1814 1815 #endif /* HAVE_POLYMAKE */ -
Singular/mod_lib.h
rf6d790 r9996416 2 2 #define MOD_LIB_H 3 3 4 // #include config.h5 #include <kernel/mod2.h> /* for EMBED_PYTHON, HAVE_MATHICGB*/4 // Note that STATIC_VERSION and DYNAMIC_VERSION should not be defined in the following config header mod2.h! 5 #include <kernel/mod2.h> /* for SI_BUILTINMODULES_ADD */ 6 6 7 7 #include <polys/mod_raw.h> /* for lib_types */ … … 9 9 lib_types type_of_LIB(const char *newlib, char *fullname); 10 10 11 12 #if HAVE_GFANLIB13 #define SI_BUILTIN_GFANLIB(add) add(gfanlib)14 #else15 #define SI_BUILTIN_GFANLIB(add)16 #endif17 18 19 #ifdef EMBED_PYTHON20 #define SI_BUILTIN_PYOBJECT(add) add(pyobject) add(syzextra) SI_BUILTIN_GFANLIB(add)21 //TODO: the line above means that syzextra should be staticly embedded IFF pyobjects do so :(22 #else23 #define SI_BUILTIN_PYOBJECT(add)24 #endif25 26 #ifdef HAVE_MATHICGB27 # define SI_BUILTIN_MATHIC(add) add(singmathic)28 #else29 # define SI_BUILTIN_MATHIC(add)30 #endif31 32 11 /// Data for @c type_of_LIB to determine built-in modules, 33 12 /// use @c add(name) to add built-in library to macro 34 #define SI_FOREACH_BUILTIN(add) \13 #define SI_FOREACH_BUILTIN(add) \ 35 14 add(staticdemo)\ 36 SI_BUILTIN_MATHIC(add)\ 37 SI_BUILTIN_PYOBJECT(add) 15 SI_BUILTINMODULES_ADD(add) 38 16 39 #define SI_MOD_INIT(name) name##_mod_init 17 #ifdef STATIC_VERSION 18 # define SI_MOD_INIT(name) name##_mod_init 19 #elif defined(DYNAMIC_VERSION) 20 # define SI_MOD_INIT(name) mod_init 21 #else 22 # error Please use SI_MOD_INIT inside a Singular (dynamic/shared/static/builtin) module only! 23 #endif 40 24 41 25 #endif 42 26 27 /* 28 #if HAVE_GFANLIB 29 #define SI_BUILTIN_GFANLIB(add) add(gfanlib) 30 #endif 31 #ifdef HAVE_MATHICGB 32 # define SI_BUILTIN_MATHIC(add) add(singmathic) 33 #endif 34 #ifdef EMBED_PYTHON 35 //TODO: the line above means that syzextra should be staticly embedded IFF pyobjects do so :((((( 36 #define SI_BUILTIN_PYOBJECT(add) add(pyobject) add(syzextra) SI_BUILTIN_GFANLIB(add) SI_BUILTIN_MATHIC(add) 37 #endif 38 */ -
m4/options.m4
rf6d790 r9996416 294 294 AC_DEFUN([SING_BUILTIN_MODULES], 295 295 [ 296 AC_MSG_CHECKING([whether for builtin modules]) 297 298 AC_ARG_VAR( [BUILTIN_LIBS], [LIBS for building-in] ) 299 AC_ARG_WITH(builtinmodules, AS_HELP_STRING([--with-builtinmodules], [list? of builtin modules (experimental)])) 300 296 ## m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl 297 AC_MSG_CHECKING([built-in modules]) 298 299 AC_ARG_VAR( [BUILTIN_LIBS], [LIB FLAGS for buildins] ) 300 AC_ARG_WITH(builtinmodules, AS_HELP_STRING([--with-builtinmodules], [List of builtin modules (experimental)])) 301 302 AH_TEMPLATE([SI_BUILTINMODULES_ADD],[Add(list) for Builtin modules]) 303 304 #### TODO Dynamic Modules??? 305 L="" 306 301 307 if test "x$with_builtinmodules" == xno; then 302 308 AC_MSG_RESULT(no) 303 309 else 304 AC_DEFINE_UNQUOTED([SI_BUILTINMODULES],"$with_builtinmodules",[List? of Builtin modules])305 310 AC_MSG_RESULT(yes) 306 311 307 if test "x$with_builtinmodules" == xyes; then 308 with_builtinmodules=pyobject,syzextra,callgfanlib,callpolymake 309 fi 310 311 L="" 312 for a in ${with_builtinmodules//,/ }; do 313 echo "Will build-in '$a'..." 314 case "$a" in 315 pyobject ) BUILTIN_PYOBJECT=yes;; 316 syzextra ) BUILTIN_SYZEXTRA=yes;; 317 callgfanlib ) BUILTIN_GFAN=yes;; 318 callpolymake ) BUILTIN_PM=yes;; 319 esac 320 L+="add($a)" 312 if test "x$with_builtinmodules" == xall; then 313 with_builtinmodules=staticdemo,syzextra,pyobject,gfanlib,polymake,singmathic 314 fi 315 316 LL="" 317 for a in ${with_builtinmodules//,/ }; 318 do 319 AC_MSG_CHECKING([Will build-in '$a'?]) 320 321 if test -d "Singular/dyn_modules/$a"; then 322 L+=" add($a)" 323 LL+=" $a" 324 BUILTIN_LIBS+=" dyn_modules/$a/$a.la" 325 AC_MSG_RESULT(yes) 326 else 327 AC_MSG_RESULT(no) 328 fi 329 330 A=`echo "$a" | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:" -e "/^@<:@m4_cr_digits@:>@/s/^/_/"` 331 AM_CONDITIONAL([SI_BUILTIN_$A],[test -d "Singular/dyn_modules/$a"]a) 321 332 done # for 322 echo "L=$L" 323 324 fi # else 333 334 AC_DEFINE_UNQUOTED([SI_BUILTINMODULES],"$LL",[Refined list of builtin modules]) 335 336 fi # else ("x$with_builtinmodules" != xno) 337 338 AC_MSG_CHECKING([SI_BUILTINMODULES_ADD(add)...]) 339 AC_MSG_RESULT(${L:-unset}) 340 341 AC_DEFINE_UNQUOTED([SI_BUILTINMODULES_ADD(add)],[$L],[Add(list) for Builtin modules]) 325 342 326 343 AC_SUBST(BUILTIN_LIBS) 327 344 328 AM_CONDITIONAL([SI_BUILTIN_PYOBJECT],[test "x$BUILTIN_PYOBJECT" == xyes]) 329 AM_CONDITIONAL([SI_BUILTIN_SYZEXTRA],[test "x$BUILTIN_SYZEXTRA" == xyes]) 330 AM_CONDITIONAL([SI_BUILTIN_GFANLIB],[test "x$BUILTIN_GFAN" == xyes]) 331 AM_CONDITIONAL([SI_BUILTIN_PM],[test "x$BUILTIN_PM" == xyes]) 332 333 AC_MSG_CHECKING([BUILTIN_LIBS?..]) 345 AC_MSG_CHECKING([BUILTIN_LIBS...]) 334 346 AC_MSG_RESULT(${BUILTIN_LIBS:-unset}) 335 336 AC_MSG_CHECKING([builtinmodules?..]) 337 AC_MSG_RESULT(${with_builtinmodules:-unset}) 338 339 340 ]) 347 ]) 348 349
Note: See TracChangeset
for help on using the changeset viewer.