Merge branch 'master' of https://github.com/wuhanstudio/whitebox-adve…

…rsarial-toolbox
wuhanstudio · Nov 22, 2023 · c54131e · c54131e
2 parents 33ac4f9 + aca5a50
commit c54131e
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -24,8 +24,9 @@ jobs:
           python-version: '3.11'
 
       # ADJUST THIS: install all dependencies (including pdoc)
-      - run: pip install pdoc pytest lark
-      - run: pip install -e .
+      - run: python3 -m pip install --upgrade pip
+      - run: python3 -m pip install pdoc pytest lark carla
+      - run: python3 -m pip install -e .
       # ADJUST THIS: build your documentation into docs/.
       # We use a custom build script for pdoc itself, ideally you just run `pdoc -o docs/ ...` here.
       - run: pytest
diff --git a/examples/attack/.gitignore b/examples/attack/.gitignore
@@ -1,6 +1,5 @@
 models/
 logs/
-noise/
 *.pth
 *.avi
 *.npy

diff --git a/examples/attack/noise/.gitignore b/examples/attack/noise/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/examples/inference/faster_rcnn_demo.py b/examples/inference/faster_rcnn_demo.py
@@ -38,7 +38,7 @@
 device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
 
 model = FasterRCNN(device=device)
-model.load(os.path.join(WHAT_MODEL_PATH, what_model_list[8][WHAT_MODEL_FILE_INDEX]), map_location=device)
+model.load(os.path.join(WHAT_MODEL_PATH, WHAT_MODEL_FILE), map_location=device)
 
 while True:
     _, orig_image = cap.read()

diff --git a/examples/inference/mobilenet_v1_ssd_demo.py b/examples/inference/mobilenet_v1_ssd_demo.py
@@ -35,7 +35,7 @@
              WHAT_MODEL_HASH)
 
 # Initialize the model
-model = MobileNetV1SSD(os.path.join(WHAT_MODEL_PATH, what_model_list[index][WHAT_MODEL_FILE_INDEX]),
+model = MobileNetV1SSD(os.path.join(WHAT_MODEL_PATH, WHAT_MODEL_FILE),
                        VOC_CLASS_NAMES,
                        is_test=True,
                        device=device)

diff --git a/examples/inference/mobilenet_v2_ssd_lite_demo.py b/examples/inference/mobilenet_v2_ssd_lite_demo.py
@@ -35,7 +35,7 @@
              WHAT_MODEL_HASH)
 
 # Initialize the model
-model = MobileNetV2SSDLite(os.path.join(WHAT_MODEL_PATH, what_model_list[index][WHAT_MODEL_FILE_INDEX]),
+model = MobileNetV2SSDLite(os.path.join(WHAT_MODEL_PATH, WHAT_MODEL_FILE),
                            VOC_CLASS_NAMES,
                            is_test=True,
                            device=device)

diff --git a/examples/inference/yolov3_demo.py b/examples/inference/yolov3_demo.py
@@ -34,7 +34,7 @@
              WHAT_YOLOV3_MODEL_HASH)
 
 # MobileNet
-model = YOLOV3(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, what_yolov3_model_list[index][WHAT_MODEL_FILE_INDEX]))
+model = YOLOV3(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, WHAT_YOLOV3_MODEL_FILE))
 
 # You can also use your own model
 # model = YOLOV3(COCO_CLASS_NAMES, "models/yolov3.h5")

diff --git a/examples/inference/yolov3_tiny_demo.py b/examples/inference/yolov3_tiny_demo.py
@@ -34,7 +34,7 @@
              WHAT_YOLOV3_MODEL_HASH)
 
 # Check what_model_list for all supported models
-model = YOLOV3_TINY(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, what_yolov3_model_list[index][WHAT_MODEL_FILE_INDEX]))
+model = YOLOV3_TINY(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, WHAT_YOLOV3_MODEL_FILE))
 
 # You can also use your own model
 # model = YOLOV3_TINY(COCO_CLASS_NAMES, "models/yolov3-tiny.h5")

diff --git a/examples/inference/yolov4_demo.py b/examples/inference/yolov4_demo.py
@@ -34,7 +34,7 @@
              WHAT_YOLOV4_MODEL_HASH)
 
 # Darknet
-model = YOLOV4(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, what_yolov4_model_list[index][WHAT_MODEL_FILE_INDEX]))
+model = YOLOV4(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, WHAT_YOLOV4_MODEL_FILE))
 
 # You can also use your own model
 # model = YOLOV4(COCO_CLASS_NAMES, "models/yolov4.h5")

diff --git a/examples/inference/yolov4_tiny_demo.py b/examples/inference/yolov4_tiny_demo.py
@@ -34,7 +34,7 @@
              WHAT_YOLOV4_MODEL_HASH)
 
 # Darknet
-model = YOLOV4_TINY(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, what_yolov4_model_list[index][WHAT_MODEL_FILE_INDEX]))
+model = YOLOV4_TINY(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, WHAT_YOLOV4_MODEL_FILE))
 
 # You can also use your own model
 # model = YOLOV4_TINY(COCO_CLASS_NAMES, "models/yolov4-tiny.h5")

diff --git a/what/examples/yolov3_demo.py b/what/examples/yolov3_demo.py
@@ -41,10 +41,10 @@ def yolov3_inference_demo():
                 WHAT_YOLOV3_MODEL_HASH)
 
     if index == 0 or index == 1:
-        model = YOLOV3(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, what_yolov3_model_list[index][WHAT_MODEL_FILE_INDEX]))
+        model = YOLOV3(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, WHAT_YOLOV3_MODEL_FILE))
 
     if index == 2 or index == 3:
-        model = YOLOV3_TINY(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, what_yolov3_model_list[index][WHAT_MODEL_FILE_INDEX]))
+        model = YOLOV3_TINY(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, WHAT_YOLOV3_MODEL_FILE))
 
     video = input(f"Please input the OpenCV capture device (e.g. 0, 1, 2): ")
 

diff --git a/what/examples/yolov4_demo.py b/what/examples/yolov4_demo.py
@@ -41,10 +41,10 @@ def yolov4_inference_demo():
                 WHAT_YOLOV4_MODEL_HASH)
 
     if index == 0:
-        model = YOLOV4(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, what_yolov4_model_list[index][WHAT_MODEL_FILE_INDEX]))
+        model = YOLOV4(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, WHAT_YOLOV4_MODEL_FILE))
 
     if index == 1:
-        model = YOLOV4_TINY(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, what_yolov4_model_list[index][WHAT_MODEL_FILE_INDEX]))
+        model = YOLOV4_TINY(COCO_CLASS_NAMES, os.path.join(WHAT_MODEL_PATH, WHAT_YOLOV4_MODEL_FILE))
 
     video = input(f"Please input the OpenCV capture device (e.g. 0, 1, 2): ")
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     models/
     logs/
-    noise/
     *.pth
     *.avi
     *.npy
@@ Expand Down @@