config

config.h.cmake

@@ -1994,11 +1994,21 @@ calls it, or to nothing if 'inline' is not supported under any name.  */
 #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
 #if DEBUG_MALLOC
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #define malloc(sz) my_malloc(sz)
 #define realloc(pt, sz) my_realloc(pt,sz)
 #define free(pt) my_free(pt)

packages/CLPBN/CMakeLists.txt

@@ -90,7 +90,12 @@ set(
   )
 
 IF (WITH_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()
 
 install(FILES

packages/python/CMakeLists.txt

@@ -12,7 +12,7 @@ add_library (libpython SHARED ${PYTHON_SOURCES})
 set (PYTHON_HEADERS
   python.h)
 
-# configure_file ("setup.py.cmake"  "setup.py" )
+configure_file ("setup.py.cmake"  "setup.py" )
 
   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
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
 
+find_python_module( jupyter )
+
+if (PY_JUPYTER)
+
 add_subdirectory(yap_kernel)
 
+endif()
+
 endif (PYTHONLIBS_FOUND)

packages/python/pybips.c

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

packages/python/setup.py.cmake

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

packages/swig/python/CMakeLists.txt

@@ -3,7 +3,11 @@
 
 INCLUDE(${SWIG_USE_FILE})
 
+
 if (PYTHONLIBS_FOUND)
+
+  include(FindPythonModule)  
+  
   INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 
   INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/CXX)
@@ -27,19 +31,20 @@ set_target_properties ( ${SWIG_MODULE_yap_REAL_NAME} PROPERTIES NO_SONAME ON )
   #                   OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
   #                   OUTPUT_STRIP_TRAILING_WHITESPACE )
   # 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
-   #       ${_REL_PYTHON_MODULE_PATH}
-   #     )
+    set ( PYTHON_MODULE_PATH
+      ${_REL_PYTHON_MODULE_PATH}
+      )
 
     set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
 
     add_custom_target ( py2yap ALL
-        COMMAND ${PYTHON_EXECUTABLE} setup.py build -f
+      COMMAND ${PYTHON_EXECUTABLE} setup.py bdist
       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})")
 
 #     INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/yap/_yap.so DESTINATION ${PYTHON_MODULE_PATH} )

packages/swig/python/setup.py.cmake

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