Changeset 080559 in git

Timestamp:

Feb 23, 2017, 10:44:56 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9e343ee0eaae866f167529dde1705e4a1b39580f

Parents:

79d8c073c7a618421d9dc77e8ce8462140fd581b

Message:

dyn_modules:python: first version

Files:

• Singular/dyn_modules/python/CF_wrap.cc (modified) (1 diff)
• Singular/dyn_modules/python/IIntvec.h (added)
• Singular/dyn_modules/python/Ideal.h (added)
• Singular/dyn_modules/python/Makefile (modified) (4 diffs)
• Singular/dyn_modules/python/Number.h (added)
• Singular/dyn_modules/python/Poly.h (added)
• Singular/dyn_modules/python/PowerSeries.h (added)
• Singular/dyn_modules/python/intvec_wrap.h (modified) (1 diff)
• Singular/dyn_modules/python/number_wrap.cc (modified) (1 diff)
• Singular/dyn_modules/python/perf.pyc (deleted)
• Singular/dyn_modules/python/playground.cc (modified) (3 diffs)
• Singular/dyn_modules/python/python.cc (modified) (3 diffs)
• Singular/dyn_modules/python/python.h (modified) (1 diff)
• Singular/dyn_modules/python/python_module.bin (deleted)
• Singular/dyn_modules/python/ring_wrap.h (modified) (1 diff)
• Singular/dyn_modules/python/wrapper.h (modified) (3 diffs)
• old_modgen/openmath/context.pyc (deleted)
• old_modgen/openmath/omexceptions.pyc (deleted)

Singular/dyn_modules/python/CF_wrap.cc

@@ -2 +2 @@
 #include <boost/python.hpp>
 #include <kernel/mod2.h>
-#include "factory.h"
+#include "factory/factory.h"
 
 using boost::python::self;

Singular/dyn_modules/python/Makefile

@@ -1 @@
-#/*
-# * This was automatically generated by modgen
-# * version 0.2
-# * module python
-# * Don't edit this file
-# */
-#
-#
 CC      = gcc
 CXX     = g++
-PYTHON_VERSION=2.3
-SINGULAR_BASE=../..
-SING_ARCH=ix86
-CFLAGS  = -DSING_NDEBUG -DBUILD_MODULE -I. -I${SINGULAR_BASE}/kernel -I${SINGULAR_BASE}/Singular -I/home/michael/sing/${SING_ARCH}-Linux/include  -I/usr/include/python${PYTHON_VERSION}
-DCFLAGS = -DBUILD_MODULE -I. -I/home/michael/sing/kernel -I${SINGULAR_BASE}/Singular -I/home/michael/sing/${SING_ARCH}-Linux/include -I/usr/include/python${PYTHON_VERSION}
+PYTHON_VERSION=2.7
+SINGULAR_BASE=../../..
+CFLAGS  = -DSING_NDEBUG -DSING_OMNDEBUG -I. -I${SINGULAR_BASE} -I${SINGULAR_BASE}/kernel -I${SINGULAR_BASE}/Singular  -I/usr/include/python${PYTHON_VERSION} -I/tmp2/wawa -I${SINGULAR_BASE}/libpolys -I/tmp2/wawa/libpolys -I${SINGULAR_BASE}/factory/include
 LDFLAGS= -lboost_python -lpython${PYTHON_VERSION}
 #LD     =
@@ -22 +12 @@
 INSTALL_DATA    = ${INSTALL} -m 644
 SRCS    = python.cc poly_wrap.cc vector_wrap.cc CF_wrap.cc\
-             ņumber_wrap.cc playground.cc
+             ņumber_wrap.cc 
 OBJS    = python.o poly_wrap.o vector_wrap.o CF_wrap.o\
-             number_wrap.o playground.o
-DOBJS   = python.og poly_wrap.og vector_wrap.og CF_wrap.og\
-             number_wrap.og playground.og
-default:
-        echo "use scons for building this project"
+             number_wrap.o 
 
-all:    python_module.so python_module_g.so
+all:    python_module.so
 
 %.o: %.cc Makefile
         ${CXX} ${CFLAGS} -c -fPIC -DPIC $< -o $*.o
-
-%.og: %.cc Makefile
-        ${CXX} ${DCFLAGS} -c -fPIC -DPIC $< -o $*.og
 
 python_module.so: ${OBJS}
@@ -44 +27 @@
         ln -s python_module.so.1.2.0 python_module.so
 
-python_module_g.so: ${DOBJS}
-        ${CXX} ${DCFLAGS} ${LDFLAGS} -shared -Wl,-soname -Wl,python_module_g.so.1 \
-                -o python_module_g.so.1.2.0 ${DOBJS}
-        rm -f python_module_g.so
-        ln -s python_module_g.so.1.2.0 python_module_g.so
-
 clean:
