From 387f198143f7cba7967f0f95d6a2833be2acd51a Mon Sep 17 00:00:00 2001
From: Thomas Purcell <purcell@fhi-berlin.mpg.de>
Date: Wed, 29 Jul 2020 14:48:05 +0200
Subject: [PATCH] rename pybinding module to cpp_sisso
Remove conflict with pySISSO
---
examples/python_interface_example.ipynb | 2 +-
src/CMakeLists.txt | 4 ++--
src/python/__init__.py | 2 +-
tests/test_sisso.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/python_interface_example.ipynb b/examples/python_interface_example.ipynb
index 54928865..a35d63e1 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 31815159..b4b58dad 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 fa6cd111..f7da78d5 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 117a23d7..238f2d4f 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
--
GitLab