diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-08-22 04:01:38 +01:00
parent e50d722e66
commit ba730273e7
7 changed files with 86 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.h.cmake
View File

@ -1994,11 +1994,21 @@ calls it, or to nothing if 'inline' is not supported under any name. */
#endif #endif
#endif #endif
#if YAPOR
#ifndef USE_DL_MALLOC
#define USE_DL_MALLOC 1
#endif
#else
/* use the OS malloc or some other external library to implement the data-base
*/
#ifndef USE_SYSTEM_MALLOC
#define USE_SYSTEM_MALLOC ${WITH_SYSTEM_MALLOC}
#endif
#endif
//#define DEBUG_MALLOC 1 //#define DEBUG_MALLOC 1
#if DEBUG_MALLOC #if DEBUG_MALLOC
#if HAVE_MALLOC_H
#include <malloc.h>
#endif
#define malloc(sz) my_malloc(sz) #define malloc(sz) my_malloc(sz)
#define realloc(pt, sz) my_realloc(pt,sz) #define realloc(pt, sz) my_realloc(pt,sz)
#define free(pt) my_free(pt) #define free(pt) my_free(pt)

7
packages/CLPBN/CMakeLists.txt
View File

@ -90,7 +90,12 @@ set(
) )
IF (WITH_HORUS) IF (WITH_HORUS)
add_subDIRECTORY (horus) include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(COMPILER_SUPPORTS_CXX11)
add_subDIRECTORY (horus)
endif()
ENDIF() ENDIF()
install(FILES install(FILES

8
packages/python/CMakeLists.txt
View File

@ -12,7 +12,7 @@ add_library (libpython SHARED ${PYTHON_SOURCES})
set (PYTHON_HEADERS set (PYTHON_HEADERS
python.h) python.h)
# configure_file ("setup.py.cmake" "setup.py" ) configure_file ("setup.py.cmake" "setup.py" )
target_link_libraries(libpython libYap ${PYTHON_LIBRARIES}) target_link_libraries(libpython libYap ${PYTHON_LIBRARIES})
@ -38,6 +38,12 @@ add_custom_target ( YAPex ALL
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install -f install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install -f
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
find_python_module( jupyter )
if (PY_JUPYTER)
add_subdirectory(yap_kernel) add_subdirectory(yap_kernel)
endif()
endif (PYTHONLIBS_FOUND) endif (PYTHONLIBS_FOUND)

6
packages/python/pybips.c
View File

@ -951,13 +951,15 @@ PyObject *compound_to_pytree(term_t t, functor_t fun) {
// this should never happen // this should never happen
return term_to_python( t, false); return term_to_python( t, false);
} else { } else {
#if PY_MAJOR_VERSION >= 3
const char *s; const char *s;
if (!(s = PL_atom_chars(name))) if (!(s = PL_atom_chars(name)))
return NULL; return NULL;
#if PY_MAJOR_VERSION >= 3
return term_to_nametuple(s, arity, t); return term_to_nametuple(s, arity, t);
#else #else
PyObject *c, *o1; term_t tleft;
int i;
PyObject *c, *o1;
o = PyTuple_New(arity); o = PyTuple_New(arity);
tleft = PL_new_term_ref(); tleft = PL_new_term_ref();
for (i = 0; i < arity; i++) { for (i = 0; i < arity; i++) {

3
packages/python/setup.py.cmake
View File

@ -1,5 +1,4 @@
from setuptools import setup, Extension from distutils.core import setup
setup( setup(
name = "yapex", name = "yapex",

101
packages/swig/python/CMakeLists.txt
View File

@ -3,76 +3,81 @@
INCLUDE(${SWIG_USE_FILE}) INCLUDE(${SWIG_USE_FILE})
if (PYTHONLIBS_FOUND) if (PYTHONLIBS_FOUND)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/CXX) include(FindPythonModule)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
SET(CMAKE_SWIG_FLAGS "") INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/CXX)
SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES CPLUSPLUS ON) SET(CMAKE_SWIG_FLAGS "")
SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES SWIG_FLAGS "-includeall")
configure_file ("setup.py.cmake" "setup.py" ) SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES CPLUSPLUS ON)
SET_SOURCE_FILES_PROPERTIES(../yap.i PROPERTIES SWIG_FLAGS "-includeall")
configure_file ("setup.py.cmake" "setup.py" )
#SET( CMAKE_SWIG_OUTDIR "yap" ) #SET( CMAKE_SWIG_OUTDIR "yap" )
SWIG_ADD_MODULE(yap python ../yap.i) SWIG_ADD_MODULE(yap python ../yap.i)
SWIG_LINK_LIBRARIES(yap ${PYTHON_LIBRARIES} Yap++ libYap libpython) SWIG_LINK_LIBRARIES(yap ${PYTHON_LIBRARIES} Yap++ libYap libpython)
set_target_properties ( ${SWIG_MODULE_yap_REAL_NAME} PROPERTIES NO_SONAME ON ) set_target_properties ( ${SWIG_MODULE_yap_REAL_NAME} PROPERTIES NO_SONAME ON )
# execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print( sysconfig.get_python_lib( plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}' ) )" # execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print( sysconfig.get_python_lib( plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}' ) )"
# OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH # OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
# OUTPUT_STRIP_TRAILING_WHITESPACE ) # OUTPUT_STRIP_TRAILING_WHITESPACE )
# get_filename_component ( _ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE ) # get_filename_component ( _ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE )
# file ( RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH} ) # file ( RELATIVE_PATH _REL_PYTHON_MOULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH} )
# set ( PYTHON_MODULE_PATH set ( PYTHON_MODULE_PATH
# ${_REL_PYTHON_MODULE_PATH} ${_REL_PYTHON_MODULE_PATH}
# ) )
set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py") set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
add_custom_target ( py2yap ALL add_custom_target ( py2yap ALL
COMMAND ${PYTHON_EXECUTABLE} setup.py build -f COMMAND ${PYTHON_EXECUTABLE} setup.py bdist
DEPENDS yap.py ) DEPENDS yap.py )
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install -f
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
# INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/yap/_yap.so DESTINATION ${PYTHON_MODULE_PATH} ) # INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/yap/_yap.so DESTINATION ${PYTHON_MODULE_PATH} )
# INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/yap/yap.py DESTINATION ${PYTHON_MODULE_PATH} ) # INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/yap/yap.py DESTINATION ${PYTHON_MODULE_PATH} )
# INSTALL ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/yap/yapex.py DESTINATION ${PYTHON_MODULE_PATH} ) # INSTALL ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/yap/yapex.py DESTINATION ${PYTHON_MODULE_PATH} )
if ( DOCUMENTATION AND DOXYGEN_FOUND ) if ( DOCUMENTATION AND DOXYGEN_FOUND )
set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND}) set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
# Run doxygen to only generate the xml # Run doxygen to only generate the xml
add_custom_command ( OUTPUT ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml add_custom_command ( OUTPUT ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/doc COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/doc
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile.xml COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/Doxyfile.xml
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
DEPENDS ${c_headers};${c_sources};${cpp_sources};${cpp_headers} DEPENDS ${c_headers};${c_sources};${cpp_sources};${cpp_headers}
) )
# generate .i from doxygen .xml # generate .i from doxygen .xml
add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i add_custom_command ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/doxy2swig.py -n COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/doxy2swig.py -n
${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i
DEPENDS ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml DEPENDS ${CMAKE_BINARY_DIR}/doc/xml/ftdi_8c.xml
) )
add_custom_target ( doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i ) add_custom_target ( doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ftdi1_doc.i )
add_dependencies( ${SWIG_MODULE_ftdi1_REAL_NAME} doc_i ) add_dependencies( ${SWIG_MODULE_ftdi1_REAL_NAME} doc_i )
endif () endif ()
# add_subdirectory ( examples ) # add_subdirectory ( examples )
else () else ()
message(STATUS "Not building python bindings") message(STATUS "Not building python bindings")
endif(PYTHONLIBS_FOUND) endif(PYTHONLIBS_FOUND)

4
packages/swig/python/setup.py.cmake
View File

@ -1,4 +1,4 @@
from setuptools import setup, Extension from distutils.core import setup, Extension
setup( setup(
name = "yap", name = "yap",
@ -27,4 +27,4 @@ setup(
)], )],
py_modules = ['yap'] py_modules = ['yap']
) )
\ \