Changeset 11849

Timestamp:

04/01/12 15:22:14 (13 years ago)

Author:

Eric.Larour

Message:

Starting systematization of python modules

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (2 diffs)
• src/c/toolkits/python (added)
• src/c/toolkits/python/pythonincludes.h (added)
• src/c/toolkits/toolkits.h (modified) (1 diff)
• src/mex/Makefile.am (modified) (1 diff)
• src/mex/Test/Test.cpp (modified) (2 diffs)
• src/mex/Test/Test.h (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -303 +303 @@
                 PYTHONLIB="-L$PYTHON_ROOT/lib -lpython3.2"
                 PYTHONEXT=.so
+                PYTHONLINK="-dynamiclib"
 
                 AC_DEFINE([_HAVE_PYTHON_],[1],[with Python in ISSM src])
@@ -309 +310 @@
                 WRAPPEREXT=$PYTHONEXT
                 AC_SUBST([WRAPPEREXT])
+                AC_SUBST([PYTHONLINK])
         else
                 HAVE_PYTHON=no

issm/trunk-jpl/src/c/toolkits/toolkits.h

@@ -16 +16 @@
 #endif
 
+#ifdef _HAVE_MATLAB_
+#include "./matlab/matlabincludes.h"
+#endif
+
+#ifdef _HAVE_PYTHON_
+#include "./python/pythonincludes.h"
+#endif
+
 #include "./mpi/mpiincludes.h"
 #include "./metis/metisincludes.h"
 #include "./triangle/triangleincludes.h"
-#include "./matlab/matlabincludes.h"
 #include "./double/double.h"
 #include "./toolkitsenums.h"

issm/trunk-jpl/src/mex/Makefile.am

@@ -127 +127 @@
 endif 
 
+if PYTHON
+AM_LDFLAGS = $(PYTHONLINK)
+AM_CXXFLAGS=  -DNPY_NO_DEPRECATED_API 
+LDADD += $(BOOSTLIB) $(PYTHONLIB)
+endif
+
 #Triangle library
 AM_CXXFLAGS+=  -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER

issm/trunk-jpl/src/mex/Test/Test.cpp

@@ -6 +6 @@
 #include "./Test.h"
 
-using namespace boost::python;
-
-void mesh(boost::python::numeric::array array){
+void Test(pyArray array){
 
         int i;
@@ -28 +26 @@
 }
 
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-using namespace boost::python;
-
 BOOST_PYTHON_MODULE(Test){
         boost::python::numeric::array::set_module_and_type( "numpy", "ndarray");
-        //boost::python::numeric::array::set_module_and_type( "numpy", "array");
-        def("mesh",mesh);
+        def("Test",Test);
 }

issm/trunk-jpl/src/mex/Test/Test.h

@@ -14 +14 @@
 #include <numpy/arrayobject.h>
 
+using namespace boost::python;
+typedef boost::python::numeric::array pyArray;
+
 #endif