-        rm -f *.o *.og *.lo *.so* *.sl *.la *~ core
+        rm -f *.o *.lo *.so* *.sl *.la *~ core
 
 distclean: clean
-        rm -f python.cc python.h Makefile *.bin *.pl
+        rm -f Makefile *.pl
 
 install:
@@ -60 +37 @@
         ${MKINSTALLDIRS} ${instdir}/MOD
         ${INSTALL_PROGRAM} python_module.so ${instdir}/MOD/python_module.so
-        ${INSTALL_PROGRAM} python_module.bin ${instdir}/MOD/python_module.bin
 
 

Singular/dyn_modules/python/intvec_wrap.h

@@ -3 +3 @@
 #include <vector>
 #include <kernel/mod2.h>
-#include "intvec.h"
+#include "misc/intvec.h"
 #include "IIntvec.h"
 void export_intvec();

Singular/dyn_modules/python/number_wrap.cc

@@ -10 +10 @@
   StringSetS("");
   n.write();
-  char* out=StringAppendS("");
+  char* out=StringEndS();
   return boost::python::str(out,strlen(out));
 }

Singular/dyn_modules/python/playground.cc

@@ -9 +9 @@
 using boost::python::object;
 using boost::python::list;
-object foo(){
+object foo()
+{
   list l;
-  for(int j=0;j<2;j++){
+  for(int j=0;j<2;j++)
+  {
     list row;
-    for(int i=0;i<10;i++){
+    for(int i=0;i<10;i++)
+    {
       Poly ip(i*(j+1),currRing);
       row.append(ip);
@@ -21 +24 @@
     l.append(row);
   }
-  array::set_module_and_type("Numeric",
+  boost::python::numeric::array::set_module_and_type("Numeric",
                              "ArrayType"
                              );
-  array a(l);
+  boost::python::numeric::array a(l);
   return a;
-
-
-
-
 }
-boost::python::object foo2(array f){
+object foo2(array f)
+{
   using boost::python::extract;
   object o=f.attr("shape");
@@ -48 +48 @@
   return boost::python::str("suc");
 }
-void export_playground(){
+void export_playground()
+{
   def("foo",foo);
   def("foo2",foo2);

Singular/dyn_modules/python/python.cc

@@ -14 +14 @@
 
 #include <locals.h>
-#include <omalloc.h>
+#include <omalloc/omalloc.h>
 #include "python.h"
 
@@ -24 +24 @@
 #include "wrapper.h"
 
-extern "C" {
 //int mod_init(
 //  int (*iiAddCproc)(char *libname, char *procname, BOOLEAN pstatic,
 //              BOOLEAN(*func)(leftv res, leftv v))
 //  )
-  int mod_init( SModulFunctions* psModulFunctions)
+extern "C" int mod_init( SModulFunctions* psModulFunctions)
 {
-  enter_id("category","tests", STRING_CMD);
-  enter_id("version","$Id$", STRING_CMD);
-  enter_id("info","LIBRARY: kernel.lib  PROCEDURES OF GENERAL TYPE WRITEN IN C python(input); eval a string  in python", STRING_CMD);
   Py_Initialize();
   PyRun_SimpleString("from sys import path\n\
@@ -44 +40 @@
 }
 
-BOOLEAN mod_python(leftv __res, leftv __h)
+extern "C" BOOLEAN mod_python(leftv __res, leftv __h)
 {
   leftv __v = __h, __v_save;

Singular/dyn_modules/python/python.h

@@ -1 @@
-BOOLEAN mod_python(leftv res, leftv h);
+extern "C" BOOLEAN mod_python(leftv res, leftv h);

Singular/dyn_modules/python/ring_wrap.h

@@ -1 +1 @@
 #ifndef RING_WRAP_HEADER
 #define RING_WRAP_HEADER
-#include "ring.h"
+#include "polys/monomials/ring.h"
 #include "grammar.h"
 #include "subexpr.h"

Singular/dyn_modules/python/wrapper.h

@@ -8 +8 @@
 
 #include "structs.h"
-#include "numbers.h"
+#include "coeffs/numbers.h"
 
-#include "febase.h"
+//#include "febase.h"
 #include "ipid.h"
 #include "ipshell.h"
@@ -19 +19 @@
 #include "Ideal.h"
 #include "ideal_wrap.h"
-#include <factory.h>
+#include <factory/factory.h>
 #include "poly_wrap.h"
 #include "vector_wrap.h"
 #include "CF_wrap.h"
 #include "number_wrap.h"
-#include "playground.h"
+//#include "playground.h"
 #include "interpreter_support.h"
 #include "ring_wrap.h"
@@ -58 +58 @@
   export_number();
   export_vector();
-  export_playground();
+  //export_playground();
   export_ideal();
   export_module();