Merge pull request #84 from C4dynamics/dev

1. replaced the yolo cfg with importtools. 2. generated a toml file.

Author: c4dynamics

.github/workflows/run-tests.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12"] # update also in setup.py install_requires and readme.md requirements
+        python-version: ["3.9", "3.10", "3.11", "3.12"] # update also in setup.py, pyprogect.yaml, readme.md 
 
     steps:
       - name: Checkout repository

c4dynamics/__init__.py

@@ -83,7 +83,7 @@
 #
 # version
 ##
-__version__ = '2.1.0'
+__version__ = '2.1.0' # update also in pyproject.toml
 
 
 #

c4dynamics/detectors/__init__.py

@@ -19,26 +19,6 @@
 
 if __name__ == "__main__":
 
-  # import doctest, contextlib
-  # from c4dynamics import IgnoreOutputChecker, cprint
-  
-  # # Register the custom OutputChecker
-  # doctest.OutputChecker = IgnoreOutputChecker
-
-  # tofile = False 
-  # optionflags = doctest.FAIL_FAST
-
-  # if tofile: 
-  #   with open(os.path.join('tests', '_out', 'output.txt'), 'w') as f:
-  #     with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f):
-  #       result = doctest.testmod(optionflags = optionflags) 
-  # else: 
-  #   result = doctest.testmod(optionflags = optionflags)
-
-  # if result.failed == 0:
-  #   cprint(os.path.basename(__file__) + ": all tests passed!", 'g')
-  # else:
-  #   print(f"{result.failed}")
   from c4dynamics import rundoctests
   rundoctests(sys.modules[__name__])
 

c4dynamics/detectors/yolo3_opencv.py

@@ -6,6 +6,7 @@
 from c4dynamics import c4d 
 from c4dynamics import pixelpoint 
 from typing import Optional
+import importlib.resources as resources 
 
 MODEL_SIZE = (416, 416, 3)
 
@@ -217,18 +218,13 @@ def __init__(self, weights_path: Optional[str] = None) -> None:
         weights_path = c4d.datasets.nn_model('YOLOv3')
         errormsg = "Try to clear the cache by 'c4dynamics.datasets.clear_cache()'"
 
-
-        
       if not os.path.exists(weights_path):
         raise FileNotFoundError(f"The file 'yolov3.weights' does not "
                                     f"exist in: '{weights_path}'. {errormsg}")
 
-
-      cfg_path  = os.path.join(os.path.dirname(__file__), 'yolov3.cfg')
-    #   cfg_path = 'yolov3.cfg'
-    #   coconames = os.path.join(yolodir, 'coco.names')
-
-      self.net = cv2.dnn.readNetFromDarknet(cfg_path, weights_path)
+      with resources.path('c4dynamics.detectors', 'yolov3.cfg') as cfgpath:
+        self.net = cv2.dnn.readNetFromDarknet(str(cfgpath), weights_path)
+      
       self.net.setPreferableBackend(cv2.dnn.DNN_BACKEND_OPENCV)
       ln = self.net.getLayerNames()
       self.ln = [ln[i - 1] for i in self.net.getUnconnectedOutLayers()]
@@ -661,26 +657,6 @@ def detect(self, frame: np.ndarray) -> list[pixelpoint]:
 
 if __name__ == "__main__":
 
-#   import doctest, contextlib
-#   from c4dynamics import IgnoreOutputChecker, cprint
-  
-#   # Register the custom OutputChecker
-#   doctest.OutputChecker = IgnoreOutputChecker
-
-#   tofile = False 
-#   optionflags = doctest.FAIL_FAST
-
-#   if tofile: 
-#     with open(os.path.join('tests', '_out', 'output.txt'), 'w') as f:
-#       with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f):
-#         result = doctest.testmod(optionflags = optionflags) 
-#   else: 
-#     result = doctest.testmod(optionflags = optionflags)
-
-#   if result.failed == 0:
-#     cprint(os.path.basename(__file__) + ": all tests passed!", 'g')
-#   else:
-#     print(f"{result.failed}")
   from c4dynamics import rundoctests
   rundoctests(sys.modules[__name__])
 

c4dynamics/detectors/yolo3_tf.py

@@ -7,26 +7,6 @@
 
 if __name__ == "__main__":
 
-  # import doctest, contextlib, os
-  # from c4dynamics import IgnoreOutputChecker, cprint
-  
-  # # Register the custom OutputChecker
-  # doctest.OutputChecker = IgnoreOutputChecker
-
-  # tofile = False 
-  # optionflags = doctest.FAIL_FAST
-
-  # if tofile: 
-  #   with open(os.path.join('tests', '_out', 'output.txt'), 'w') as f:
-  #     with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f):
-  #       result = doctest.testmod(optionflags = optionflags) 
-  # else: 
-  #   result = doctest.testmod(optionflags = optionflags)
-
-  # if result.failed == 0:
-  #   cprint(os.path.basename(__file__) + ": all tests passed!", 'g')
-  # else:
-  #   print(f"{result.failed}")
   from c4dynamics import rundoctests
   rundoctests(sys.modules[__name__])
 

