update py scripts and axcl x86 lib

.gitattributes

@@ -46,3 +46,4 @@ result.png filter=lfs diff=lfs merge=lfs -text
 host.jpg filter=lfs diff=lfs merge=lfs -text
 result_axcl.png filter=lfs diff=lfs merge=lfs -text
 result_host.jpg filter=lfs diff=lfs merge=lfs -text
+pyyoloworld/libyoloworld.so filter=lfs diff=lfs merge=lfs -text

install/lib/axcl_x86/libyoloworld.so

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d07d6349940db32177b87bf6fddd476b838ef26ab3184f7869e710ec7a39f7c
-size 1155448
+oid sha256:b6eaf2e52ce0de74de782b85b07163b5089c4e48ac77843349fc06152987c77a
+size 5534896

pyyoloworld/example.py

@@ -16,20 +16,28 @@ if __name__ == '__main__':
 
 
     # 枚举设备
+    dev_type = AxDeviceType.unknown_device
+    dev_id = -1
     devices_info = enum_devices()
     print("可用设备:", devices_info)
     if devices_info['host']['available']:
         print("host device available")
         sys_init(AxDeviceType.host_device, -1)
+        dev_type = AxDeviceType.host_device
+        dev_id = -1
     elif devices_info['devices']['count'] > 0:
         print("axcl device available, use device-0")
         sys_init(AxDeviceType.axcl_device, 0)
+        dev_type = AxDeviceType.axcl_device
+        dev_id = 0
     else:
         raise Exception("No available device")
 
     try:
         # 创建CLIP实例
         yw = YOLOWORLD({
+            'dev_type': dev_type,
+            'devid': dev_id,
             'text_encoder_path': args.tenc,
             'tokenizer_path': args.vocab,
             'yoloworld_path': args.yoloworld,

pyyoloworld/gradio_example.py

@@ -1,4 +1,6 @@
 import colorsys
+import re
+import subprocess
 import gradio as gr
 import cv2
 from pyaxdev import enum_devices, sys_init, sys_deinit, AxDeviceType
@@ -12,29 +14,47 @@ parser = argparse.ArgumentParser()
 parser.add_argument('--yoloworld', type=str, default='cnclip/cnclip_vit_l14_336px_vision_u16u8.axmodel')
 parser.add_argument('--tenc', type=str, default='cnclip/cnclip_vit_l14_336px_text_u16.axmodel')
 parser.add_argument('--vocab', type=str, default='cnclip/cn_vocab.txt')
-parser.add_argument('--dev_type', type=str, default='host', choices=['host', 'axcl'])
 args = parser.parse_args()
 
 # ========== 模型和设备初始化 ==========
+dev_type = AxDeviceType.unknown_device
+dev_id = -1
 devices_info = enum_devices()
-
+print("可用设备:", devices_info)
 if devices_info['host']['available']:
-    sys_init(AxDeviceType.host_device, 0)
-    device_type = AxDeviceType.host_device
-    device_id = -1
+    print("host device available")
+    sys_init(AxDeviceType.host_device, -1)
+    dev_type = AxDeviceType.host_device
+    dev_id = -1
 elif devices_info['devices']['count'] > 0:
+    print("axcl device available, use device-0")
     sys_init(AxDeviceType.axcl_device, 0)
-    device_type = AxDeviceType.axcl_device
-    device_id = 0
+    dev_type = AxDeviceType.axcl_device
+    dev_id = 0
 else:
     raise Exception("No available device")
 
 yw = YOLOWORLD({
-            'text_encoder_path': args.tenc,
-            'tokenizer_path': args.vocab,
-            'yoloworld_path': args.yoloworld,
-            'dev_tpye': args.dev_type
-        })
+        'dev_type': dev_type,
+        'devid': dev_id,
+        'text_encoder_path': args.tenc,
+        'tokenizer_path': args.vocab,
+        'yoloworld_path': args.yoloworld,
+    })
+
+
+def get_all_local_ips():
+    result = subprocess.run(['ip', 'a'], capture_output=True, text=True)
+    output = result.stdout
+
+    # 匹配所有IPv4
+    ips = re.findall(r'inet (\d+\.\d+\.\d+\.\d+)', output)
+
+    # 过滤掉回环地址
+    real_ips = [ip for ip in ips if not ip.startswith('127.')]
+
+    return real_ips
+
 
 def generate_vivid_colors(n):
     colors = []
@@ -102,5 +122,8 @@ with gr.Blocks() as demo:
         outputs=image_output
     )
 
+ips = get_all_local_ips()
+for ip in ips:
+    print(f"* Running on local URL:  http://{ip}:7860")
 # ========== 启动 ==========
 demo.launch(server_name="0.0.0.0")

pyyoloworld/libyoloworld.so

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6eaf2e52ce0de74de782b85b07163b5089c4e48ac77843349fc06152987c77a
+size 5534896

pyyoloworld/pyyoloworld.py

@@ -71,7 +71,7 @@ class YOLOWORLD:
         self.init_info = YWInit()
         
         # 设置初始化参数
-        self.init_info.dev_type = init_info.get('dev_type', AxDeviceType.host_device)
+        self.init_info.dev_type = init_info.get('dev_type', AxDeviceType.axcl_device)
         self.init_info.devid = init_info.get('devid', 0)
         self.init_info.threshold = init_info.get('threshold', 0.1)