pyppbox 3.6b3__tar.gz → 3.6b5__tar.gz

{pyppbox-3.6b3 → pyppbox-3.6b5}/GETSTARTED.md

@@ -31,11 +31,13 @@ All requirements are not strictly limited. However, some specific modules might
   - On Linux:
     - For GPU:
       ```
+      python -m pip install tensorflow[and-cuda] # TensorFlow GPU
       pip install torch torchvision torchaudio
       pip install -r requirements.txt
       ```
     - For CPU-only:
       ```
+      python -m pip install tensorflow # TensorFlow CPU
       pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
       pip install -r requirements.txt
       ```
@@ -73,7 +75,7 @@ You need to install the main package which is `pyppbox` and the data for the mod
     ```
   - Or build from source:
     ```
-    pip install wheel build PyYAML
+    pip install setuptools wheel build PyYAML
     python -m build --wheel --skip-dependency-check --no-isolation
     ```
 
@@ -92,7 +94,7 @@ You need to install the main package which is `pyppbox` and the data for the mod
   - Download the latest from [releases](https://github.com/rathaumons/PoseTReID_DATASET/releases)
   - Or install directly:
     ```
-    pip install https://github.com/rathaumons/PoseTReID_DATASET/releases/download/v2.0/pyppbox_data_gta5-2.0-py3-none-any.whl
+    pip install https://github.com/numediart/PoseTReID_DATASET/releases/download/v2.0/pyppbox_data_gta5-2.0-py3-none-any.whl
     ```
 
 * Quick Test
@@ -110,9 +112,7 @@ You need to install the main package which is `pyppbox` and the data for the mod
     ```
   - For ***Ubuntu on WSL 2***, you need to install these:
     ```
-    sudo apt-get install libgl1-mesa-glx
-    sudo apt-get install xdg-utils
-    sudo apt-get install libegl1
+    sudo apt-get install libgl1-mesa-glx xdg-utils libegl1
     ```
 
 ## 📢 FYI

