Merge branch 'develop' into release

cena001plus · Feb 7, 2022 · 68d6b08 · 68d6b08
2 parents fae8359 + bee5fb7
commit 68d6b08
Show file tree

Hide file tree

Showing 41 changed files with 7,043 additions and 383 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ models**
 [![Downloads](https://pepy.tech/badge/fiftyone)](https://pepy.tech/project/fiftyone)
 [![Build](https://github.com/voxel51/fiftyone/workflows/Build/badge.svg?branch=develop&event=push)](https://github.com/voxel51/fiftyone/actions?query=workflow%3ABuild)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
-[![Slack](https://img.shields.io/badge/Slack-4A154B?logo=slack&logoColor=white)](https://join.slack.com/t/fiftyone-users/shared_invite/zt-gtpmm76o-9AjvzNPBOzevBySKzt02gg)
+[![Slack](https://img.shields.io/badge/Slack-4A154B?logo=slack&logoColor=white)](https://join.slack.com/t/fiftyone-users/shared_invite/zt-s6936w7b-2R5eVPJoUw008wP7miJmPQ)
 [![Medium](https://img.shields.io/badge/Medium-12100E?logo=medium&logoColor=white)](https://medium.com/voxel51)
 [![Mailing list](http://bit.ly/2Md9rxM)](https://share.hsforms.com/1zpJ60ggaQtOoVeBqIZdaaA2ykyk)
 [![Twitter](https://img.shields.io/twitter/follow/Voxel51?style=social)](https://twitter.com/voxel51)

diff --git a/docs/source/_includes/substitutions.rst b/docs/source/_includes/substitutions.rst
@@ -113,6 +113,7 @@
 .. |SegmentationResults| replace:: :class:`SegmentationResults <fiftyone.utils.eval.segmentation.SegmentationResults>`
 .. |COCOEvaluationConfig| replace:: :class:`COCOEvaluationConfig <fiftyone.utils.eval.coco.COCOEvaluationConfig>`
 .. |OpenImagesEvaluationConfig| replace:: :class:`OpenImagesEvaluationConfig <fiftyone.utils.eval.openimages.OpenImagesEvaluationConfig>`
+.. |ActivityNetEvaluationConfig| replace:: :class:`ActivityNetEvaluationConfig <fiftyone.utils.eval.activitynet.ActivityNetEvaluationConfig>`
 
 .. |Plot| replace:: :class:`Plot <fiftyone.core.plots.base.Plot>`
 .. |ResponsivePlot| replace:: :class:`ResponsivePlot <fiftyone.core.plots.base.ResponsivePlot>`

diff --git a/docs/source/_static/images/integrations/activitynet.png b/docs/source/_static/images/integrations/activitynet.png
diff --git a/docs/source/images/dataset_zoo/activitynet-100-validation.png b/docs/source/images/dataset_zoo/activitynet-100-validation.png
diff --git a/docs/source/images/dataset_zoo/activitynet-200-validation.png b/docs/source/images/dataset_zoo/activitynet-200-validation.png
diff --git a/docs/source/images/dataset_zoo/kinetics.png b/docs/source/images/dataset_zoo/kinetics.png
diff --git a/docs/source/images/evaluation/activitynet_confusion_matrix.png b/docs/source/images/evaluation/activitynet_confusion_matrix.png
diff --git a/docs/source/images/evaluation/activitynet_evaluate_detections.png b/docs/source/images/evaluation/activitynet_evaluate_detections.png
diff --git a/docs/source/images/evaluation/activitynet_pr_curves.png b/docs/source/images/evaluation/activitynet_pr_curves.png
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -81,6 +81,11 @@ learn how:
     :image_src: https://voxel51.com/images/integrations/tensorflow-128.png
     :image_title: TensorFlow
 
+.. customimagelink::
+    :image_link: integrations/activitynet.html
+    :image_src: https://voxel51.com/images/integrations/activitynet-128.png
+    :image_title: ActivityNet
+
 .. customimagelink::
     :image_link: integrations/coco.html
     :image_src: https://voxel51.com/images/integrations/coco-128.png