Skip to content

Commit d7e7042

Browse files
committed
Merge branch 'feature/refactor_py'
2 parents 641911e + fdc89eb commit d7e7042

37 files changed

+2198
-421
lines changed

core/Bridge.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#include "PythonCdb.hh"
2+
#include "pythoncdb/py_ex.hh"
33
#include "Bridge.hh"
44
#include "algorithms/collect_terms.hh"
55

core/CMakeLists.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,21 @@ set(PROPERTY_SRC_FILES
156156
# gauge_theory/instantons
157157
# )
158158

159+
set(MODULE_SRC_FILES
160+
pythoncdb/py_algorithms.cc
161+
pythoncdb/py_ex.cc
162+
pythoncdb/py_globals.cc
163+
pythoncdb/py_helpers.cc
164+
pythoncdb/py_kernel.cc
165+
pythoncdb/py_module.cc
166+
pythoncdb/py_packages.cc
167+
pythoncdb/py_progress.cc
168+
pythoncdb/py_properties.cc
169+
pythoncdb/py_stopwatch.cc
170+
)
171+
159172
set(LOCAL_SRC_FILES
160173
CdbPython.cc
161-
PythonCdb.cc
162174
ExNode.cc
163175
ProgressMonitor.cc
164176
Bridge.cc
@@ -229,6 +241,7 @@ include_directories(
229241
# Cadabra2 python module
230242
pybind11_add_module(cadabra2 SHARED
231243
${LOCAL_SRC_FILES}
244+
${MODULE_SRC_FILES}
232245
)
233246
set_target_properties(cadabra2 PROPERTIES SUFFIX ".${PYTHON_MOD_SUFFIX}")
234247
target_link_libraries(cadabra2 PRIVATE

core/ExNode.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#include "ExNode.hh"
33
#include "Cleanup.hh"
4-
#include "PythonCdb.hh"
4+
#include "pythoncdb/py_kernel.hh"
55
#include <pybind11/pybind11.h>
66
#include <pybind11/embed.h>
77
#include <pybind11/operators.h>

core/PythonCdb.hh

Lines changed: 0 additions & 266 deletions
This file was deleted.

0 commit comments

Comments
 (0)