saved states and anaconda

This commit is contained in:
Vitor Santos Costa
2017-11-15 12:18:19 +00:00
parent 450d7a2bdd
commit ed2c85a56b
22 changed files with 230 additions and 150 deletions

View File

@@ -64,7 +64,7 @@ if (CMAKE_MAJOR_VERSION GREATER 2)
set_target_properties (HorusCli PROPERTIES OUTPUT_NAME hcli CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
target_link_libraries(HorusCli horus )
target_link_libraries(HorusCli m horus )
install(TARGETS horus HorusCli

View File

@@ -35,11 +35,13 @@ IF (CUDD_FOUND)
if(DEFINED YAP_MAJOR_VERSION)
TARGET_LINK_LIBRARIES(cudd
${CUDD_LIBRARIES}
m
libYap
)
else()
TARGET_LINK_LIBRARIES(cudd
${CUDD_LIBRARIES}
m
${YAP_LIBRARY}
)
endif()

View File

@@ -14,7 +14,8 @@ set_target_properties (Problogbdd PROPERTIES
)
target_link_libraries(Problogbdd
${CUDD_LIBRARIES}
${CUDD_LIBRARIES}
m
libYap
)

View File

@@ -18,7 +18,8 @@ set_target_properties (Problogbdd-Lfi PROPERTIES
)
target_link_libraries(Problogbdd-Lfi
${CUDD_LIBRARIES}
${CUDD_LIBRARIES}
m
libYap
)

View File

@@ -139,6 +139,7 @@ IF (CUDD_FOUND)
TARGET_LINK_LIBRARIES(bddem
${CUDD_LIBRARIES}
libYap
m
)
set_target_properties (bddem PROPERTIES

View File

@@ -15,6 +15,7 @@ set_target_properties (LPADbdd PROPERTIES
)
target_link_libraries(LPADbdd
m
${CUDD_LIBRARIES}
libYap
)

View File

@@ -16,7 +16,7 @@ SET_SOURCE_FILES_PROPERTIES(../../swiyap.i PROPERTIES SWIG_MODULE_NAME yap4py.ya
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/yap4py)
set(YAP4PY_PL prolog/jupyter.yap prolog/yapi.yap)
set(YAP4PY_PL prolog/yapi.yap)
set(YAP4PY_PY yap4py/__init__.py yap4py/__main__.py yap4py/yapi.py)
configure_file("setup.py.in" setup.py)

View File

@@ -4,9 +4,22 @@
YAP_KERNEL.md
)
set (PL_SOURCES
yap_ipython/prolog/jupyter.yap
)
set (PYTHON_SOURCES
yap_ipython/core/getipython.py
yap_ipython/core/__init__.py
yap_ipython/core/interactiveshell.py
yap_ipython/core/modulefind.py
yap_ipython/core/oinspect.py
yap_ipython/core/release.py
yap_ipython/core/shellapp.py
yap_ipython/display.py
yap_ipython/__init__.py
yap_ipython/shellapp.py
yap_kernel_launcher.py
data_kernelspec/kernel.json
yap_kernel/__init__.py
yap_kernel/__main__.py
yap_kernel/_version.py
@@ -69,5 +82,5 @@
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install --ignore-installed --no-deps .
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
# install(FILES jupyter.yap
# DESTINATION ${libpl} )
install(FILES ${PL_FILES} DESTINATION ${libpl} )

View File

@@ -106,9 +106,8 @@ class YAPInteractive(InteractiveShell):
super(YAPInteractive, self).__init__(**kwargs)
# type: (object, object) -> object
pjoin = os.path.join
here = os.path.dirname(__file__)
self.yapeng = yap4py.yapi.Engine()
self.yapeng.goal(use_module(pjoin(here, '../prolog/jupyter.yap')))
self.yapeng.goal(use_module(library("jupyter")))
self.q = None
self.run = False
self.os = ""