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

Adding support for applying Lightning Flash models to datasets #1059

Merged
merged 64 commits into from
Jun 21, 2021
Merged
Show file tree
Hide file tree
Changes from 60 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
b7fe9e3
example apply model
ehofesmann May 26, 2021
c36608d
initial apply model test
ehofesmann May 29, 2021
c7015ae
predict batches of samples
ehofesmann May 29, 2021
f8a6532
set attribute serializer, remove batches
ehofesmann Jun 1, 2021
d664254
add segmentation importer, normalize labels
ehofesmann Jun 3, 2021
dbee1b1
Merge branch 'develop' into flash-video
ehofesmann Jun 3, 2021
6fa0298
resolve comments
ehofesmann Jun 3, 2021
df9b6b6
set value
ehofesmann Jun 3, 2021
b742b6c
add other tasks to apply_model
ehofesmann Jun 3, 2021
cd6492a
cleanup
brimoor Jun 3, 2021
9c496ad
completing ImageSegmentationDirectory type
brimoor Jun 3, 2021
1ede80c
updating docstrings
brimoor Jun 3, 2021
b9ca624
standardizing
brimoor Jun 3, 2021
4d365a8
force grayscale param for loading rgb masks
ehofesmann Jun 3, 2021
2872451
handle alpha channel
brimoor Jun 4, 2021
62baf46
segmentation priority
ehofesmann Jun 4, 2021
917b7e5
Merge branch 'flash-video' of github.com:voxel51/fiftyone into flash-…
ehofesmann Jun 4, 2021
453f313
Merge branch 'develop' into flash-video
brimoor Jun 4, 2021
f2c71ee
tweak
brimoor Jun 4, 2021
c4daab0
passing threshold through
brimoor Jun 4, 2021
e002c89
todo
brimoor Jun 4, 2021
74c8dbd
adding intersphinx docs links
brimoor Jun 4, 2021
59eb357
adding support for generating image embeddings
brimoor Jun 4, 2021
21083d2
use Trainer for prediction
brimoor Jun 4, 2021
f48599b
linting
brimoor Jun 5, 2021
f1a6034
Merge branch 'develop' into flash-video
brimoor Jun 5, 2021
9679db1
Merge branch 'develop' into flash-video
brimoor Jun 5, 2021
86b4e7b
merge
ehofesmann Jun 9, 2021
5128986
merge
ehofesmann Jun 9, 2021
74b8ba2
Merge branch 'develop' into flash-video
brimoor Jun 10, 2021
c712c5b
initialize integrations docs
ehofesmann Jun 10, 2021
a770888
update flash docs
ehofesmann Jun 10, 2021
cf0fbd8
update flash docs
ehofesmann Jun 10, 2021
3abb03a
flash docs
ehofesmann Jun 11, 2021
6a2862d
add open images card
ehofesmann Jun 11, 2021
6c3403d
udpate links
ehofesmann Jun 11, 2021
e703782
update examples
ehofesmann Jun 12, 2021
60db6f9
update examples
ehofesmann Jun 12, 2021
b76c89f
update docs, pass kwargs to flash Trainer
ehofesmann Jun 14, 2021
8189b4d
update flash docs
ehofesmann Jun 15, 2021
be943dc
Merge branch 'develop' into flash-video
brimoor Jun 15, 2021
f7ffbc8
docs updates
brimoor Jun 15, 2021
4e75276
copy edits
brimoor Jun 15, 2021
0d03f83
Merge branch 'develop' into flash-video
brimoor Jun 15, 2021
4bab0dd
tweaking docs
brimoor Jun 16, 2021
b748532
clarifying checkpoint usage
brimoor Jun 16, 2021
86fa354
tweaks
brimoor Jun 16, 2021
6ec974d
linting
brimoor Jun 16, 2021
3d38466
update segmentation example
ehofesmann Jun 17, 2021
4f7f2a7
example specify class labels
ehofesmann Jun 17, 2021
3cd522e
flash updates for segmentation
ehofesmann Jun 20, 2021
16a5462
update segmentatione example
ehofesmann Jun 20, 2021
2c83206
flash banner and integration logo
benjaminpkane Jun 21, 2021
111af9e
add to integrations logos
benjaminpkane Jun 21, 2021
6b28724
update seg example
ehofesmann Jun 21, 2021
b912095
Merge branch 'flash-video' of github.com:voxel51/fiftyone into flash-…
ehofesmann Jun 21, 2021
c215b8a
adding helpful error message instructing how to avoid spurious requir…
brimoor Jun 21, 2021
07ab2b2
fixing docstrings
brimoor Jun 21, 2021
9099539
updating image
brimoor Jun 21, 2021
4371bae
adding v0.10.0 release notes
brimoor Jun 21, 2021
0158158
tweaking docs
brimoor Jun 21, 2021
1ab8315
bump eta
benjaminpkane Jun 21, 2021
5542282
tweaking tests
brimoor Jun 21, 2021
b9b3b73
Merge branch 'flash-video' of https://github.com/voxel51/fiftyone int…
brimoor Jun 21, 2021
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
2 changes: 1 addition & 1 deletion docs/source/_static/css/voxel51-website.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
color: var(--text-primary-on-light);
}

