Changeset ec1006 in git

Timestamp:

Dec 7, 2012, 4:31:22 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

bf7dfc43347df3010846b62ff38fa0b4e8b30247

Parents:

6554ca42ebe1277c9afe7990970390905a6e1cf02ac2935796fc44d19ee67851bc57153313ee297b

Message:

Merge pull request #218 from alexanderdreyer/spielwiese-pyobject

Spielwiese pyobject

Files:

• Makefile.am (modified) (1 diff)
• Singular/Makefile.am (modified) (2 diffs)
• Singular/blackbox.h (modified) (2 diffs)
• Singular/iparith.cc (modified) (1 diff)
• Singular/ipid.cc (modified) (2 diffs)
• Singular/pyobject.cc (modified) (5 diffs)
• Singular/pyobject_setup.cc (modified) (1 diff)
• Singular/tesths.cc (modified) (1 diff)
• configure.ac (modified) (1 diff)

Makefile.am

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

Singular/Makefile.am

@@ -88 +88 @@
    links/ssiLink.cc\
    subexpr.cc\
+   pyobject_setup.cc\
    walk.cc\
    walk_ip.cc\
@@ -390 +391 @@
 MOD: ${top_builddir}/libpolys/polys/.libs
         ln -snf ${top_builddir}/libpolys/polys/.libs/ ${builddir}/MOD
+
+if PYTHON_USE
+   moduledir = $(bindir)/MOD
+   module_LTLIBRARIES = pyobject.la
+   pyobject_la_SOURCES = pyobject.cc
+
+   pyobject_la_CPPFLAGS   = ${AM_CPPFLAGS} ${NODEBUGDEFS}
+   pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}
+
+   pyobject_la_CXXFLAGS   = ${NODEBUGCXXFLAGS} @PYTHON_CSPEC@ 
+   pyobject_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} @PYTHON_CSPEC@ 
+
+   pyobject_la_LDFLAGS = -export-dynamic -shared -module -avoid-version \
+     ${AMLDFLAGS} @PYTHON_LSPEC@ 
+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
@@ -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/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/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

@@ -61 +61 @@
 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_ENABLE()
+AX_PYTHON_WITH()
+AX_PYTHON_VERSION_ENSURE( [2.4] )
+AX_PYTHON_DEVEL([>= 2.4])
+AX_PYTHON_LSPEC()
+AX_PYTHON_CSPEC()
 
 AC_FUNC_ERROR_AT_LINE