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

Validate 3D metrics #261

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Validate 3D metrics #261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d23b075
new 3d metrics
Anirudh-Scale Mar 16, 2022
fc5764b
flake fix
Anirudh-Scale Mar 16, 2022
d380204
lint
Anirudh-Scale Mar 16, 2022
ee4cfc0
linting for circle ci
Anirudh-Scale Mar 17, 2022
c833bb7
version
Anirudh-Scale Mar 17, 2022
1dfbb07
used native polygon
Anirudh-Scale Mar 17, 2022
aef31c9
adding shapely
Anirudh-Scale Mar 17, 2022
9157287
adding shapely
Anirudh-Scale Mar 17, 2022
408073f
changing shapely
Anirudh-Scale Mar 17, 2022
09fc5d4
changing shapely
Anirudh-Scale Mar 17, 2022
0550b51
updating shapely
Anirudh-Scale Mar 17, 2022
bb3ba8f
poetry added shapely
Anirudh-Scale Mar 17, 2022
fb15d1b
edge case
Anirudh-Scale Mar 23, 2022
ebf3a5a
np type
Anirudh-Scale Mar 23, 2022
180fee7
Merge branch 'master' into metrics_3d
sasha-scale Mar 31, 2022
4a79d13
Merge branch 'metrics_3d' of github.com:scaleapi/nucleus-python-clien…
sasha-scale Mar 31, 2022
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
53 changes: 42 additions & 11 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 @@ -45,7 +45,7 @@ click = ">=7.1.2,<9.0" # NOTE: COLAB has 7.1.2 and has problems updating
rich = "^10.15.2"
shellingham = "^1.4.0"
scikit-learn = ">=0.24.0"
Shapely = ">=1.7.1"
Shapely = "^1.8.1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gatli didn't we run into problems with Shapely at some point?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, we can't use it. It doesn't have wide enough binary support.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what should we do about this? @Anirudh-Scale how much do we rely in the shapely dependency? Any chance we can get around this? If not, @gatli how can we still make this work?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pfmark I can implement a function to calculate the area intersection without Shapely, it's just going to be significantly slower. If that's a trade-off we're ok with, I can do that.

Copy link
Contributor

@phil-scale phil-scale Mar 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's already a function for polygon area intersection in the directory under geometry.py. I'd suggest using that since it looks like you're using shapely only for polygon intersection area.

Edit: it looks like the native polygon was used originally before changing to shapely? The native polygon intersection function is quite slow since it's written in Python, but there's a speed up for convex polygons


[tool.poetry.dev-dependencies]
poetry = "^1.1.5"
Expand Down