.google-gray {
.gray {
color: var(--gray-dark1);
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions docs/source/_templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@
/>
{% endblock %} {% block custom_header %}
<div class="container-fluid header-holder tutorials-header" id="header-holder">
<a class="banner" href="https://voxel51.com/#open-images">
<a
class="banner"
href="https://voxel51.com/docs/fiftyone/integrations/lightning_flash.html"
>
<div>
<span>
We are collaborating with&nbsp;<b class="google-gray">Google</b>&nbsp;to
support the Open Images dataset and evaluation in&nbsp;<span
We are collaborating with the
<b class="gray">PyTorch Lightning</b>&nbsp;team to support training and
evaluating Flash models in&nbsp;<span
><b style="color: var(--gray-dark3)">Fifty</b
><b style="color: var(--color-primary)">One</b></span
>!
Expand Down
10 changes: 10 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,16 @@
# Path to the redirects file, relative to `source/`
redirects_file = "redirects"

# -- Options for intersphinx extension ---------------------------------------

intersphinx_mapping = {
# including `python` autolinks things like (None) which is not desirable
# "python": ("https://docs.python.org/3", None),
"numpy": ("https://numpy.org/doc/stable/", None),
"torch": ("https://pytorch.org/docs/stable/", None),
"flash": ("https://lightning-flash.readthedocs.io/en/latest", None),
}

# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 24 additions & 3 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,26 @@ learn how!
:image_src: https://voxel51.com/images/integrations/pytorch-128.png
:image_title: PyTorch

.. customimagelink::
:image_link: integrations/lightning_flash.html
:image_src: https://voxel51.com/images/integrations/pytorch-lightning-128.png
:image_title: PyTorch Lightning

.. customimagelink::
:image_link: recipes/adding_detections.html
:image_src: https://voxel51.com/images/integrations/tensorflow-128.png
:image_title: TensorFlow

.. customimagelink::
:image_link: api/fiftyone.utils.coco.html
:image_src: https://voxel51.com/images/integrations/coco-128.png
:image_title: COCO

.. customimagelink::
:image_link: tutorials/open_images.html
:image_src: https://voxel51.com/images/integrations/open-images-128.png
:image_title: Open Images

.. customimagelink::
:image_link: environments/index.html#notebooks
:image_src: https://voxel51.com/images/integrations/jupyter-128.png
Expand All @@ -94,15 +109,20 @@ learn how!
:image_title: Plotly

.. customimagelink::
:image_link: api/fiftyone.utils.scale.html
:image_src: https://voxel51.com/images/integrations/scale-128.png
:image_title: Scale AI
:image_link: api/fiftyone.utils.cvat.html
:image_src: https://voxel51.com/images/integrations/cvat-128.png
:image_title: CVAT

.. customimagelink::
:image_link: api/fiftyone.utils.labelbox.html
:image_src: https://voxel51.com/images/integrations/labelbox-128.png
:image_title: Labelbox

.. customimagelink::
:image_link: api/fiftyone.utils.scale.html
:image_src: https://voxel51.com/images/integrations/scale-128.png
:image_title: Scale AI

.. customimagelink::
:image_link: environments/index.html#google-cloud
:image_src: https://voxel51.com/images/integrations/google-cloud-128.png
Expand Down Expand Up @@ -305,6 +325,7 @@ or reach out to us at support@voxel51.com.
Tutorials <tutorials/index>
Recipes <recipes/index>
User Guide <user_guide/index>
Integrations <integrations/index>
Release Notes <release-notes>
CLI Documentation <cli/index>
API Reference <api/fiftyone>
Expand Down
96 changes: 96 additions & 0 deletions docs/source/integrations/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
.. _integrations:

FiftyOne Integrations
=====================

.. default-role:: code

FiftyOne integrates naturally with other ML tools that you know and love. Click
on the cards below to see how!

.. Integrations cards section -----------------------------------------------------

.. raw:: html

<div id="tutorial-cards-container">

<nav class="navbar navbar-expand-lg navbar-light tutorials-nav col-12">
<div class="tutorial-tags-container">
<div id="dropdown-filter-tags">
<div class="tutorial-filter-menu">
<div class="tutorial-filter filter-btn all-tag-selected" data-tag="all">All</div>
</div>
</div>
</div>
</nav>

<hr class="tutorials-hr">

<div class="row">

<div id="tutorial-cards">
<div class="list">

.. Add tutorial cards below

.. customcarditem::
:header: Lightning Flash
:description: Train Flash models on FiftyOne datasets and use the FiftyOne App to visualize and improve your Flash models, all with just a few lines of code.
:link: lightning_flash.html
:image: ../_static/images/integrations/lightning_flash.png
:tags: Model-Training,Model-Evaluation

.. Upcoming integrations

.. customcarditem::
:header: Open Images Dataset
:description: FiftyOne is the recommended tool for downloading and exploring Google's Open Images Dataset.
:link: ../user_guide/dataset_zoo/datasets.html#dataset-zoo-open-images-v6
:image: ../_static/images/integrations/open_images.png
:tags: Dataset

.. customcarditem::
:header: COCO Dataset
:description: FiftyOne is the recommended tool for downloading and exploring the COCO Dataset.
:link: ../user_guide/dataset_zoo/datasets.html#dataset-zoo-coco-2017
:tags: Dataset

.. customcarditem::
:header: CVAT
:description: Use our CVAT integration to easily annotate and edit your FiftyOne datasets.
:link: ../user_guide/dataset_creation/datasets.html#cvatimagedataset
:tags: Annotation

.. customcarditem::
:header: Labelbox
:description: Use our Labelbox integration to easily annotate and edit your FiftyOne datasets.
:link: ../api/fiftyone.utils.labelbox.html
:image: https://voxel51.com/images/integrations/labelbox-128.png
:tags: Annotation

.. customcarditem::
:header: Scale AI
:description: Use our Scale integration to easily annotate and edit your FiftyOne datasets.
:link: ../api/fiftyone.utils.scale.html
:image: https://voxel51.com/images/integrations/scale-128.png
:tags: Annotation

.. End of integrations cards

.. raw:: html

</div>

<div class="pagination d-flex justify-content-center"></div>

</div>

</div>

.. End integrations cards section -------------------------------------------------

.. toctree::
:maxdepth: 1
:hidden:

Lightning Flash <lightning_flash.rst>
Loading