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

Perform cythonize() in build directory instead of source tree #2662

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Perform cythonize() in build directory instead of source tree #2662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10cb9bc
Perform cythonize() in build directory instead of source tree
pramodk Jan 12, 2024
03e6b10
partially revert include removal
pramodk Jan 12, 2024
608a74e
Merge branch 'master' into pramodk/cythonize-in-build
alkino Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Expand Up @@ -380,6 +380,10 @@ if(NRN_ENABLE_MUSIC)
endif()
find_package(MUSIC REQUIRED)
set(NRN_MUSIC 1)
cpp_cc_build_time_copy(INPUT "${PROJECT_SOURCE_DIR}/src/neuronmusic/neuronmusic.pxd"
OUTPUT "${PROJECT_BINARY_DIR}/src/neuronmusic/neuronmusic.pxd")
cpp_cc_build_time_copy(INPUT "${PROJECT_SOURCE_DIR}/src/neuronmusic/neuronmusic.pyx"
OUTPUT "${PROJECT_BINARY_DIR}/src/neuronmusic/neuronmusic.pyx")
endif()

# =============================================================================
Expand Down
29 changes: 24 additions & 5 deletions setup.py
View file
Open in desktop
Expand Up @@ -431,11 +431,17 @@ def setup_package():
]

if Components.MUSIC:
import pathlib

cmake_proj_dir = pathlib.Path(__file__).parent.resolve()
extensions += [
CyExtension(
"neuronmusic",
["src/neuronmusic/neuronmusic.pyx"],
include_dirs=["src/nrnpython", "src/nrnmusic"],
[os.path.join(cmake_build_dir, "src/neuronmusic/neuronmusic.pyx")],
include_dirs=[
os.path.join(cmake_proj_dir, "src/neuronmusic"),
"src/nrnpython",
],
**extension_common_params,
)
]
Expand Down Expand Up @@ -463,19 +469,32 @@ def setup_package():
extensions += [
CyExtension(
"neuron.rxd.geometry3d.graphicsPrimitives",
["share/lib/python/neuron/rxd/geometry3d/graphicsPrimitives.pyx"],
[
os.path.join(
cmake_build_dir,
"share/nrn/lib/python/neuron/rxd/geometry3d/graphicsPrimitives.pyx",
)
],
**rxd_params,
),
CyExtension(
"neuron.rxd.geometry3d.ctng",
["share/lib/python/neuron/rxd/geometry3d/ctng.pyx"],
[
os.path.join(
cmake_build_dir,
"share/nrn/lib/python/neuron/rxd/geometry3d/ctng.pyx",
)
],
include_dirs=include_dirs,
**rxd_params,
),
CyExtension(
"neuron.rxd.geometry3d.surfaces",
[
"share/lib/python/neuron/rxd/geometry3d/surfaces.pyx",
os.path.join(
cmake_build_dir,
"share/nrn/lib/python/neuron/rxd/geometry3d/surfaces.pyx",
),
"src/nrnpython/rxd_marching_cubes.cpp",
"src/nrnpython/rxd_llgramarea.cpp",
],
Expand Down