Merge remote-tracking branch 'origin/master'

Author: yatengLG

ISAT/segment_any/model_zoo.py

@@ -58,9 +58,9 @@
                 'https://dl.fbaipublicfiles.com/segment_anything/sam_vit_h_4b8939.pth',
                 'https://www.modelscope.cn/api/v1/models/yatengLG/ISAT_with_segment_anything_checkpoints/repo?Revision=master&FilePath=checkpoints/sam_vit_h_4b8939.pth'
             ],
-            'memory':'6462M',
-            'bf16_memory':'3378M',
-            'params':'2.6G'
+            'memory': '6462M',
+            'bf16_memory': '3378M',
+            'params': '2.6G'
         },
     'sam_vit_l_0b3195.pth':
         {

docs/build/doctrees/environment.pickle

@@ -40,7 +40,7 @@ Language switching
 ------------------------------------------------------------------------
 The software provides two interfaces, Chinese and English, which can be switched at any time.
 
-.. image:: ../../../display/双语界面.gif
+.. image:: ../../display/双语界面.gif
    :alt: Bilingual Interface
 
 ------------------------------------------------------------------------
@@ -49,7 +49,7 @@ Model switching
 ------------------------------------------------------------------------
 Switch model among your downloaded models.
 
-.. image:: ../../../display/模型切换.gif
+.. image:: ../../display/模型切换.gif
    :alt: Model switching
 
 ------------------------------------------------------------------------
@@ -62,7 +62,7 @@ When using SAM for semi-automatic annotation, convert SAM mask to contours using
 2. **External**: Saves external contours; internal holes in masks will be filled.
 3. **All**: Saves all contours; will add polygons with category __background__ for holes.
 
-.. image:: ../../../display/轮廓保存模式.gif
+.. image:: ../../display/轮廓保存模式.gif
    :alt: Contour saving modes
 
 ------------------------------------------------------------------------
@@ -71,7 +71,7 @@ Occlusion adjustment
 ------------------------------------------------------------------------
 Adjust occlusion for polygons with overlapping parts, choosing either **to top** or **to bottom** adjustment.
 
-.. image:: ../../../display/图层调整遮挡关系.gif
+.. image:: ../../display/图层调整遮挡关系.gif
    :alt: Adjusting layer occlusion
 
 ------------------------------------------------------------------------
@@ -80,7 +80,7 @@ Quick jump to image
 ------------------------------------------------------------------------
 Input an image name or index to quickly navigate to it.
 
-.. image:: ../../../display/图片快速跳转.gif
+.. image:: ../../display/图片快速跳转.gif
    :alt: Quick image jump
 
 ------------------------------------------------------------------------
@@ -89,7 +89,7 @@ Statusbar information
 ------------------------------------------------------------------------
 Obtain position and pixel value information. If using SAM, CUDA memory usage is also displayed on the status bar.
 
-.. image:: ../../../display/状态栏信息.gif
+.. image:: ../../display/状态栏信息.gif
    :alt: Statusbar Information
 
 ------------------------------------------------------------------------
@@ -98,7 +98,7 @@ Preview annotation result
 ------------------------------------------------------------------------
 Click the **Bit map** button to preview semantic and instance annotation results.
 
-.. image:: ../../../display/实时预览.gif
+.. image:: ../../display/实时预览.gif
    :alt: Real-time preview
 
 ------------------------------------------------------------------------
@@ -107,7 +107,7 @@ Import/export config file
 ------------------------------------------------------------------------
 Save categories and other parameters using a configuration file.
 
-.. image:: ../../../display/配置文件导入导出.gif
+.. image:: ../../display/配置文件导入导出.gif
    :alt: Config file import/export
 
 ------------------------------------------------------------------------
@@ -116,7 +116,7 @@ Drag to draw
 ------------------------------------------------------------------------
 Create polygons by keeping the mouse left button pressed and dragging. Use a click for straight lines and dragging for curves.
 
-.. image:: ../../../display/拖动绘制.gif
+.. image:: ../../display/拖动绘制.gif
    :alt: Drag to draw
 
 ------------------------------------------------------------------------
@@ -125,7 +125,7 @@ Quick browsing
 ------------------------------------------------------------------------
 Select a group ID from a dropdown to view the target, supporting quick switching between different groups via the scroll wheel.
 
-.. image:: ../../../display/快速浏览.gif
+.. image:: ../../display/快速浏览.gif
    :alt: Quick browsing
 
 ------------------------------------------------------------------------
@@ -134,7 +134,7 @@ Detail inspection
 ------------------------------------------------------------------------
 Switch annotations one by one using group IDs, adapting the view to the size of the annotation for detailed inspection.
 
-.. image:: ../../../display/细节检查.gif
+.. image:: ../../display/细节检查.gif
    :alt: Detail inspection
 
 ------------------------------------------------------------------------
@@ -143,7 +143,7 @@ Move and delete vertices
 ------------------------------------------------------------------------
 Select vertices using CTRL and move or delete them.
 
-.. image:: ../../../display/顶点批量移动与删除.gif
+.. image:: ../../display/顶点批量移动与删除.gif
    :alt: Move and delete vertices
 
 ------------------------------------------------------------------------
@@ -152,7 +152,7 @@ SAM features cache
 ------------------------------------------------------------------------
 Features are encoded using QThread to speed up image switching when using large models. Automatically encodes features for the current, previous, and next images.
 
-.. image:: ../../../display/sam缓存.gif
+.. image:: ../../display/sam缓存.gif
    :alt: SAM features cache
 
 ------------------------------------------------------------------------
@@ -161,7 +161,7 @@ Model manager
 ------------------------------------------------------------------------
 Supports multithreaded downloading with options to pause and resume transfers.
 
-.. image:: ../../../display/模型下载.gif
+.. image:: ../../display/模型下载.gif
    :alt: Model manager
 
 ------------------------------------------------------------------------
@@ -170,7 +170,7 @@ Repaint
 ------------------------------------------------------------------------
 Use the shortcut 'R' to switch to repaint mode. Start by selecting one vertex and end by selecting another vertex.
 
-.. image:: ../../../display/重绘.gif
+.. image:: ../../display/重绘.gif
    :alt: Repaint
 
 ------------------------------------------------------------------------
@@ -184,7 +184,7 @@ Intersection
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Calculate and display the intersection of two polygons.
 
-.. image:: ../../../display/交集.gif
+.. image:: ../../display/交集.gif
    :alt: Intersection
 
 ------------------------------------------------------------------------
@@ -193,7 +193,7 @@ Union
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Calculate and display the union of two polygons.
 
-.. image:: ../../../display/并集.gif
+.. image:: ../../display/并集.gif
    :alt: Union
 
 ------------------------------------------------------------------------
@@ -202,7 +202,7 @@ Difference
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Calculate and display the difference between two polygons.
 
-.. image:: ../../../display/差集.gif
+.. image:: ../../display/差集.gif
    :alt: Difference
 
 ------------------------------------------------------------------------
@@ -211,7 +211,7 @@ XOR (Symmetric Difference)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Calculate and display the symmetric difference (XOR) between two polygons.
 
-.. image:: ../../../display/异或.gif
+.. image:: ../../display/异或.gif
    :alt: XOR
 
 

docs/build/doctrees/features.doctree

@@ -3,16 +3,16 @@ Welcome to ISAT-SAM's documentation!
 
 **ISAT-SAM** stands for Interactive Semi-Automatic Annotation Tool with `Segment Anything Model <https://github.com/facebookresearch/segment-anything>`_
 
-.. image:: ../../../display/标注.gif
+.. image:: ../../display/标注.gif
    :alt: Software demo
 
 | The annotations are stored in ISAT json format, similar to MSCOCO:
 
 
 * **info**:
-    * **description**: Always 'ISAT'
+    * **description**: Always 'ISAT' for the software to recoginize
     * **folder**: The directory where the images are stored
-    * **name**: The name of the image file
+    * **name**: The name (path) of the image file
     * **width**, **height**, **depth**: The dimensions of the image; depth is 3 for RGB images
     * **note**: An optional field for any additional notes related to the image
 
@@ -24,6 +24,7 @@ Welcome to ISAT-SAM's documentation!
     * **layer**: A float indicating the sequence of the object. It increments within the same group, starting at 1.0
     * **bbox**: The bounding box coordinates in the format [x_min, y_min, x_max, y_max]
     * **iscrowd**: A boolean value indicating if the object is part of a crowd
+    * **note**: An optional field for any additional notes related to the annotation mask
 
 
 Check :doc:`features` for full features demonstration. Or click :doc:`usage` to **get started!**

docs/build/doctrees/index.doctree

@@ -34,7 +34,7 @@ Option 1: From Source Code
 
    After version 0.0.3, you can manage checkpoints within the GUI, click [menubar]-[SAM]-[Model manage] to open the GUI.
 
-   Now support `SAM <https://github.com/facebookresearch/segment-anything>`_, `Sam-HQ <https://github.com/SysCV/sam-hq>`_, `MobileSAM <https://github.com/ChaoningZhang/MobileSAM>`_, and `EdgeSAM <https://github.com/chongzhou96/EdgeSAM>`_ etc.
+   Now support `SAM2 <https://github.com/facebookresearch/segment-anything-2>`_, `SAM <https://github.com/facebookresearch/segment-anything>`_, `Sam-HQ <https://github.com/SysCV/sam-hq>`_, `MobileSAM <https://github.com/ChaoningZhang/MobileSAM>`_, and `EdgeSAM <https://github.com/chongzhou96/EdgeSAM>`_ etc.
 
    .. list-table:: Pretrained Checkpoints
       :header-rows: 1
@@ -87,6 +87,22 @@ Option 1: From Source Code
         - `sam-med2d_b.pth <https://drive.google.com/file/d/1ARiB5RkSsWmAB_8mqWnwDF8ZKTtFwsjl/view?usp=drive_link>`_
         - 1500M
         - 2.4G
+      * - SAM2
+        - `sam2_hiera_large.pt <https://huggingface.co/yatengLG/ISAT_with_segment_anything_checkpoints/resolve/main/sam2_hiera_large.pt>`_
+        - 4000M
+        - 900M
+      * - 
+        - `sam2_hiera_base_plus.pt <https://huggingface.co/yatengLG/ISAT_with_segment_anything_checkpoints/resolve/main/sam2_hiera_base_plus.pt>`_
+        - 4000M
+        - 324M
+      * - 
+        - `sam2_hiera_small.pt <https://huggingface.co/yatengLG/ISAT_with_segment_anything_checkpoints/resolve/main/sam2_hiera_small.pt>`_
+        - 3000M
+        - 185M
+      * - 
+        - `sam2_hiera_tiny.pt <https://huggingface.co/yatengLG/ISAT_with_segment_anything_checkpoints/resolve/main/sam2_hiera_tiny.pt>`_
+        - 2400M
+        - 156M
 
 4. **Run**
    Execute the main application:

docs/build/doctrees/usage.doctree

@@ -1,6 +1,6 @@
 const DOCUMENTATION_OPTIONS = {
     VERSION: '',
-    LANGUAGE: 'en',
+    LANGUAGE: 'EN',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',
     FILE_SUFFIX: '.html',

docs/build/html/_sources/features.rst.txt

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="writer-html5" lang="en" data-content_root="./">
+<html class="writer-html5" lang="EN" data-content_root="./">
 <head>
   <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
 
@@ -15,13 +15,13 @@
 
         <script src="_static/jquery.js?v=5d32c60e"></script>
         <script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
-        <script src="_static/documentation_options.js?v=5929fcd5"></script>
+        <script src="_static/documentation_options.js?v=8f91ca17"></script>
         <script src="_static/doctools.js?v=9a2dae69"></script>
         <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="_static/js/theme.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" />
-    <link rel="next" title="Usage" href="usage.html" />
+    <link rel="next" title="Installation" href="usage.html" />
     <link rel="prev" title="Welcome to ISAT-SAM’s documentation!" href="index.html" /> 
 </head>
 
@@ -84,7 +84,7 @@
 </li>
 </ul>
 </li>
-<li class="toctree-l1"><a class="reference internal" href="usage.html">Usage</a></li>
+<li class="toctree-l1"><a class="reference internal" href="usage.html">Installation</a></li>
 </ul>
 
         </div>
@@ -275,7 +275,7 @@ <h3>XOR (Symmetric Difference)<a class="headerlink" href="#xor-symmetric-differe
           </div>
           <footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
         <a href="index.html" class="btn btn-neutral float-left" title="Welcome to ISAT-SAM’s documentation!" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
-        <a href="usage.html" class="btn btn-neutral float-right" title="Usage" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
+        <a href="usage.html" class="btn btn-neutral float-right" title="Installation" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
     </div>
 
   <hr/>