cleanup

voxel51 · Apr 25, 2023 · 567e46d · 567e46d
1 parent 987a85d
commit 567e46d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/docs/source/user_guide/dataset_zoo/datasets.rst b/docs/source/user_guide/dataset_zoo/datasets.rst
@@ -3398,15 +3398,17 @@ annotation data.
 Sama-COCO
 ---------
 
-Sama-COCO is a relabeling of COCO-2017 and is a large-scale object detection and segmentation dataset.
-Masks in Sama-COCO are tighter and many crowd instances have been decomposed into their components.
+Sama-COCO is a relabeling of COCO-2017 and is a large-scale object detection
+and segmentation dataset. Masks in Sama-COCO are tighter and many crowd
+instances have been decomposed into their components.
 
-This version contains images from the COCO-2017 version of the dataset, as well as annotations in the form
-of bounding boxes, and segmentation masks provided by Sama.
+This version contains images from the COCO-2017 version of the dataset, as well
+as annotations in the form of bounding boxes, and segmentation masks provided
+by Sama.
 
 **Notes**
 
--   Sama-COCO defines 91 classes but the data only uses 80 classes as per COCO-2017
+-   Sama-COCO defines 91 classes but the data only uses 80 classes (like COCO-2017)
 -   Some images from the train and validation sets don't have annotations
 -   The test set does not have annotations
 -   Sama-COCO has identical splits to COCO-2017
@@ -3430,9 +3432,9 @@ of bounding boxes, and segmentation masks provided by Sama.
 **Partial downloads**
 
 FiftyOne provides parameters that can be used to efficiently download specific
-subsets of the Sama-COCO dataset to suit your needs. When new subsets are specified,
-FiftyOne will use existing downloaded data first if possible before resorting
-to downloading additional data from the web.
+subsets of the Sama-COCO dataset to suit your needs. When new subsets are
+specified, FiftyOne will use existing downloaded data first if possible before
+resorting to downloading additional data from the web.
 
 The following parameters are available to configure a partial download of
 Sama-COCO by passing them to

diff --git a/fiftyone/utils/coco.py b/fiftyone/utils/coco.py
@@ -1457,7 +1457,7 @@ def download_coco_dataset_split(
     scratch_dir=None,
 ):
     """Utility that downloads full or partial splits of the
-    `Sama-COCO dataset <https://cocodataset.org>`_.
+    `COCO dataset <https://cocodataset.org>`_.
 
     See :ref:`this page <COCODetectionDataset-export>` for the format in which
     ``dataset_dir`` will be arranged.

diff --git a/fiftyone/utils/sama.py b/fiftyone/utils/sama.py
@@ -28,8 +28,8 @@ def download_sama_coco_dataset_split(
     scratch_dir=None,
 ):
     """Utility that downloads full or partial data splits of the
-    `COCO dataset <https://cocodataset.org>` with annotation splits found
-    at <https://www.sama.com/sama-coco-dataset/>.
+    `COCO dataset <https://cocodataset.org>`_ with annotation splits found
+    at https://www.sama.com/sama-coco-dataset.
 
     See :ref:`this page <COCODetectionDataset-export>` for the format in which
     ``dataset_dir`` will be arranged.
@@ -79,11 +79,7 @@ def download_sama_coco_dataset_split(
         -   classes: the list of all classes
         -   did_download: whether any content was downloaded (True) or if all
             necessary files were already downloaded (False)
-
-    Notes:
-        year is fixed for Sama-COCO and represents the imaging data from 2017
     """
-
     if split not in _IMAGE_DOWNLOAD_LINKS:
         raise ValueError(
             "Unsupported split '%s'; supported values are %s"
@@ -313,8 +309,6 @@ def download_sama_coco_dataset_split(
 
 
 def _merge_annotations(merge_dir, output):
-    assert os.path.isdir(merge_dir), "Must provide a valid directory"
-
     info = licenses = categories = None
     all_annotations = []
     all_images = []