{pyppbox-3.6b3/pyppbox.egg-info → pyppbox-3.6b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyppbox
-Version: 3.6b3
+Version: 3.6b5
 Summary: Toolbox for people detecting, tracking, and re-identifying.
 Home-page: https://github.com/rathaumons/pyppbox
 Author: Ratha SIV
@@ -31,14 +31,13 @@ Classifier: Operating System :: MacOS
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Cython>=0.29.33
+Requires-Dist: Cython>=0.29.37
 Requires-Dist: numpy
 Requires-Dist: opencv-contrib-python
 Requires-Dist: scikit-image>=0.20.0
 Requires-Dist: scikit-learn>=1.2.2
 Requires-Dist: scipy>=1.10.0
 Requires-Dist: imageio
-Requires-Dist: imutils
 Requires-Dist: pandas
 Requires-Dist: Pillow
 Requires-Dist: psutil
@@ -56,8 +55,9 @@ Requires-Dist: torchaudio
 Requires-Dist: filterpy
 Requires-Dist: lapx
 Requires-Dist: PyQt6
+Requires-Dist: sfps
 Requires-Dist: pyppbox-torchreid
-Requires-Dist: pyppbox-ultralytics>=8.0.218
+Requires-Dist: vsensebox-ultralytics>=8.1.48
 
 # 🐍📦 [**pyppbox**](https://github.com/rathaumons/pyppbox)
 

{pyppbox-3.6b3 → pyppbox-3.6b5}/RELEASENOTES.md

@@ -12,7 +12,21 @@
 
 ## **pyppbox V3 - Make Simpler and Faster**
 
-* `pyppbox` [v3.6b3](https://github.com/rathaumons/pyppbox/tree/v3.6b3) - The Last V3
+* `pyppbox` [v3.6b5](https://github.com/rathaumons/pyppbox/tree/v3.6b5) - The Last V3
+
+  - Fix file filter in Torchreid GUI
+  - Switch from [`pyppbox-ultralytics`](https://github.com/rathaumons/ultralytics-for-pyppbox) to [`vsensebox-ultralytics`](https://github.com/numediart/ultralytics-for-vsensebox)
+  - **Known issue/limitation**:
+    - You tell me :)
+
+* `pyppbox` [v3.6b4](https://github.com/rathaumons/pyppbox/tree/v3.6b4) - ~~The Last V3~~
+
+  - Integrate [SFPS](https://github.com/rathaROG/smooth-fps) for better FPS calculation
+  - Update workflow
+  - **Known issue/limitation**:
+    - You tell me :)
+
+* `pyppbox` [v3.6b3](https://github.com/rathaumons/pyppbox/tree/v3.6b3) - ~~The Last V3~~
 
   - Fix typo and update workflow
   - **Known issue/limitation**:

{pyppbox-3.6b3 → pyppbox-3.6b5}/pyppbox/__init__.py

@@ -47,7 +47,7 @@ from pyppbox.gui.guitools import (
 )
 
 
-__version__ = '3.6b3'
+__version__ = '3.6b5'
 __author__ = 'Ratha SIV'
 __description__ = 'Toolbox for people detecting, tracking, and re-identifying.'
 __homepage__ = 'https://rathaumons.github.io/pyppbox'

{pyppbox-3.6b3 → pyppbox-3.6b5}/pyppbox/gui/guidemo.py

@@ -20,9 +20,8 @@
 
 
 import cv2
-import imutils.video
 
-from timeit import time
+from sfps import SFPS
 from pyppbox.gui.guihub import loadUITMP, loadInputTMP
 from pyppbox.utils.evatools import MyEVA
 from pyppbox.utils.restools import ResIO
@@ -74,14 +73,13 @@ cap = cv2.VideoCapture(joinFPathFull(getGlobalRootDir(), input_source))
 cap_width  = cap.get(cv2.CAP_PROP_FRAME_WIDTH)
 cap_height = cap.get(cv2.CAP_PROP_FRAME_HEIGHT)
 
-fps = 0.0
-fps_imutils = imutils.video.FPS().start()
+# Frame rate
+sfps = SFPS(nframes=7, interval=1)
 
 # Need frame_index for display
 frame_index = 0
 
 while cap.isOpened():
-    t1 = time.time()
     hasFrame, frame = cap.read()
     if hasFrame:
         # Resize frame if force HD
@@ -111,9 +109,7 @@ while cap.isOpened():
             img_is_mat=True
         )
         # Add framerate & info
-        fps_imutils.update()
-        fps = (fps + (1./((1.000000000001*time.time())-t1))) / 2
-        cv2.putText(visual_frame, str(int(fps)) + " | " + str(frame_index), (15, 30), 
+        cv2.putText(visual_frame, sfps.fps(format_spec='.0f') + " | " + str(frame_index), (15, 30), 
                     cv2.FONT_HERSHEY_COMPLEX_SMALL, 1, (255, 255, 255), 1, cv2.LINE_AA)
         
         # Show

{pyppbox-3.6b3 → pyppbox-3.6b5}/pyppbox/gui/ui_torchreid.py

@@ -190,7 +190,7 @@ class Ui_Torchreid(object):
 
     def browseModelPath(self):
         default_path = getAncestorDir(self.mycfg.rcfg_torchreid.model_path)
-        model_filter = "PyTorch model (*.pth;*.pyth;*.tar)"
+        model_filter = "PyTorch model (*.pth *.pyth *.tar *.*)"
         source_file, _ = QtWidgets.QFileDialog.getOpenFileName(None, "Model file", 
                                                                default_path, model_filter)
         if source_file:

{pyppbox-3.6b3 → pyppbox-3.6b5/pyppbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyppbox
-Version: 3.6b3
+Version: 3.6b5
 Summary: Toolbox for people detecting, tracking, and re-identifying.
 Home-page: https://github.com/rathaumons/pyppbox
 Author: Ratha SIV
@@ -31,14 +31,13 @@ Classifier: Operating System :: MacOS
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Cython>=0.29.33
+Requires-Dist: Cython>=0.29.37
 Requires-Dist: numpy
 Requires-Dist: opencv-contrib-python
 Requires-Dist: scikit-image>=0.20.0
 Requires-Dist: scikit-learn>=1.2.2
 Requires-Dist: scipy>=1.10.0
 Requires-Dist: imageio
-Requires-Dist: imutils
 Requires-Dist: pandas
 Requires-Dist: Pillow
 Requires-Dist: psutil
@@ -56,8 +55,9 @@ Requires-Dist: torchaudio
 Requires-Dist: filterpy
 Requires-Dist: lapx
 Requires-Dist: PyQt6
+Requires-Dist: sfps
 Requires-Dist: pyppbox-torchreid
-Requires-Dist: pyppbox-ultralytics>=8.0.218
+Requires-Dist: vsensebox-ultralytics>=8.1.48
 
 # 🐍📦 [**pyppbox**](https://github.com/rathaumons/pyppbox)
 

{pyppbox-3.6b3 → pyppbox-3.6b5}/pyppbox.egg-info/requires.txt

@@ -1,11 +1,10 @@
-Cython>=0.29.33
+Cython>=0.29.37
 numpy
 opencv-contrib-python
 scikit-image>=0.20.0
 scikit-learn>=1.2.2
 scipy>=1.10.0
 imageio
-imutils
 pandas
 Pillow
 psutil
@@ -23,5 +22,6 @@ torchaudio
 filterpy
 lapx
 PyQt6
+sfps
 pyppbox-torchreid
-pyppbox-ultralytics>=8.0.218
+vsensebox-ultralytics>=8.1.48

{pyppbox-3.6b3 → pyppbox-3.6b5}/requirements/requirements.txt

@@ -1,8 +1,8 @@
 ### Base
-Cython>=0.29.33
+Cython>=0.29.37
 numpy
 ### OpenCV
-# For GUI support, check:
+# For GPU support, check:
 # https://github.com/rathaumons/opencv-for-pyppbox
 opencv-contrib-python
 ### Common
@@ -10,7 +10,6 @@ scikit-image>=0.20.0
 scikit-learn>=1.2.2
 scipy>=1.10.0
 imageio
-imutils
 pandas
 Pillow
 psutil
@@ -36,9 +35,10 @@ filterpy
 lapx
 ### GUI
 PyQt6
+sfps
 ### Customized pyppbox-torchreid
 pyppbox-torchreid
-### Customized pyppbox-ultralytics
-pyppbox-ultralytics>=8.0.218
+### Customized vsensebox-ultralytics (pyppbox-ultralytics is discontinued)
+vsensebox-ultralytics>=8.1.48
 ### Unused
 # shapely