c4dynamics/envs/__init__.py

@@ -188,30 +188,6 @@ def eqm6(rb: 'rigidbody', F: Union[np.ndarray, list], M: Union[np.ndarray, list]
 
 if __name__ == "__main__":
 
-  
-  # import  matplotlib
-  # matplotlib.use("TkAgg")   # keep interactive
-  # import matplotlib.pyplot as plt  
-
-  # import doctest, contextlib, os
-  # from c4dynamics import IgnoreOutputChecker, cprint
-  # # Register the custom OutputChecker
-  # doctest.OutputChecker = IgnoreOutputChecker
-
-  # tofile = False 
-  # optionflags = doctest.FAIL_FAST
-
-  # if tofile: 
-  #   with open(os.path.join('tests', '_out', 'output.txt'), 'w') as f:
-  #     with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f):
-  #       result = doctest.testmod(optionflags = optionflags) 
-  # else: 
-  #   result = doctest.testmod(optionflags = optionflags)
-
-  # if result.failed == 0:
-  #   cprint(os.path.basename(__file__) + ": all tests passed!", 'g')
-  # else:
-  #   print(f"{result.failed}")
   from c4dynamics import rundoctests
   rundoctests(sys.modules[__name__])
 

c4dynamics/eqm/derivs.py

@@ -335,26 +335,6 @@ def int6(rb: 'rigidbody', forces: Union[np.ndarray, list], moments: Union[np.nda
 
 if __name__ == "__main__":
 
-  # import doctest, contextlib, os
-  # from c4dynamics import IgnoreOutputChecker, cprint
-  
-  # # Register the custom OutputChecker
-  # doctest.OutputChecker = IgnoreOutputChecker
-
-  # tofile = False 
-  # optionflags = doctest.FAIL_FAST
-
-  # if tofile: 
-  #   with open(os.path.join('tests', '_out', 'output.txt'), 'w') as f:
-  #     with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f):
-  #       result = doctest.testmod(optionflags = optionflags) 
-  # else: 
-  #   result = doctest.testmod(optionflags = optionflags)
-
-  # if result.failed == 0:
-  #   cprint(os.path.basename(__file__) + ": all tests passed!", 'g')
-  # else:
-  #   print(f"{result.failed}")
   from c4dynamics import rundoctests
   rundoctests(sys.modules[__name__])
 

c4dynamics/eqm/integrate.py

@@ -114,27 +114,5 @@
 
 if __name__ == "__main__":
 
-  # import doctest, contextlib
-  # from c4dynamics import IgnoreOutputChecker, cprint
-  
-  # # Register the custom OutputChecker
-  # doctest.OutputChecker = IgnoreOutputChecker
-
-  # tofile = False 
-  # optionflags = doctest.FAIL_FAST
-
-  # if tofile: 
-  #   with open(os.path.join('tests', '_out', 'output.txt'), 'w') as f:
-  #     with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f):
-  #       result = doctest.testmod(optionflags = optionflags) 
-  # else: 
-  #   result = doctest.testmod(optionflags = optionflags)
-
-  # if result.failed == 0:
-  #   cprint(os.path.basename(__file__) + ": all tests passed!", 'g')
-  # else:
-  #   print(f"{result.failed}")
-
-
   from c4dynamics import rundoctests
   rundoctests(sys.modules[__name__])

c4dynamics/filters/__init__.py

@@ -293,26 +293,6 @@ def update(self, z: np.ndarray # type: ignore
 
 if __name__ == "__main__":
 
-  # import doctest, contextlib, os
-  # from c4dynamics import IgnoreOutputChecker, cprint
-  
-  # # Register the custom OutputChecker
-  # doctest.OutputChecker = IgnoreOutputChecker
-
-  # tofile = False 
-  # optionflags = doctest.FAIL_FAST
-
-  # if tofile: 
-  #   with open(os.path.join('tests', '_out', 'output.txt'), 'w') as f:
-  #     with contextlib.redirect_stdout(f), contextlib.redirect_stderr(f):
-  #       result = doctest.testmod(optionflags = optionflags) 
-  # else: 
-  #   result = doctest.testmod(optionflags = optionflags)
-
-  # if result.failed == 0:
-  #   cprint(os.path.basename(__file__) + ": all tests passed!", 'g')
-  # else:
-  #   print(f"{result.failed}")
   from c4dynamics import rundoctests
   rundoctests(sys.modules[__name__])