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.

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

Linear and efficient neighbour finder #393

Merged
merged 17 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
3 changes: 3 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ authors:
given-names: Nick
orcid: "https://orcid.org/0000-0003-3038-1855"
alias: zerothi
- family-names: Febrer
given-names: Pol
alias: pfebrer
title: sisl
identifiers:
- description: "Collection DOI for any sisl version."
Expand Down
2 changes: 1 addition & 1 deletion ci/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- pyproject-metadata
- pyparsing>=1.5.7
- numpy>=1.13
- cython>=0.29.28
- cython>=3.0.0
- scipy>=1.5.0
- netcdf4
- xarray>=0.10.0
Expand Down
17 changes: 9 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
requires = [
"setuptools_scm[toml]>=6.2",
"scikit-build-core[pyproject]",
"Cython>=0.29.28",
"Cython>=3",
# see https://github.com/scipy/oldest-supported-numpy/
# should fix #310
"oldest-supported-numpy; sys_platform != 'win32'",
Expand Down Expand Up @@ -49,7 +49,8 @@ dependencies = [
]

authors = [
{name = "Nick Papior", email = "[email protected]"}
{name = "Nick Papior", email = "[email protected]"},
{name = "Pol Febrer"}
]
maintainers = [{name="sisl developers"}]

Expand Down Expand Up @@ -136,9 +137,9 @@ analysis = [
]

viz = [
"netCDF4",
"dill >= 0.3.2",
"pathos",
"netCDF4",
"scikit-image",

"plotly",
Expand All @@ -147,34 +148,34 @@ viz = [
]

viz-plotly = [
"netCDF4",
"dill >= 0.3.2",
"pathos",
"netCDF4",
"scikit-image",

"plotly",
]

viz-matplotlib = [
"netCDF4",
"dill >= 0.3.2",
"pathos",
"netCDF4",
"scikit-image",

"matplotlib",
]

viz-blender = [
"netCDF4",
"dill >= 0.3.2",
"pathos",
"netCDF4",
"scikit-image",
]

viz-ase = [
"netCDF4",
"dill >= 0.3.2",
"pathos",
"netCDF4",
"scikit-image",

"ase",
Expand All @@ -186,10 +187,10 @@ test = [
"pytest-env",
"pytest-faulthandler",
"coveralls",
"netCDF4",
"tqdm",
"dill >= 0.3.2",
"pathos",
"netCDF4",
"scikit-image",
"matplotlib",
"plotly",
Expand Down
1 change: 1 addition & 0 deletions src/sisl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ endforeach()
add_subdirectory("_core")
add_subdirectory("io")
add_subdirectory("physics")
add_subdirectory("geom")
1 change: 1 addition & 0 deletions src/sisl/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ def pytest_configure(config):
"hamiltonian",
"geometry",
"geom",
"neighbor",
"shape",
"state",
"electron",
Expand Down
1 change: 1 addition & 0 deletions src/sisl/geom/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
add_subdirectory("neighs")
1 change: 1 addition & 0 deletions src/sisl/geom/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

"""
from ._composite import *
from ._neighbors import *

Check notice

Code scanning / CodeQL

'import *' may pollute namespace Note

Import pollutes the enclosing namespace, as the imported module
sisl.geom._neighbors
does not define '__all__'.
from .basic import *
from .bilayer import *
from .category import *
Expand Down
11 changes: 11 additions & 0 deletions src/sisl/geom/_neighbors/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# In this directory we have a set of libraries
# We will need to link to the Numpy includes
foreach(source _operations)
add_cython_library(
SOURCE ${source}.py
LIBRARY ${source}
OUTPUT ${source}_C
)
install(TARGETS ${source} LIBRARY
DESTINATION ${SKBUILD_PROJECT_NAME}/geom/neighs)
endforeach()
1 change: 1 addition & 0 deletions src/sisl/geom/_neighbors/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from ._finder import NeighborFinder
Loading
Loading