Changeset b3cd39 in git

Timestamp:

Dec 4, 2012, 4:18:43 PM (11 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

3c4ee7ec0db9654a8c35db2316417a2de54aa6e6

Parents:

6fcddc9d1ce61bb4b060ffc6ead86cd70694c9a8

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-12-04 16:18:43+01:00

git-committer:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-12-04 16:18:52+01:00

Message:

Experimenting with pyobject

Files:

• Makefile.am (modified) (1 diff)
• Singular/Makefile.am (modified) (1 diff)
• Singular/blackbox.h (modified) (1 diff)
• Singular/pyobject.cc (modified) (4 diffs)
• configure.ac (modified) (1 diff)

Makefile.am

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

Singular/Makefile.am

@@ -390 +390 @@
 MOD: ${abs_top_builddir}/libpolys/polys/.libs
         ln -snf ${abs_top_builddir}/libpolys/polys/.libs/ ${abs_builddir}/MOD
+
+
+if PYTHON_USE
+   PACKAGES=pyobject
+   moduledir = $(bindir)
+   module_LTLIBRARIES=pyobject.so
+   pyobject_so_SOURCES = pyobject.cc
+   pyobject_so_LIBADD =  libSingular.la -lnumeric -lkernel -lpolys  -lcoeffs \
+  -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(FLINT_LIBS) \
+$(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
+
+
+   pyobject_so_CPPFLAGS  = ${AM_CPPFLAGS} @PYTHON_CSPEC@ ${Singular_LDADD} ${AMLDFLAGS}
+   pyobject_so_LDFLAGS = ${AMLDFLAGS}  -module -avoid-version @PYTHON_LSPEC@ \
+ -DHUHUHUHUHU ${pyobject_so_LIBADD}
+endif

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

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>
@@ -587 +603 @@
     return FALSE;
 
-  return blackboxDefaultOp3(op, res, arg1, arg2, arg3);
+  return blackbox_default_Op3(op, res, arg1, arg2, arg3);
 }
 
@@ -687 +703 @@
 
 // forward declaration
-int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
-               BOOLEAN(*func)(leftv res, leftv v));
+//int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
+//               BOOLEAN(*func)(leftv res, leftv v));
 
 #define ADD_C_PROC(name) iiAddCproc("", (char*)#name, FALSE, name);

configure.ac

@@ -58 +58 @@
 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)]))
 LB_CHECK_FLINT(2.3,,AC_MSG_WARN([Unable to find FLINT (which is strongly recommended) on your machine: please use --with-flint=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
+
+AX_PYTHON_WITH()
+AX_PYTHON_VERSION_ENSURE( [2.4] )
+AX_PYTHON_LSPEC()
+AX_PYTHON_CSPEC()
 
 AC_FUNC_ERROR_AT_LINE