Changeset 11849
- Timestamp:
- 04/01/12 15:22:14 (13 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/m4/issm_options.m4
r11848 r11849 303 303 PYTHONLIB="-L$PYTHON_ROOT/lib -lpython3.2" 304 304 PYTHONEXT=.so 305 PYTHONLINK="-dynamiclib" 305 306 306 307 AC_DEFINE([_HAVE_PYTHON_],[1],[with Python in ISSM src]) … … 309 310 WRAPPEREXT=$PYTHONEXT 310 311 AC_SUBST([WRAPPEREXT]) 312 AC_SUBST([PYTHONLINK]) 311 313 else 312 314 HAVE_PYTHON=no -
issm/trunk-jpl/src/c/toolkits/toolkits.h
r11733 r11849 16 16 #endif 17 17 18 #ifdef _HAVE_MATLAB_ 19 #include "./matlab/matlabincludes.h" 20 #endif 21 22 #ifdef _HAVE_PYTHON_ 23 #include "./python/pythonincludes.h" 24 #endif 25 18 26 #include "./mpi/mpiincludes.h" 19 27 #include "./metis/metisincludes.h" 20 28 #include "./triangle/triangleincludes.h" 21 #include "./matlab/matlabincludes.h"22 29 #include "./double/double.h" 23 30 #include "./toolkitsenums.h" -
issm/trunk-jpl/src/mex/Makefile.am
r11846 r11849 127 127 endif 128 128 129 if PYTHON 130 AM_LDFLAGS = $(PYTHONLINK) 131 AM_CXXFLAGS= -DNPY_NO_DEPRECATED_API 132 LDADD += $(BOOSTLIB) $(PYTHONLIB) 133 endif 134 129 135 #Triangle library 130 136 AM_CXXFLAGS+= -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER -
issm/trunk-jpl/src/mex/Test/Test.cpp
r11845 r11849 6 6 #include "./Test.h" 7 7 8 using namespace boost::python; 9 10 void mesh(boost::python::numeric::array array){ 8 void Test(pyArray array){ 11 9 12 10 int i; … … 28 26 } 29 27 30 31 #include <boost/python/module.hpp>32 #include <boost/python/def.hpp>33 using namespace boost::python;34 35 28 BOOST_PYTHON_MODULE(Test){ 36 29 boost::python::numeric::array::set_module_and_type( "numpy", "ndarray"); 37 //boost::python::numeric::array::set_module_and_type( "numpy", "array"); 38 def("mesh",mesh); 30 def("Test",Test); 39 31 } -
issm/trunk-jpl/src/mex/Test/Test.h
r11845 r11849 14 14 #include <numpy/arrayobject.h> 15 15 16 using namespace boost::python; 17 typedef boost::python::numeric::array pyArray; 18 16 19 #endif
Note:
See TracChangeset
for help on using the changeset viewer.