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

dynamic loading

Browse Source
This commit is contained in:
Vitor Santos Costa 2017-11-08 10:29:01 +01:00
parent 9100e797f8
commit 538cb4eb2c
15 changed files with 206 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
C/load_dl.c
View File

@ -1,17 +1,17 @@
/************************************************************************* /*************************************************************************
* * * *
* YAP Prolog * * YAP Prolog *
* * * *
* Yap Prolog was developed at NCCUP - Universidade do Porto * * Yap Prolog was developed at NCCUP - Universidade do Porto *
* * * *
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 * * Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 *
* * * *
************************************************************************** **************************************************************************
* * * *
* File: load_dl.c * * File: load_dl.c *
* comments: dl based dynamic loaderr of external routines * * comments: dl based dynamic loaderr of external routines *
* tested on i486-linuxelf * * tested on i486-linuxelf *
*************************************************************************/ *************************************************************************/
#include "Yap.h" #include "Yap.h"
#include "YapHeap.h" #include "YapHeap.h"
@ -47,7 +47,7 @@ int Yap_CallFunctionByName(const char *thing_string) {
| RTLD_NOLOAD | RTLD_NOLOAD
#endif #endif
#endif #endif
); );
// you could do RTLD_NOW as well. shouldn't matter // you could do RTLD_NOW as well. shouldn't matter
if (!handle) { if (!handle) {
CACHE_REGS CACHE_REGS
@ -64,7 +64,7 @@ int Yap_CallFunctionByName(const char *thing_string) {
/* /*
* YAP_FindExecutable(argv[0]) should be called on yap initialization to * YAP_FindExecutable(argv[0]) should be called on yap initialization to
* locate the executable of Yap * locate the executable of Yap
*/ */
char *Yap_FindExecutable(void) { char *Yap_FindExecutable(void) {
#if HAVE_GETEXECNAME #if HAVE_GETEXECNAME
// Solaris // Solaris
@ -76,7 +76,8 @@ char *Yap_FindExecutable(void) {
if (!_NSGetExecutablePath(buf, &size)) { if (!_NSGetExecutablePath(buf, &size)) {
buf = realloc(buf, size + 1); buf = realloc(buf, size + 1);
return buf; return buf;
} return "yap"; }
return "yap";
#elif defined(__linux__) #elif defined(__linux__)
enum { BUFFERSIZE = 1024 }; enum { BUFFERSIZE = 1024 };
char *buf = malloc(BUFFERSIZE); char *buf = malloc(BUFFERSIZE);
@ -158,78 +159,76 @@ int Yap_CloseForeignFile(void *handle) {
/* /*
* LoadForeign(ofiles,libs,proc_name,init_proc) dynamically loads foreign * LoadForeign(ofiles,libs,proc_name,init_proc) dynamically loads foreign
* code files and libraries and locates an initialization routine * code files and libraries and locates an initialization routine
*/ */
static Int LoadForeign(StringList ofiles, StringList libs, char *proc_name, static Int LoadForeign(StringList ofiles, StringList libs, char *proc_name,
YapInitProc *init_proc) { YapInitProc *init_proc) {
CACHE_REGS CACHE_REGS
LOCAL_ErrorMessage = NULL; LOCAL_ErrorMessage = NULL;
while (libs) { while (libs) {
const char *file = AtomName(libs->name); const char *file = AtomName(libs->name);
if (!Yap_findFile(file, NULL, NULL, LOCAL_FileNameBuf, true, YAP_OBJ, true, true)) { if (!Yap_findFile(file, NULL, NULL, LOCAL_FileNameBuf, true, YAP_OBJ, true,
true)) {
LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE); LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE);
/* use LD_LIBRARY_PATH */ /* use LD_LIBRARY_PATH */
strncpy(LOCAL_ErrorMessage, (char *)AtomName(libs->name), strncpy(LOCAL_ErrorMessage, (char *)AtomName(libs->name),
YAP_FILENAME_MAX); YAP_FILENAME_MAX);
} }
#ifdef __osf__ #ifdef __osf__
if ((libs->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY)) == NULL) if ((libs->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY)) == NULL)
#else #else
if ((libs->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY | RTLD_GLOBAL)) == if ((libs->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY | RTLD_GLOBAL)) ==
NULL) NULL)
#endif #endif
{ {
if (LOCAL_ErrorMessage == NULL) { if (LOCAL_ErrorMessage == NULL) {
LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE); LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE);
strcpy(LOCAL_ErrorMessage, dlerror()); strcpy(LOCAL_ErrorMessage, dlerror());
} } }
}
libs = libs->next; libs = libs->next;
} }
while (ofiles) { while (ofiles) {
void *handle;
/* load libraries first so that their symbols are available to /* load libraries first so that their symbols are available to
other routines */ other routines */
/* dlopen wants to follow the LD_CONFIG_PATH */ /* dlopen wants to follow the LD_CONFIG_PATH */
const char *file = AtomName(ofiles->name); const char *file = AtomName(ofiles->name);
if (!Yap_findFile(file, NULL, NULL, LOCAL_FileNameBuf, true, YAP_OBJ, true, true)) { if (!Yap_findFile(file, NULL, NULL, LOCAL_FileNameBuf, true, YAP_OBJ, true,
true)) {
if (LOCAL_ErrorMessage == NULL) { if (LOCAL_ErrorMessage == NULL) {
LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE); LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE);
strcpy(LOCAL_ErrorMessage, strcpy(LOCAL_ErrorMessage,
"%% Trying to open unexisting file in LoadForeign"); "%% Trying to open unexisting file in LoadForeign");
} }
} }
#ifdef __osf__ #ifdef __osf__
if ((handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY)) == 0) if ((ofiles->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY)) == NULL)
#elseö #else
if ((handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY | RTLD_GLOBAL)) == 0) if ((ofiles->handle = dlopen(LOCAL_FileNameBuf, RTLD_LAZY | RTLD_GLOBAL)) ==
NULL)
#endif #endif
{ {
if (LOCAL_ErrorMessage == NULL) { if (LOCAL_ErrorMessage == NULL) {
LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE); LOCAL_ErrorMessage = malloc(MAX_ERROR_MSG_SIZE);
fprintf(stderr, "dlopen of image %s failed: %s\n", LOCAL_FileNameBuf, fprintf(stderr, "dlopen of image %s failed: %s\n", LOCAL_FileNameBuf,
dlerror()); dlerror());
} }
} }
ofiles->handle = handle; if (ofiles->handle && proc_name && !*init_proc)
*init_proc = (YapInitProc)dlsym(ofiles->handle, proc_name);
if (proc_name && !*init_proc)
*init_proc = (YapInitProc)dlsym(handle, proc_name);
ofiles = ofiles->next; ofiles = ofiles->next;
} }
if (!*init_proc && LOCAL_ErrorMessage == NULL) { if (!*init_proc && LOCAL_ErrorMessage == NULL) {
char *buf = malloc(1058); char *buf = malloc(1058);
snprintf(buf,1058-1, snprintf(buf, 1058 - 1, "Could not locate routine %s in %s: %s\n",
"Could not locate routine %s in %s: %s\n", proc_name, LOCAL_FileNameBuf, dlerror());
proc_name, LOCAL_FileNameBuf, dlerror());
return LOAD_FAILLED; return LOAD_FAILLED;
} }
return LOAD_SUCCEEDED; return LOAD_SUCCEEDED;
} }

