From 7c768081d311b495b4973267bf78c5901790bc0e Mon Sep 17 00:00:00 2001 From: lifangtian Date: Fri, 13 Jun 2025 01:34:44 +0000 Subject: [PATCH 01/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/foundatio?= =?UTF-8?q?n=5Fmodels/Chinese=5FCLIP/README.md=EF=BC=9A=E6=9B=B4=E6=96=B0m?= =?UTF-8?q?sit=E5=AE=89=E8=A3=85=E7=9A=84=E7=AC=94=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9msit=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=98=AF=E5=90=A6=E6=88=90=E5=8A=9F=E7=9A=84?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/README.md b/ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/README.md index 05538e637e..60d0ccca74 100644 --- a/ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/README.md +++ b/ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/README.md @@ -101,7 +101,8 @@ Chinese_CLIP为CLIP模型的中文版本,使用大规模中文数据进行训 注意:onnxsim版本必须大于等于0.4.x。 -4. 请访问[msit代码仓](https://gitee.com/ascend/msit/tree/master/msit/),根据readme文档进行工具安装。可只安装需要的组件:debug surgeon,其他组件为可选安装 + +4. 请访问[msit代码仓](https://gitee.com/ascend/msit/tree/master/msit/),根据readme文档进行工具安装。可只安装需要的组件:benchmark surgeon,其他组件为可选安装。安装完成后使用`msit check all`,刚才安装的组件下显示OK说明安装成功 5. 设置环境变量。 -- Gitee From 4f6481687f860aba6129834fe4a363e145451a33 Mon Sep 17 00:00:00 2001 From: lifangtian Date: Fri, 13 Jun 2025 01:50:32 +0000 Subject: [PATCH 02/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/foundatio?= =?UTF-8?q?n=5Fmodels/Chinese=5FCLIP/requirements.txt=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86aisbench=E6=89=80=E9=9C=80=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- .../built-in/foundation_models/Chinese_CLIP/requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/requirements.txt b/ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/requirements.txt index 398e44ddac..645d57694b 100644 --- a/ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/requirements.txt +++ b/ACL_PyTorch/built-in/foundation_models/Chinese_CLIP/requirements.txt @@ -3,4 +3,6 @@ onnxsim==0.4.33 onnxmltools==1.11.1 torch==1.11.0 torchvision==0.14.1 - +decorator +attrs +psutil -- Gitee From 877dbf81b4d578f2f63c9ceade9b780f71ef4a8b Mon Sep 17 00:00:00 2001 From: lifangtian Date: Mon, 16 Jun 2025 00:57:24 +0000 Subject: [PATCH 03/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/R?= =?UTF-8?q?EADME.md=EF=BC=9A=E8=B5=84=E6=96=99=E6=95=B4=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8git=20reset=E6=9B=BF=E6=8D=A2git=20checkout?= =?UTF-8?q?=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/README.md b/ACL_PyTorch/built-in/cv/GLIP/README.md index a450f96877..2863364e50 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/README.md +++ b/ACL_PyTorch/built-in/cv/GLIP/README.md @@ -83,7 +83,7 @@ CLIP和ALIGN在大规模图像-文本对上进行跨模态对比学习,可以 ``` git clone https://github.com/microsoft/GLIP.git cd GLIP - git checkout master + git reset --hard a5f302bfd4c5c67010e29f779e3b0bde94e89985 cd .. ``` -- Gitee From 6e5ca5b0c7adc7c3ea1f4a39261eb50981be9b3a Mon Sep 17 00:00:00 2001 From: lifangtian Date: Mon, 16 Jun 2025 01:47:30 +0000 Subject: [PATCH 04/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/r?= =?UTF-8?q?equirement.txt=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/requirement.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/requirement.txt b/ACL_PyTorch/built-in/cv/GLIP/requirement.txt index 15874dc5b6..c3fd931f05 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/requirement.txt +++ b/ACL_PyTorch/built-in/cv/GLIP/requirement.txt @@ -8,4 +8,7 @@ timm==0.6.13 yacs==0.1.8 transformers==4.30.2 einops -prettytable \ No newline at end of file +prettytable +numpy==1.26.4 +opencv-python +ftfy \ No newline at end of file -- Gitee From d7320473d6361177da1355264457facdec94547f Mon Sep 17 00:00:00 2001 From: lifangtian Date: Mon, 16 Jun 2025 02:04:23 +0000 Subject: [PATCH 05/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/p?= =?UTF-8?q?th2onnx.py=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AF=B9numpy.float?= =?UTF-8?q?=E7=9A=84=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py b/ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py index a7a88917e5..5322997e65 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py +++ b/ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py @@ -15,6 +15,8 @@ import argparse import os import numpy as np +if not hasattr(np, 'float'): + np.float = np.float64 import torch import onnx from torch import nn -- Gitee From 4bb25252aa8d688650566ca1dca42fa4bf077389 Mon Sep 17 00:00:00 2001 From: lifangtian Date: Mon, 16 Jun 2025 02:22:04 +0000 Subject: [PATCH 06/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/R?= =?UTF-8?q?EADME.md=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=80=E9=9C=80=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/README.md b/ACL_PyTorch/built-in/cv/GLIP/README.md index 2863364e50..193192c9ed 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/README.md +++ b/ACL_PyTorch/built-in/cv/GLIP/README.md @@ -118,14 +118,14 @@ CLIP和ALIGN在大规模图像-文本对上进行跨模态对比学习,可以 ## 准备数据集 1. 获取原始数据集。(解压命令参考tar –xvf \*.tar与 unzip \*.zip) - 本模型支持coco2014验证集。用户需自行获取数据集(或给出明确下载链接),将annotation文件夹和val2014文件夹解压并上传数据集到源码包路径下。目录结构如下: + 本模型支持coco2017验证集。用户需自行获取[数据集](http://images.cocodataset.org/zips/val2017.zip)与[标注文件](http://images.cocodataset.org/annotations/annotations_trainval2017.zip),将annotations_trainval2017.zip和val2017.zip上传并解压到如下目录结构: ``` GLIP └── DATASET └── coco ├── annotations - └── val2014 + └── val2017 ``` -- Gitee From 2aea0cb41cbedcfb52882211c51431e9025c03f9 Mon Sep 17 00:00:00 2001 From: lifangtian Date: Mon, 16 Jun 2025 03:13:40 +0000 Subject: [PATCH 07/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/R?= =?UTF-8?q?EADME.md=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E9=85=8D=E7=BD=AE=E8=84=9A=E6=9C=AC=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/README.md b/ACL_PyTorch/built-in/cv/GLIP/README.md index 193192c9ed..ac61f83037 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/README.md +++ b/ACL_PyTorch/built-in/cv/GLIP/README.md @@ -175,7 +175,8 @@ CLIP和ALIGN在大规模图像-文本对上进行跨模态对比学习,可以 1. 配置环境变量。 ``` - source /usr/local/Ascend/...... + source /usr/local/Ascend/ascend-toolkit/set_env.sh #默认位置;须按脚本实际位置使用 + ``` 2. 执行命令查看芯片名称($\{chip\_name\})。 -- Gitee From 2e773570deb7c57e3b822cd68c5129116ac2119f Mon Sep 17 00:00:00 2001 From: lifangtian Date: Mon, 16 Jun 2025 03:17:07 +0000 Subject: [PATCH 08/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/r?= =?UTF-8?q?equirement.txt=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/requirement.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/requirement.txt b/ACL_PyTorch/built-in/cv/GLIP/requirement.txt index c3fd931f05..1bb6f63bd6 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/requirement.txt +++ b/ACL_PyTorch/built-in/cv/GLIP/requirement.txt @@ -11,4 +11,8 @@ einops prettytable numpy==1.26.4 opencv-python -ftfy \ No newline at end of file +ftfy +decorator +psutil +sympy +scipy \ No newline at end of file -- Gitee From f6c7c844ab1ce85e4e6a931534c821660e503545 Mon Sep 17 00:00:00 2001 From: lifangtian Date: Mon, 16 Jun 2025 03:17:33 +0000 Subject: [PATCH 09/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/r?= =?UTF-8?q?equirement.txt=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/requirement.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/requirement.txt b/ACL_PyTorch/built-in/cv/GLIP/requirement.txt index 1bb6f63bd6..7669f045ee 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/requirement.txt +++ b/ACL_PyTorch/built-in/cv/GLIP/requirement.txt @@ -15,4 +15,5 @@ ftfy decorator psutil sympy -scipy \ No newline at end of file +scipy +attrs \ No newline at end of file -- Gitee From 2912fcabd4346def20ba2eb06c22aea025d6a0e2 Mon Sep 17 00:00:00 2001 From: lifangtian Date: Mon, 16 Jun 2025 11:28:10 +0000 Subject: [PATCH 10/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/R?= =?UTF-8?q?EADME.md=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=AE=89=E8=A3=85m?= =?UTF-8?q?sit=E5=B7=A5=E5=85=B7=E7=9A=84=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/README.md b/ACL_PyTorch/built-in/cv/GLIP/README.md index ac61f83037..9eac04718b 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/README.md +++ b/ACL_PyTorch/built-in/cv/GLIP/README.md @@ -61,7 +61,7 @@ CLIP和ALIGN在大规模图像-文本对上进行跨模态对比学习,可以 | ------------------------------------------------------------ | ------- | ------------------------------------------------------------ | | 固件与驱动 | 22.0.2 | [Pytorch框架推理环境准备](https://www.hiascend.com/document/detail/zh/ModelZoo/pytorchframework/pies) | | CANN | 7.0.T800 | - | - | Python | 3.7.5 | - | + | Python | 3.9 | - | | PyTorch | 1.13.1 | - | | 说明:Atlas 300I Duo 推理卡请以CANN版本选择实际固件与驱动版本。 | \ | \ | @@ -223,7 +223,7 @@ CLIP和ALIGN在大规模图像-文本对上进行跨模态对比学习,可以 1. 安装msit推理工具。 - 请访问[msit推理工具](https://gitee.com/ascend/msit/tree/master/msit/)代码仓,根据readme文档进行工具安装。 + 请访问[msit推理工具](https://gitee.com/ascend/msit/tree/master/msit/)代码仓,根据readme文档安装benchmark组件。安装完后可以使用`msit check all`看安装的组件下是否显示OK来判断是否成功安装。 2. 执行推理。 -- Gitee From 5ce2463ebdfcb94aded3c2afc52e39bbe1c4def7 Mon Sep 17 00:00:00 2001 From: lifangtian Date: Tue, 17 Jun 2025 01:11:17 +0000 Subject: [PATCH 11/17] update ACL_PyTorch/built-in/cv/GLIP/inference.py. Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/inference.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ACL_PyTorch/built-in/cv/GLIP/inference.py b/ACL_PyTorch/built-in/cv/GLIP/inference.py index d2a12732e5..60ad82780a 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/inference.py +++ b/ACL_PyTorch/built-in/cv/GLIP/inference.py @@ -17,6 +17,8 @@ import os import functools import numpy as np +if not hasattr(np, 'float'): + np.float = np.float64 import torch from torch import nn from tqdm import tqdm -- Gitee From c954069fd1c64bc30fed469dbc95e4901ac62016 Mon Sep 17 00:00:00 2001 From: lifangtian Date: Tue, 17 Jun 2025 01:13:53 +0000 Subject: [PATCH 12/17] =?UTF-8?q?update=20ACL=5FPyTorch/built-in/cv/GLIP/R?= =?UTF-8?q?EADME.md=EF=BC=9A=E4=BF=AE=E6=94=B9ONNX=E8=BD=ACOM=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E4=B8=AD=E7=9A=84=E8=8A=AF=E7=89=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=BA${chip=5Fname}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/README.md b/ACL_PyTorch/built-in/cv/GLIP/README.md index 9eac04718b..6c990a5dbc 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/README.md +++ b/ACL_PyTorch/built-in/cv/GLIP/README.md @@ -200,11 +200,11 @@ CLIP和ALIGN在大规模图像-文本对上进行跨模态对比学习,可以 3. 执行ATC命令。 ``` - atc --model="./backbone/model/glip_backbone.onnx" --output=./backbone/model/glip_backbone --framework=5 --soc_version=Ascend310P3 --input_shape_range="images:[1,3,300~1400,500~1400]" + atc --model="./backbone/model/glip_backbone.onnx" --output=./backbone/model/glip_backbone --framework=5 --soc_version=Ascend${chip_name} --input_shape_range="images:[1,3,300~1400,500~1400]" - atc --model="./select/model/glip_select.onnx" --output=./select/model/glip_select --framework=5 --soc_version=Ascend310P3 --input_shape_range="input_1:[1,256,40~200,60~200];input_2:[1,256,20~100,30~100];input_3:[1,256,10~50,15~50];input_4:[1,256,5~25,7~25];input_5:[1,256,3~15,4~15]" + atc --model="./select/model/glip_select.onnx" --output=./select/model/glip_select --framework=5 --soc_version=Ascend${chip_name} --input_shape_range="input_1:[1,256,40~200,60~200];input_2:[1,256,20~100,30~100];input_3:[1,256,10~50,15~50];input_4:[1,256,5~25,7~25];input_5:[1,256,3~15,4~15]" - atc --model="./rpn_head/model/glip_rpn_head_new.onnx" --output=./rpn_head/model/glip_rpn_head --framework=5 --soc_version=Ascend310P3 --input_shape_range="feature_1:[1,256,40~200,60~200];feature_2:[1,256,20~100,30~100];feature_3:[1,256,10~50,15~50];feature_4:[1,256,5~25,7~25];feature_5:[1,256,3~15,4~15]" --fusion_switch_file=./rpn_head/model/fusion_switch.cfg + atc --model="./rpn_head/model/glip_rpn_head_new.onnx" --output=./rpn_head/model/glip_rpn_head --framework=5 --soc_version=Ascend${chip_name} --input_shape_range="feature_1:[1,256,40~200,60~200];feature_2:[1,256,20~100,30~100];feature_3:[1,256,10~50,15~50];feature_4:[1,256,5~25,7~25];feature_5:[1,256,3~15,4~15]" --fusion_switch_file=./rpn_head/model/fusion_switch.cfg ``` - 参数说明: -- Gitee From 5f626334734444437ea64d534ce4f2d9f4ed24b2 Mon Sep 17 00:00:00 2001 From: lifangtian Date: Tue, 17 Jun 2025 08:47:30 +0000 Subject: [PATCH 13/17] update ACL_PyTorch/built-in/cv/GLIP/requirement.txt. Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/requirement.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/requirement.txt b/ACL_PyTorch/built-in/cv/GLIP/requirement.txt index 7669f045ee..23d549d40c 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/requirement.txt +++ b/ACL_PyTorch/built-in/cv/GLIP/requirement.txt @@ -2,7 +2,6 @@ onnx torch==1.13.1 tqdm==4.62.3 pycocotools==2.0.7 -pyacl==1.0.0 torchvision==0.14.1 timm==0.6.13 yacs==0.1.8 -- Gitee From 36ab021ce35c1fec96969bc525891f490c2a8f3a Mon Sep 17 00:00:00 2001 From: lifangtian Date: Thu, 19 Jun 2025 01:59:19 +0000 Subject: [PATCH 14/17] update ACL_PyTorch/built-in/cv/GLIP/inference.py. Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/inference.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/inference.py b/ACL_PyTorch/built-in/cv/GLIP/inference.py index 60ad82780a..21f0c46e9c 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/inference.py +++ b/ACL_PyTorch/built-in/cv/GLIP/inference.py @@ -17,8 +17,6 @@ import os import functools import numpy as np -if not hasattr(np, 'float'): - np.float = np.float64 import torch from torch import nn from tqdm import tqdm @@ -37,6 +35,9 @@ from maskrcnn_benchmark.data.datasets.evaluation import evaluate from maskrcnn_benchmark.modeling.rpn.anchor_generator import make_anchor_generator_complex +if not hasattr(np, 'float'): + np.float = np.float64 + class postprocess(nn.Module): def __init__(self, cfg): super(postprocess, self).__init__() -- Gitee From acf1a3bf21f6db641569066470142d587ceaf28d Mon Sep 17 00:00:00 2001 From: lifangtian Date: Thu, 19 Jun 2025 01:59:42 +0000 Subject: [PATCH 15/17] update ACL_PyTorch/built-in/cv/GLIP/README.md. Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/README.md b/ACL_PyTorch/built-in/cv/GLIP/README.md index 6c990a5dbc..3a4cd8f6d8 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/README.md +++ b/ACL_PyTorch/built-in/cv/GLIP/README.md @@ -176,7 +176,6 @@ CLIP和ALIGN在大规模图像-文本对上进行跨模态对比学习,可以 ``` source /usr/local/Ascend/ascend-toolkit/set_env.sh #默认位置;须按脚本实际位置使用 - ``` 2. 执行命令查看芯片名称($\{chip\_name\})。 -- Gitee From 61f1d0d623881aa36a63e4c280df422118a596fd Mon Sep 17 00:00:00 2001 From: lifangtian Date: Thu, 19 Jun 2025 02:08:30 +0000 Subject: [PATCH 16/17] update ACL_PyTorch/built-in/cv/GLIP/inference.py. Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/inference.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ACL_PyTorch/built-in/cv/GLIP/inference.py b/ACL_PyTorch/built-in/cv/GLIP/inference.py index 21f0c46e9c..81d70586e5 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/inference.py +++ b/ACL_PyTorch/built-in/cv/GLIP/inference.py @@ -38,6 +38,7 @@ from maskrcnn_benchmark.modeling.rpn.anchor_generator import make_anchor_generat if not hasattr(np, 'float'): np.float = np.float64 + class postprocess(nn.Module): def __init__(self, cfg): super(postprocess, self).__init__() -- Gitee From 89dba04015559fd4fe6409635eda6e6c8c35f4bb Mon Sep 17 00:00:00 2001 From: lifangtian Date: Thu, 19 Jun 2025 02:08:52 +0000 Subject: [PATCH 17/17] update ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py. Signed-off-by: lifangtian --- ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py b/ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py index 5322997e65..4e09ff4680 100644 --- a/ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py +++ b/ACL_PyTorch/built-in/cv/GLIP/pth2onnx.py @@ -15,8 +15,6 @@ import argparse import os import numpy as np -if not hasattr(np, 'float'): - np.float = np.float64 import torch import onnx from torch import nn @@ -31,6 +29,10 @@ from maskrcnn_benchmark.modeling.language_backbone import build_language_backbon from transformers import AutoTokenizer +if not hasattr(np, 'float'): + np.float = np.float64 + + class lang(nn.Module): def __init__(self, cfg): super(lang, self).__init__() -- Gitee