Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move Python bindings to own dir #1179

Merged
merged 7 commits into from
Mar 1, 2024
Merged

Move Python bindings to own dir #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ead3a4
Move nmodl Python bindings to `python/nmodl`
JCGoran Feb 27, 2024
4dd0cde
Minor fixes for testing
JCGoran Feb 27, 2024
a75d656
Fix wheel.packages
JCGoran Feb 27, 2024
3a8640e
Copy also files from build dir
JCGoran Feb 27, 2024
6453a1e
Revert "Copy also files from build dir"
JCGoran Feb 27, 2024
8eb4c84
Fix for cmake build
JCGoran Feb 27, 2024
729a306
Merge branch 'jelic/pyproject' into jelic/move_python_dir
JCGoran Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions packaging/test_wheel.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,14 @@ test_wheel () {
# sample mod file for nrnivmodl check
TEST_DIR="$(mktemp -d)"
OUTPUT_DIR="$(mktemp -d)"
cp "${this_dir}/../nmodl/ext/example/"*.mod "$TEST_DIR/"
cp "${this_dir}/../python/nmodl/ext/example/"*.mod "$TEST_DIR/"
cp "${this_dir}/../test/integration/mod/cabpump.mod" "${this_dir}/../test/integration/mod/var_init.inc" "$TEST_DIR/"
cd "${this_dir}"
for mod in "${TEST_DIR}/"*.mod
do
nmodl -o "${OUTPUT_DIR}" "${mod}" sympy --analytic
$python_exe -c "import nmodl; driver = nmodl.NmodlDriver(); driver.parse_file('${mod}')"
done
$python_exe -m pytest -vvv "${this_dir}/../test/"
cd -
}

echo "== Testing $python_wheel using $python_exe ($python_ver) =="
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ build-backend = "scikit_build_core.build"

[tool.scikit-build]
metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
wheel.packages = ["nmodl"]
wheel.packages = ["python/nmodl"]
logging.level = "DEBUG"

[tool.scikit-build.cmake]
Expand Down
0 nmodl/__init__.py → python/nmodl/__init__.py
View file
Open in desktop
File renamed without changes.
0 nmodl/_binwrapper.py → python/nmodl/_binwrapper.py
View file
Open in desktop
File renamed without changes.
0 nmodl/ast.py → python/nmodl/ast.py
View file
Open in desktop
File renamed without changes.
0 nmodl/dsl.py → python/nmodl/dsl.py
View file
Open in desktop
File renamed without changes.
0 nmodl/ext/example/exp2syn.mod → python/nmodl/ext/example/exp2syn.mod
View file
Open in desktop
File renamed without changes.
0 nmodl/ext/example/expsyn.mod → python/nmodl/ext/example/expsyn.mod
View file
Open in desktop
File renamed without changes.
0 nmodl/ext/example/hh.mod → python/nmodl/ext/example/hh.mod
View file
Open in desktop
File renamed without changes.
0 nmodl/ext/example/passive.mod → python/nmodl/ext/example/passive.mod
View file
Open in desktop
File renamed without changes.
0 nmodl/ext/viz/css/tree.css → python/nmodl/ext/viz/css/tree.css
View file
Open in desktop
File renamed without changes.
0 nmodl/ext/viz/index.html → python/nmodl/ext/viz/index.html
View file
Open in desktop
File renamed without changes.
0 nmodl/ext/viz/js/d3.min.js → python/nmodl/ext/viz/js/d3.min.js
View file
Open in desktop
File renamed without changes.
0 nmodl/ext/viz/js/tree.js → python/nmodl/ext/viz/js/tree.js
View file
Open in desktop
File renamed without changes.
0 nmodl/ode.py → python/nmodl/ode.py
View file
Open in desktop
File renamed without changes.
0 nmodl/symtab.py → python/nmodl/symtab.py
View file
Open in desktop
File renamed without changes.
0 nmodl/visitor.py → python/nmodl/visitor.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/language/code_generator.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ set(CODE_GENERATOR_JINJA_FILES
set(CODE_GENERATOR_PY_FILES
${PROJECT_SOURCE_DIR}/src/language/argument.py
${PROJECT_SOURCE_DIR}/src/language/code_generator.py
${PROJECT_SOURCE_DIR}/src/language/language_parser.py
${PROJECT_SOURCE_DIR}/src/language/node_info.py
${PROJECT_SOURCE_DIR}/src/language/nodes.py
${PROJECT_SOURCE_DIR}/src/language/language_parser.py
${PROJECT_SOURCE_DIR}/src/language/utils.py
)

Expand Down
8 changes: 4 additions & 4 deletions src/pybind/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ endif()
# =============================================================================
file(
GLOB NMODL_PYTHON_FILES
RELATIVE "${NMODL_PROJECT_SOURCE_DIR}/nmodl/"
CONFIGURE_DEPENDS "${NMODL_PROJECT_SOURCE_DIR}/nmodl/*.py")
RELATIVE "${NMODL_PROJECT_SOURCE_DIR}/python/nmodl/"
CONFIGURE_DEPENDS "${NMODL_PROJECT_SOURCE_DIR}/python/nmodl/*.py")

foreach(file IN LISTS NMODL_PYTHON_FILES)
cpp_cc_build_time_copy(INPUT ${NMODL_PROJECT_SOURCE_DIR}/nmodl/${file} OUTPUT
cpp_cc_build_time_copy(INPUT ${NMODL_PROJECT_SOURCE_DIR}/python/nmodl/${file} OUTPUT
${CMAKE_BINARY_DIR}/lib/nmodl/${file})
endforeach()
file(COPY ${NMODL_PROJECT_SOURCE_DIR}/nmodl/ext DESTINATION ${CMAKE_BINARY_DIR}/lib/nmodl/)
file(COPY ${NMODL_PROJECT_SOURCE_DIR}/python/nmodl/ext DESTINATION ${CMAKE_BINARY_DIR}/lib/nmodl/)

# =============================================================================
# Install python binding components
Expand Down
Loading