2
C/write.c
View File

@ -274,7 +274,7 @@ static void writebig(Term t, int p, int depth, int rinfixarg,
YAP_Opaque_CallOnWrite f; YAP_Opaque_CallOnWrite f;
CELL blob_info; CELL blob_info;
blob_info = big_tag - USER_BLOB_START; blob_info = big_tag;
if (GLOBAL_OpaqueHandlers && if (GLOBAL_OpaqueHandlers &&
(f = GLOBAL_OpaqueHandlers[blob_info].write_handler)) { (f = GLOBAL_OpaqueHandlers[blob_info].write_handler)) {
(f)(wglb->stream->file, big_tag, ExternalBlobFromTerm(t), 0); (f)(wglb->stream->file, big_tag, ExternalBlobFromTerm(t), 0);

53
CMakeLists.txt
View File

@ -2,10 +2,6 @@
# value of 3.4.0 or lower. # value of 3.4.0 or lower.
cmake_minimum_required(VERSION 3.4) cmake_minimum_required(VERSION 3.4)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
# Sets the version of CMake required to build the native # Sets the version of CMake required to build the native
# library. You should either keep the default value or pass a # library. You should either keep the default value or pass a
# value of 3.4.0 or lower. # value of 3.4.0 or lower.
@ -65,7 +61,15 @@ if(NOT COMMAND find_host_program)
endmacro() endmacro()
endif() endif()
option(BUILD_SHARED_LIBS "Build shared library" ON) if (POLICY CMP0003)
cmake_policy(SET CMP0003 NEW)
endif()
if (POLICY CMP0068)
cmake_policy(SET CMP0068 NEW)
endif()
option(BUILD_SHARED_LIBS "Build shared library" ON)
set (CMAKE_POSITION_INDEPENDENT_CODE TRUE) set (CMAKE_POSITION_INDEPENDENT_CODE TRUE)
set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
@ -87,18 +91,18 @@ function(add_to_group list output)
endfunction(add_to_group list output ) endfunction(add_to_group list output )
function(add_to_libgroup el list) function(add_to_libgroup el list)
add_custom_command( TARGET ${el} POST_BUILD # add_custom_command( TARGET ${el} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${el}> ${CMAKE_BINARY_DIR}/packages/python/swig/yap4py # COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${el}> ${CMAKE_BINARY_DIR}/packages/python/swig/yap4py
DEPENDS ${el} ) # DEPENDS ${el} )
list( APPEND ${list} ${${el}}) list( APPEND ${list} ${${el}})
set (${list} ${${list}} CACHE INTERNAL "prolog dll files") set (${list} ${${list}} CACHE INTERNAL "prolog dll files")
endfunction(add_to_libgroup el list ) endfunction(add_to_libgroup el list )
function(add_to_corelibgroup el list) function(add_to_corelibgroup el list)
add_custom_command( TARGET ${el} POST_BUILD # add_custom_command( TARGET ${el} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${el}> $<TARGET_SONAME_FILE:${el}> $<TARGET_LINKER_FILE:${el}> ${CMAKE_BINARY_DIR}/packages/python/swig/yap4py # COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${el}> $<TARGET_SONAME_FILE:${el}> $<TARGET_LINKER_FILE:${el}> ${CMAKE_BINARY_DIR}/packages/python/swig/yap4py
DEPENDS ${el} ) # DEPENDS ${el} )
list( APPEND ${list} ${${el}}) list( APPEND ${list} ${${el}})
set (${list} ${${list}} CACHE INTERNAL "prolog dll files") set (${list} ${${list}} CACHE INTERNAL "prolog dll files")
endfunction(add_to_corelibgroup el list ) endfunction(add_to_corelibgroup el list )
@ -205,8 +209,11 @@ include(disallow)
disallow_intree_builds() disallow_intree_builds()
# set(CMAKE_BUILD_TYPE Debug) # set(CMAKE_BUILD_TYPE Debug)
set (ANACONDA $ENV{CONDA_PY})
if (APPLE) if (ANACONDA)
elseif (APPLE)
set (MACOSX_RPATH ON) set (MACOSX_RPATH ON)
set (PATH $ENV{PATH}) set (PATH $ENV{PATH})
list (FIND ${PATH} pos /usr/local) list (FIND ${PATH} pos /usr/local)
@ -223,7 +230,8 @@ if (APPLE)
/usr/local/opt/readline /usr/local/opt/readline
/usr/local/opt/swig /usr/local/opt/swig
) )
endif (APPLE ) endif ( )
if(ANDROID) if(ANDROID)
set ( datarootdir /assets ) set ( datarootdir /assets )
endif() endif()
@ -521,24 +529,23 @@ set_property(DIRECTORY PROPERTY CXX_STANDARD 11)
# rpath stuff, hopefully it works # rpath stuff, hopefully it works
# use, i.e. don't skip the full RPATH for the build tree # use, i.e. don't skip the full RPATH for the build tree
SET(CMAKE_SKIP_BUILD_RPATH FALSE) # SET(CMAKE_SKIP_BUILD_RPATH FALSE)
# when building, don't use the install RPATH already # when building, don't use the install RPATH already
# (but later on when installing) # (but later on when installing)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
SET(CMAKE_INSTALL_RPATH "${libdir}") # SET(CMAKE_INSTALL_RPATH ${CMAKE_CURRENT_BUILD_PATH})
# add the automatically determined parts of the RPATH # add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH # which point to directories outside the build tree to the install RPATH
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
# the RPATH to be used when installing, but only if it's not a system directory # the RPATH to be used when installing, but only if it's not a system directory#LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${libdir}" isSystemDir)
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${libdir}" isSystemDir) # IF("${isSystemDir}" STREQUAL "-1")
IF("${isSystemDir}" STREQUAL "-1") # SET(CMAKE_INSTALL_RPATH "${libdir}")
SET(CMAKE_INSTALL_RPATH "${libdir}") # ENDIF("${isSystemDir}" STREQUAL "-1")
ENDIF("${isSystemDir}" STREQUAL "-1")
include_directories (H include_directories (H
H/generated H/generated
@ -595,7 +602,7 @@ set_target_properties(libYap
PROPERTIES OUTPUT_NAME Yap PROPERTIES OUTPUT_NAME Yap
) )
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages/python/swig/yap4py) # file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages/python/swig/yap4py)
if (PYTHONLIBS_FOUND AND SWIG_FOUND) if (PYTHONLIBS_FOUND AND SWIG_FOUND)
add_subdirectory(packages/python/swig) add_subdirectory(packages/python/swig)

3
H/trim_trail.h
View File

@ -1,3 +1,4 @@
#ifdef FROZEN_STACKS #ifdef FROZEN_STACKS
{ {
tr_fr_ptr pt0, pt1, pbase, ptop; tr_fr_ptr pt0, pt1, pbase, ptop;
@ -31,7 +32,7 @@
Term t = HeadOfTerm(d1); Term t = HeadOfTerm(d1);
Functor f = FunctorOfTerm(t); Functor f = FunctorOfTerm(t);
if (f == FunctorBigInt) { if (f == FunctorBigInt) {
Int tag = Yap_blob_tag(t) - USER_BLOB_START; Int tag = Yap_blob_tag(t);
GLOBAL_OpaqueHandlers[tag].cut_handler(d1); GLOBAL_OpaqueHandlers[tag].cut_handler(d1);
} else { } else {
pt0--; pt0--;

5
cmake/Config.cmake
View File

@ -248,7 +248,10 @@ check_function_exists(iswblank HAVE_ISWBLANK)
check_function_exists(iswspace HAVE_ISWSPACE) check_function_exists(iswspace HAVE_ISWSPACE)
check_symbol_exists(flsl <string.h> HAVE_FLSL) check_symbol_exists(flsl <string.h> HAVE_FLSL)
check_symbol_exists(flsll <string.h> HAVE_FLSLL) check_symbol_exists(flsll <string.h> HAVE_FLSLL)
check_function_exists(fmemopen HAVE_FMEMOPEN) if (NOT APPLE)
# only recently available
check_function_exists(fmemopen HAVE_FMEMOPEN)
endif()
check_function_exists(fpclass HAVE_FPCLASS) check_function_exists(fpclass HAVE_FPCLASS)
check_function_exists(fpurge HAVE_FPURGE) check_function_exists(fpurge HAVE_FPURGE)
check_function_exists(ftime HAVE_FTIME) check_function_exists(ftime HAVE_FTIME)

19
library/dialect/swi/fli/swi.c
View File

@ -214,24 +214,27 @@ X_API int PL_get_nchars(term_t l, size_t *lengthp, char **s, unsigned flags) {
} else { } else {
out.enc = ENC_ISO_LATIN1; out.enc = ENC_ISO_LATIN1;
} }
out.val.c = NULL; out.val.c = NULL;
if (!Yap_CVT_Text(&inp, &out PASS_REGS)) { if (!Yap_CVT_Text(&inp, &out PASS_REGS)) {
pop_text_stack(lvl); pop_text_stack(lvl);
return false; return false;
} }
if (s) { if (s) {
size_t len = strlen(out.val.c); size_t len = strlen(out.val.c);
if (flags & (BUF_DISCARDABLE|BUF_RING)) { if (flags & (BUF_DISCARDABLE | BUF_RING)) {
pop_text_stack(lvl);
return true; return true;
} }
*s = pop_output_text_stack(lvl, out.val.c);
if (*s == out.val.c) { if (*s == out.val.c) {
char *v = malloc(len+1); pop_text_stack(lvl);
strcpy(v, *s); } else if (*s == NULL) {
*s = v; *s = pop_output_text_stack(lvl, out.val.c);
} else {
strcpy(*s, out.val.c);
pop_text_stack(lvl);
} }
if (lengthp) if (lengthp)
*lengthp = len; *lengthp = len;
} }
return true; return true;
} }

4
packages/bdd/simplecudd_lfi/simplecudd.c
View File

@ -916,7 +916,7 @@ namedvars InitNamedVars(int varcnt, int varstart) {
int i; int i;
temp.varcnt = varcnt; temp.varcnt = varcnt;
temp.varstart = varstart; temp.varstart = varstart;
temp.vars = (const char **)malloc(sizeof(char *) * varcnt); temp.vars = (char **)malloc(sizeof(char *) * varcnt);
temp.loaded = (int *)malloc(sizeof(int) * varcnt); temp.loaded = (int *)malloc(sizeof(int) * varcnt);
temp.dvalue = (double *)malloc(sizeof(double) * varcnt); temp.dvalue = (double *)malloc(sizeof(double) * varcnt);
temp.ivalue = (int *)malloc(sizeof(int) * varcnt); temp.ivalue = (int *)malloc(sizeof(int) * varcnt);
@ -933,7 +933,7 @@ namedvars InitNamedVars(int varcnt, int varstart) {
void EnlargeNamedVars(namedvars *varmap, int newvarcnt) { void EnlargeNamedVars(namedvars *varmap, int newvarcnt) {
int i; int i;
varmap->vars = (const char **)realloc(varmap->vars, sizeof(const char *) * newvarcnt); varmap->vars = (char **)realloc(varmap->vars, sizeof(const char *) * newvarcnt);
varmap->loaded = (int *)realloc(varmap->loaded, sizeof(int) * newvarcnt); varmap->loaded = (int *)realloc(varmap->loaded, sizeof(int) * newvarcnt);
varmap->dvalue = varmap->dvalue =
(double *)realloc(varmap->dvalue, sizeof(double) * newvarcnt); (double *)realloc(varmap->dvalue, sizeof(double) * newvarcnt);

6
packages/bdd/trie_sp.yap
View File

@ -95,9 +95,9 @@ tabled_complex_to_andor(IN, Map, Map, Tab, Tab, 1) :-
IN = !. IN = !.
tabled_complex_to_andor([Els], Map0, MapF, Tab0, TabF, V) :- tabled_complex_to_andor([Els], Map0, MapF, Tab0, TabF, V) :-
tabled_complex_to_and(Els, Map0, MapF, Tab0, TabF, V). tabled_complex_to_and(Els, Map0, MapF, Tab0, TabF, V).
tabled_complex_to_andor([El1,Dl2], Map0, MapF, Tab0, TabF, or(T1,T2)) :- tabled_complex_to_andor([El1,El2|Els], Map0, MapF, Tab0, TabF, or(T1,T2)) :-
tabled_complex_to_and(El1, Map0, MapI, Tab1, TabI, T1), tabled_complex_to_and(El1, Map0, MapI, Tab0, TabI, T1),
tabled_complex_to_andor(El2.Els, MapI, MapF, TabI, TabF, T2). tabled_complex_to_andor([El2|Els], MapI, MapF, TabI, TabF, T2).
tabled_complex_to_and(int(A1,[endlist]), Map0, MapF, Tab, Tab, V) :- !, tabled_complex_to_and(int(A1,[endlist]), Map0, MapF, Tab, Tab, V) :- !,
check(Map0, A1, V, MapF). check(Map0, A1, V, MapF).

21
packages/python/CMakeLists.txt
View File

@ -15,13 +15,10 @@ add_lib(YAPPython pyload.c ${PYTHON_HEADERS} )
if (WIN32) if (WIN32)
add_library (Py4YAP OBJECT ${PYTHON_SOURCES} ${PYTHON_HEADERS}) add_library (Py4YAP OBJECT ${PYTHON_SOURCES} ${PYTHON_HEADERS})
else() else()
add_corelib(Py4YAP ${PYTHON_SOURCES} ${PYTHON_HEADERS}) add_library(Py4YAP SHARED ${PYTHON_SOURCES} ${PYTHON_HEADERS})
MY_set_target_properties( set_target_properties(
Py4YAP Py4YAP
PROPERTIES VERSION ${YAP_FULL_VERSION} PROPERTIES VERSION ${YAP_FULL_VERSION}
SOVERSION ${YAP_MAJOR_VERSION}.${YAP_MINOR_VERSION} SOVERSION ${YAP_MAJOR_VERSION}.${YAP_MINOR_VERSION}
@ -31,6 +28,20 @@ target_link_libraries(Py4YAP libYap ${PYTHON_LIBRARIES})
# arithmetic hassle. # arithmetic hassle.
install(TARGETS Py4YAP
RUNTIME DESTINATION ${bindir}
LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${libdir}
)
install(TARGETS YAPPython
LIBRARY DESTINATION ${dlls}
RUNTIME DESTINATION ${dlls}
ARCHIVE DESTINATION ${dlls} )
target_link_libraries( YAPPython Py4YAP ) target_link_libraries( YAPPython Py4YAP )
endif() endif()

28
packages/python/pypreds.c
View File

@ -81,19 +81,17 @@ static foreign_t python_is(term_t tobj, term_t tf) {
pyErrorAndReturn(rc, false); pyErrorAndReturn(rc, false);
} }
static foreign_t python_proc(term_t tobj) { static foreign_t python_proc(term_t tobj) {
PyObject *o; PyObject *o;
term_t lim = python_acquire_GIL(); term_t lim = python_acquire_GIL();
o = term_to_python(tobj, true, NULL, true); o = term_to_python(tobj, true, NULL, true);
python_release_GIL(lim); python_release_GIL(lim);
bool rc = o != NULL; bool rc = o != NULL;
pyErrorAndReturn(rc , false); pyErrorAndReturn(rc, false);
} }
static foreign_t python_slice(term_t parent, term_t indx, term_t tobj) { static foreign_t python_slice(term_t parent, term_t indx, term_t tobj) {
PyObject *pF, *pI; PyObject *pF, *pI;
@ -203,7 +201,7 @@ static foreign_t python_apply(term_t tin, term_t targs, term_t keywds,
} }
static foreign_t assign_python(term_t exp, term_t name) { static foreign_t assign_python(term_t exp, term_t name) {
term_t stackp = python_acquire_GIL(); term_t stackp = python_acquire_GIL();
PyObject *e = term_to_python(exp, true, NULL, true); PyObject *e = term_to_python(exp, true, NULL, true);
if (e == NULL) { if (e == NULL) {
@ -211,11 +209,10 @@ term_t stackp = python_acquire_GIL();
pyErrorAndReturn(false, false); pyErrorAndReturn(false, false);
} }
bool b = python_assign(name, e, NULL); bool b = python_assign(name, e, NULL);
python_release_GIL(stackp); python_release_GIL(stackp);
pyErrorAndReturn(b, false); pyErrorAndReturn(b, false);
} }
static foreign_t python_builtin_eval(term_t caller, term_t dict, term_t out) { static foreign_t python_builtin_eval(term_t caller, term_t dict, term_t out) {
PyErr_Clear(); PyErr_Clear();
PyObject *pI, *pArgs, *pOut; PyObject *pI, *pArgs, *pOut;
@ -525,7 +522,6 @@ static foreign_t python_export(term_t t, term_t pl) {
pyErrorAndReturn(rc, false); pyErrorAndReturn(rc, false);
} }
/** /**
* @pred python_import(MName, Mod) * @pred python_import(MName, Mod)
* Import a python module to the YAP environment. * Import a python module to the YAP environment.
@ -538,18 +534,18 @@ static foreign_t python_export(term_t t, term_t pl) {
static int python_import(term_t mname, term_t mod) { static int python_import(term_t mname, term_t mod) {
PyObject *pName; PyObject *pName;
term_t t0 = python_acquire_GIL(); term_t t0 = python_acquire_GIL();
term_t arg = PL_new_term_ref(); term_t arg = PL_new_term_ref();
char s0[MAXPATHLEN], *s = s0; char s0[MAXPATHLEN], *s = s0;
while (true) { while (true) {
size_t len; size_t len;
PyErr_Clear();
len = (MAXPATHLEN - 1) - (s - s0); len = (MAXPATHLEN - 1) - (s - s0);
if (PL_is_pair(mname)) { if (PL_is_pair(mname)) {
char *sa = NULL; char *sa = NULL;
if (!PL_get_arg(1, mname, arg) || !PL_get_atom_chars(arg, &sa) || if (!PL_get_arg(1, mname, arg) || !PL_get_atom_chars(arg, &sa) ||
!PL_get_arg(2, mname, mname)) { !PL_get_arg(2, mname, mname)) {
python_release_GIL(t0); python_release_GIL(t0);
pyErrorAndReturn(false, false); pyErrorAndReturn(false, false);
} }
PL_get_atom_chars(arg, &sa); PL_get_atom_chars(arg, &sa);
@ -570,8 +566,8 @@ term_t t0 = python_acquire_GIL();
#else #else
pName = PyUnicode_FromString(s0); pName = PyUnicode_FromString(s0);
#endif #endif
python_release_GIL(t0); python_release_GIL(t0);
if (pName == NULL) { if (pName == NULL) {
pyErrorAndReturn(false, false); pyErrorAndReturn(false, false);
} }
@ -652,9 +648,9 @@ term_t python_acquire_GIL(void) {
bool python_release_GIL(term_t curBlock) { bool python_release_GIL(term_t curBlock) {
PyErr_Clear(); PyErr_Clear();
PL_reset_term_refs(curBlock); PL_reset_term_refs(curBlock);
if (_threaded) { if (_threaded) {
PyGILState_Release(gstate); PyGILState_Release(gstate);
} }
pyErrorAndReturn(true, false); pyErrorAndReturn(true, false);
} }

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

@ -1,12 +1,6 @@
# This is a CMake example for Python # This is a CMake example for Python
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/yap4py)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/yap4py/include)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/yap4py/prolog)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/yap4py/prolog/os)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/yap4py/prolog/pl)
INCLUDE(UseSWIG) INCLUDE(UseSWIG)
include(FindPythonModule) include(FindPythonModule)
@ -16,10 +10,11 @@ set (PYTHON_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/yap4py/yapi.py ${CMAKE_CURRENT_S
SET_SOURCE_FILES_PROPERTIES(../../swig/yap.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(../../swig/yap.i PROPERTIES CPLUSPLUS ON)
SET_SOURCE_FILES_PROPERTIES(../../swig/yap.i PROPERTIES SWIG_FLAGS "-O;-py3") SET_SOURCE_FILES_PROPERTIES(../../swig/yap.i PROPERTIES SWIG_FLAGS "-O;-py3")
SET_SOURCE_FILES_PROPERTIES(../../swiyap.i PROPERTIES SWIG_MODULE_NAME yap) SET_SOURCE_FILES_PROPERTIES(../../swiyap.i PROPERTIES SWIG_MODULE_NAME yap4py.yap)
#SET_SOURCE_FILES_PROPERTIES(../../swi/yap.i PROPERTIES OUTPUT_NAME yap) #SET_SOURCE_FILES_PROPERTIES(../../swi/yap.i PROPERTIES OUTPUT_NAME yap)
set(YAP4PY_PL prolog/jupyter.yap prolog/yapi.yap)
configure_file("setup.py.in" ${CMAKE_CURRENT_BINARY_DIR}/setup.py) configure_file("setup.py.in" ${CMAKE_CURRENT_BINARY_DIR}/setup.py)
configure_file("MANIFEST.in" ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.in) configure_file("MANIFEST.in" ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.in)
@ -32,21 +27,6 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR}/yap4py/i
SWIG_ADD_LIBRARY(Py2YAP LANGUAGE python SHARED SOURCES ../../swig/yap.i )
if (WIN32)
SWIG_LINK_LIBRARIES(Py2YAP YAPPython libYap ${PYTHON_LIBRARIES} )
else()
SWIG_LINK_LIBRARIES( Py2YAP libYap YAP++ YAPPython ${PYTHON_LIBRARIES} )
endif()
set_target_properties ( ${SWIG_MODULE_Py2YAP_REAL_NAME}
PROPERTIES
NO_SONAME ON
OUTPUT_NAME yap
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS YAPPython
)
SET(SWIG_SOURCES SET(SWIG_SOURCES
${CMAKE_SOURCE_DIR}/packages/swig/yap.i ${CMAKE_SOURCE_DIR}/packages/swig/yap.i
@ -64,41 +44,6 @@ else()
add_custom_command( OUTPUT yap.i
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/packages/swig/yap.i .
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/packages/swig/yap.i )
add_custom_command( OUTPUT yapi.cpp
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/CXX/yapi.cpp .
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/CXX/yapi.cpp )
add_custom_command( OUTPUT yap4py/prolog/lists.yap
COMMAND ${CMAKE_COMMAND} -E copy ${pl_library} yap4py/prolog
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${pl_library} )
add_custom_command( OUTPUT yap4py/prolog/os/yio.yap
COMMAND ${CMAKE_COMMAND} -E copy ${pl_os_library} yap4py/prolog/os
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${pl_os_library} )
add_custom_command( OUTPUT yap4py/prolog/pl/boot.yap
COMMAND ${CMAKE_COMMAND} -E copy ${pl_boot_library} yap4py/prolog/pl
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${pl_boot_library} )
add_custom_command( OUTPUT yap4py/include/YapInterface.h
COMMAND ${CMAKE_COMMAND} -E copy ${c_headers} yap4py/include
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${c_headers} )
add_custom_command( OUTPUT yap4py/include/yapi.hh
COMMAND ${CMAKE_COMMAND} -E copy ${cxx_headers} yap4py/include
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${cxx_headers} )
if (CONDA) if (CONDA)
set(bdist bdist_conda) set(bdist bdist_conda)
else() else()
@ -107,32 +52,25 @@ endif()
add_custom_target( YAP4PY ALL add_custom_target( YAP4PY ALL
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/startup.yss ${CMAKE_CURRENT_BINARY_DIR}/yap4py COMMAND ${CMAKE_COMMAND} -E remove_directory yap4py
COMMAND ${CMAKE_COMMAND} -E copy ${CONFIGURATION_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/yap4py/include COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/yap4py yap4py
COMMAND ${SWIG_EXECUTABLE} -c++ -python -O -py3 -module "yap" -outcurrentdir -addextern -Iyap4py/include -outdir ${CMAKE_CURRENT_BINARY_DIR} -I${GMP_INCLUDE_DIRS} -DX_API="" -o yapPyTHON_wrap.cxx ${SWIG_SOURCES} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/CXX/yapi.cpp yap4py
COMMAND ${SWIG_EXECUTABLE} -c++ -python -O -py3 -module "yap" -addextern -I${CMAKE_SOURCE_DIR}/H -I${CMAKE_SOURCE_DIR}/H/generated -I${CMAKE_SOURCE_DIR}/include -I${CMAKE_SOURCE_DIR}/OPTYap -I${CMAKE_SOURCE_DIR}/os -I${CMAKE_SOURCE_DIR}/utf8proc -I.././.. -I${CMAKE_SOURCE_DIR}/CXX -I${CMAKE_SOURCE_DIR}/packages/python -outdir ${CMAKE_CURRENT_BINARY_DIR}/yap4py -I${GMP_INCLUDE_DIRS} -DX_API="" -o yap4py/yap_wrap.cxx -oh yap4py/yap_wrap.hh ${SWIG_SOURCES}
COMMAND ${PYTHON_EXECUTABLE} setup.py sdist ${bdist} COMMAND ${PYTHON_EXECUTABLE} setup.py sdist ${bdist}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${YAP_DLLS} STARTUP yap4py/prolog/pl/boot.yap yapi.cpp yap4py/include/yapi.hh yap4py/include/YapInterface.h yap4py/prolog/os/yio.yap yap4py/prolog/lists.yap yap.i DEPENDS ${SWIG_SOURCES} Py4YAP YAP++
) )
function(f_copy filename output ) install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --ignore-installed .
get_filename_component(base ${filename} NAME_WE) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})"
set(outfile ${output}/${base})
file (COPY ${filename} DESTiNATION ${output})
add_custom_command(
OUTPUT ${outfile}
COMMAND ${CMAKE_COMMAND} -E COPY ${filename} ${outfile}
DEPENDS ${filename}
)
set_source_files_properties(${outfile} PROPERTIES GENERATED TRUE)
endfunction()
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install .
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})"
DEPENDS Py4YAP ${CMAKE_BINARY_DIR}/${YAP_STARTUP} ${dlls} ) DEPENDS Py4YAP ${CMAKE_BINARY_DIR}/${YAP_STARTUP} ${dlls} )
install(FILES ${YAP4PY_PL} DESTINATION ${libpl} )
add_to_group( YAP4PY_PL pl_library )
if (WITH_DOCS AND DOXYGEN_FOUND) if (WITH_DOCS AND DOXYGEN_FOUND)
set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND}) set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})

15
packages/python/swig/prolog/yapi.yap
View File

@ -23,6 +23,8 @@
:- python_import(yap4py.yapi). :- python_import(yap4py.yapi).
%:- start_low_level_trace.
%% @pred yapi_query( + VarList, - Dictionary) %% @pred yapi_query( + VarList, - Dictionary)
%% %%
%% dictionary, Examples %% dictionary, Examples
@ -32,18 +34,25 @@
show_answer(VarNames, Dict), show_answer(VarNames, Dict),
Self.bindings := Dict. Self.bindings := Dict.
:- initialization set_preds.
%:- initialization set_preds.
set_preds :- set_preds :-
current_predicate(P, Q), current_predicate(P, Q),
functor(Q,P,A), functor(Q,P,A),
atom_string(P,S), atom_string(P,S),
:= yap4py.yapi.named( S, A), catch(
:= yap4py.yapi.named( S, A),
_,
fail),
fail. fail.
set_preds :- set_preds :-
system_predicate(P/A), system_predicate(P/A),
atom_string(P,S), atom_string(P,S),
:= yap4py.yapi.named( S, A), catch(
:= yap4py.yapi.named( S, A),
_,
fail),
fail. fail.
set_preds. set_preds.

34
packages/python/swig/setup.py.in
View File

@ -61,17 +61,17 @@ sys.path.insert(0, "${CMAKE_CURRENT_SOURCE_DIR}")
if platform.system() == 'Windows': if platform.system() == 'Windows':
local_libs = [] local_libs = []
win_libs = ['wsock32','ws2_32'] win_libs = ['wsock32','ws2_32']
my_extra_link_args = ['-Wl,-export-all-symbols'] my_extra_link_args = ['-Wl,-export-all-symbols']
else: else:
#if platform.system() == 'Darwin': #if platform.system() == 'Darwin':
my_extra_link_args = ['-Wl,-rpath','-Wl,@loader_path/../../..'] my_extra_link_args = ['-Wl,-rpath','-Wl,@loader_path']
win_libs = [] win_libs = []
local_libs = ['Py4YAP'] local_libs = ['Py4YAP']
# or dll in glob('yap/dlls/*'): # or dll in glob('yap/dlls/*'):
# move( dll ,'lib' ) # move( dll ,'lib' )
native_sources = ["yapPYTHON_wrap.cxx",'yapi.cpp'] native_sources = ["yap4py/yap_wrap.cxx","yap4py/yapi.cpp"]
#gmp_dir = path.abspath(path.dirname("${GMP_LIBRARIES}")) #gmp_dir = path.abspath(path.dirname("${GMP_LIBRARIES}"))
#python_libdir = path.abspath(path.dirname("${PYTHON_LIBRARIES}") #python_libdir = path.abspath(path.dirname("${PYTHON_LIBRARIES}")
@ -79,7 +79,7 @@ native_sources = ["yapPYTHON_wrap.cxx",'yapi.cpp']
extensions = [Extension('_yap', native_sources, extensions = [Extension('yap4py._yap', native_sources,
define_macros=[('MAJOR_VERSION', '1'), define_macros=[('MAJOR_VERSION', '1'),
('MINOR_VERSION', '0'), ('MINOR_VERSION', '0'),
('_YAP_NOT_INSTALLED_', '1'), ('_YAP_NOT_INSTALLED_', '1'),
@ -91,20 +91,24 @@ extensions = [Extension('_yap', native_sources,
'-DX_API', '-Iyap4py/include' ], '-DX_API', '-Iyap4py/include' ],
library_dirs=[".",'../../..'], library_dirs=[".",'../../..'],
extra_link_args=my_extra_link_args, extra_link_args=my_extra_link_args,
libraries=['Yap','Py4YAP','gmp']+win_libs+local_libs, libraries=['Yap','gmp']+win_libs+local_libs,
include_dirs=['yap4py/include'] include_dirs=['${CMAKE_SOURCE_DIR}/H',
'${CMAKE_SOURCE_DIR}/H/generated',
'${CMAKE_SOURCE_DIR}/include',
'${CMAKE_SOURCE_DIR}/OPTYap',
'${CMAKE_SOURCE_DIR}/os',
'${CMAKE_SOURCE_DIR}/utf8proc',
'${CMAKE_SOURCE_DIR}/packages/python',
'../../..',
'${CMAKE_SOURCE_DIR}/CXX' ]
)] )]
packages = setuptools.find_packages('${CMAKE_CURRENT_SOURCE_DIR}')
package_data = { package_data = {
'yap4py/prolog': 'prolog/*.*', #'': '*.*'
'': '*.*'
} }
data_files=[('../..', glob('lib*.*'))] data_files=[]
version_ns = {'__version__': '6.3.5', 'minor-version': '6', 'minor-version': '3', 'patch': '5'} version_ns = {'__version__': '6.3.5', 'minor-version': '6', 'minor-version': '3', 'patch': '5'}
@ -112,10 +116,10 @@ setup_args = dict(
name=name, name=name,
version=version_ns['__version__'], version=version_ns['__version__'],
scripts=glob(join('scripts', '*')), scripts=glob(join('scripts', '*')),
packages=packages, packages=['yap4py'],
ext_modules=extensions, ext_modules=extensions,
py_modules=['yap','yap4py.yapi'], py_modules=[],
package_data=package_data, # package_data=package_data,
include_package_data=True, include_package_data=True,
data_files = data_files, data_files = data_files,
# requirements=[ # requirements=[

14
packages/python/swig/yap4py/__init__.py
View File

@ -6,8 +6,8 @@ import os.path
import platform import platform
import sys import sys
global yap_lib_path # global yap_lib_path
yap_lib_path = os.path.dirname(__file__) #yap_lib_path = os.path.dirname(__file__)
if platform.system() == 'Windows': if platform.system() == 'Windows':
def load( dll ): def load( dll ):
@ -15,10 +15,10 @@ if platform.system() == 'Windows':
dll = os.path.abspath(dll) dll = os.path.abspath(dll)
ctypes.WinDLL(dll) ctypes.WinDLL(dll)
load('libYap*') load('libYap*')
else: # else:
def load( dll ): # def load( dll ):
dll = glob.glob(os.path.join(yap_lib_path,dll))[0] # dll = glob.glob(os.path.join(yap_lib_path,dll))[0]
dll = os.path.abspath(dll) # dll = os.path.abspath(dll)
ctypes.CDLL(dll, mode=ctypes.RTLD_GLOBAL) # ctypes.CDLL(dll, mode=ctypes.RTLD_GLOBAL)
# load('libYap*') # load('libYap*')
# load('libPy4YAP*') # load('libPy4YAP*')

39
packages/python/swig/yap4py/yapi.py
View File

@ -6,18 +6,20 @@ import keyword
# import pdb # import pdb
from collections import namedtuple from collections import namedtuple
from yap import * from .yap import *
class Engine( YAPEngine ): class Engine( YAPEngine ):
def __init__(self, args=None,**kwargs): def __init__(self, args=None,**kwargs):
# type: (object) -> object # type: (object) -> object
self.contained = False
if not args: if not args:
args = EngineArgs(**kwargs) args = EngineArgs(**kwargs)
yap_lib_path = os.path.dirname(__file__) if self.contained:
args.setYapShareDir(os.path.join(yap_lib_path,"prolog")) yap_lib_path = os.path.dirname(__file__)
args.setYapLibDir(yap_lib_path) args.setYapShareDir(os.path.join(yap_lib_path,"prolog"))
args.setSavedState(os.path.join(yap_lib_path,"startup.yss")) args.setYapLibDir(yap_lib_path)
args.setSavedState(os.path.join(yap_lib_path,"startup.yss"))
YAPEngine.__init__(self,args) YAPEngine.__init__(self,args)
self.goal( set_prolog_flag('verbose', 'silent' ) ) self.goal( set_prolog_flag('verbose', 'silent' ) )
self.goal( use_module(library('yapi') ) ) self.goal( use_module(library('yapi') ) )
@ -84,19 +86,10 @@ class PrologTableIter:
self.q = None self.q = None
raise StopIteration() raise StopIteration()
f2p = [] f2p = {"fails":{}}
for i in range(16): for i in range(16):
f2p += [{}] f2p[i] ={}
def named( name, arity):
if arity > 0 and name.isidentifier() and not keyword.iskeyword(name):
s = []
for i in range(arity):
s += ["A" + str(i)]
f2p[arity][name] = namedtuple(name, s)
class PrologPredicate( YAPPrologPredicate ):
""" Interface to Prolog Predicate"""
@ -115,6 +108,20 @@ yapi_query = namedtuple( 'yapi_query', 'vars dict')
show_answer = namedtuple( 'show_answer', 'vars dict') show_answer = namedtuple( 'show_answer', 'vars dict')
set_prolog_flag = namedtuple('set_prolog_flag', 'flag new_value') set_prolog_flag = namedtuple('set_prolog_flag', 'flag new_value')
def named( name, arity):
try:
if arity > 0 and name.isidentifier() and not keyword.iskeyword(name):
s = []
for i in range(arity):
s += ["A" + str(i)]
f2p[arity][name] = namedtuple(name, s)
except:
f2p[fails][name] = True
class PrologPredicate( YAPPrologPredicate ):
""" Interface to Prolog Predicate"""
class v(YAPVarTerm): class v(YAPVarTerm):
def __init__(self): def __init__(self):
super().__init__() super().__init__()