diff --git a/examples/python_interface_example.ipynb b/examples/python_interface_example.ipynb index 54928865c06501708f86059370a2137d1be00cd9..a35d63e1c9d4092f6c2be2cc799eff7349d9c442 100644 --- a/examples/python_interface_example.ipynb +++ b/examples/python_interface_example.ipynb @@ -6,7 +6,7 @@ "metadata": {}, "outputs": [], "source": [ - "from sisso import generate_fs_sr_from_csv, Model\n", + "from cpp_sisso import generate_fs_sr_from_csv, Model\n", "\n", "feat_sapce, sisso = generate_fs_sr_from_csv(\n", " df_csv=\"data.csv\",\n", diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 31815159af51e6c2d9ba26abe2314797cfe29e30..b4b58dad1f453322661f03087334c90f39c015c3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,8 +62,8 @@ if(USE_PYTHON) ) # target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${PYTHON_LAPACK_LIBRARIES} ${PYTHON_LIBRARIES} -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBS}) target_link_libraries(_sisso ${MPI_LIBRARIES} -Wl,--rpath=${PYTHON_PREFIX}/lib/ ${LAPACK_LIBRARIES} ${PYTHON_LIBRARIES} -Wl,--rpath=${Boost_LIB_DIR} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES}) - install(TARGETS _sisso DESTINATION "${PYTHON_INSTDIR}/sisso") - install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/python/ DESTINATION ${PYTHON_INSTDIR}/sisso + install(TARGETS _sisso DESTINATION "${PYTHON_INSTDIR}/cpp_sisso") + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/python/ DESTINATION ${PYTHON_INSTDIR}/cpp_sisso FILES_MATCHING PATTERN "*.py" PATTERN "CMakeFiles" EXCLUDE) endif() diff --git a/src/python/__init__.py b/src/python/__init__.py index fa6cd111030cb40c9490e72f1ecd982bed5f8d47..f7da78d5a3df8b0355957503e0a1df3300468204 100644 --- a/src/python/__init__.py +++ b/src/python/__init__.py @@ -1,4 +1,4 @@ -from sisso._sisso import * +from cpp_sisso._sisso import * import numpy as np import pandas as pd diff --git a/tests/test_sisso.py b/tests/test_sisso.py index 117a23d713bcfd1f98cd2b5ae5753e7bd77c7e60..238f2d4f9d05f7c016743208d98d36da53468600 100644 --- a/tests/test_sisso.py +++ b/tests/test_sisso.py @@ -1,6 +1,6 @@ import shutil from pathlib import Path -from sisso import generate_fs_sr_from_csv +from cpp_sisso import generate_fs_sr_from_csv parent = Path(__file__).parent