-
-
Notifications
You must be signed in to change notification settings - Fork 60
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
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
213bdbf
enh: linear and efficient neighbour finder
pfebrer 9058070
neighs in python syntax and added tests
pfebrer 18ffc6d
remove print statement
pfebrer 360e085
cython was using the python sqrt
pfebrer ebd2980
make R larger than cell work
pfebrer 706c0df
remove itertools
pfebrer e8b9197
ran black and isort
zerothi c2a1b3b
small clean-ups, and fixed requirements
zerothi e1cdfb3
fixed names of neighbor finder
zerothi 8844149
added Pol as author in Citation
zerothi 929242d
moved neighbor code to new folder
zerothi c6ab0c4
cleaned documentation and return value
zerothi ce22990
ran black
zerothi ac59727
fixed sort order
zerothi 4101a79
fixed cmake for neighbor location
zerothi 34446a0
fixed memory problems in the finder
zerothi 7f9b4dc
allowed tuple input of bin_size
zerothi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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'", | ||
|
@@ -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"}] | ||
|
||
|
@@ -136,9 +137,9 @@ analysis = [ | |
] | ||
|
||
viz = [ | ||
"netCDF4", | ||
"dill >= 0.3.2", | ||
"pathos", | ||
"netCDF4", | ||
"scikit-image", | ||
|
||
"plotly", | ||
|
@@ -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", | ||
|
@@ -186,10 +187,10 @@ test = [ | |
"pytest-env", | ||
"pytest-faulthandler", | ||
"coveralls", | ||
"netCDF4", | ||
"tqdm", | ||
"dill >= 0.3.2", | ||
"pathos", | ||
"netCDF4", | ||
"scikit-image", | ||
"matplotlib", | ||
"plotly", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
add_subdirectory("neighs") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
from ._finder import NeighborFinder |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check notice
Code scanning / CodeQL
'import *' may pollute namespace Note