:Merge /home/vsc/yap
This commit is contained in:
commit
244d04f90b
@ -89,14 +89,12 @@ set(
|
||||
ex/learning/train.yap
|
||||
)
|
||||
|
||||
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
|
||||
${CLPBN_TOP}
|
||||
|
@ -68,7 +68,7 @@ if (CMAKE_MAJOR_VERSION GREATER 2)
|
||||
|
||||
|
||||
install(TARGETS horus HorusCli
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
RUNTIME DESTINATION ${YAP_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${YAP_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${YAP_INSTALL_LIBDIR}
|
||||
)
|
||||
|
@ -85,7 +85,7 @@ native_sources = ["yap4py/yap_wrap.cxx","yap4py/yapi.cpp"]
|
||||
|
||||
extensions = [Extension('_yap', native_sources,
|
||||
define_macros=[('MAJOR_VERSION', '6'),
|
||||
('MINOR_VERSION', '4'),
|
||||
('MINOR_VERSION', '5'),
|
||||
('_YAP_NOT_INSTALLED_', '1'),
|
||||
('YAP_PYTHON', '1'),
|
||||
('PYTHONSWIG', '1'),
|
||||
@ -115,7 +115,7 @@ package_data = {
|
||||
|
||||
data_files=[]
|
||||
|
||||
version_ns = {'__version__': '6.4.1', 'major-version': '6', 'minor-version': '4', 'patch': '1'}
|
||||
version_ns = {'__version__': '6.5.0', 'major-version': '6', 'minor-version': '5', 'patch': '0'}
|
||||
|
||||
setup_args = dict(
|
||||
name=name,
|
||||
|
@ -29,7 +29,7 @@ live :-
|
||||
( Module==user ->
|
||||
true % '$compile_mode'(_,0)
|
||||
;
|
||||
format(user_error,'[~w]~n', [Module])
|
||||
format(user_error,'[~w]~n', [Module])
|
||||
),
|
||||
'$system_catch'('$enter_top_level',Module,Error,'$Error'(Error)).
|
||||
|
||||
|
@ -72,6 +72,7 @@ d(X, ( X= f(A,A,X)) ).
|
||||
d(X, ( X= f(A,A,g(A))) ).
|
||||
d(X, ( X= f(A,g(X,[A|A]),X)) ).
|
||||
d(X, ( X= f(X,[X,X])) ).
|
||||
d(X, ( X= f(3.14,[22.3,X])) ).
|
||||
d(X, ( X= f(X,[X,g(X)])) ).
|
||||
d(X, ( X= f(_,X/[X])) ).
|
||||
d(X, ( X= f(_,A/[A]), A= f(X,[X,g(X)])) ).
|
||||
|
Reference in New Issue
Block a user