Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions .github/workflows/so_denpency_analyzer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,13 @@ jobs:
- "TagBuild-Training-Linux-Gpu-Cuda11.8-Cudnn8.6-Mkl-Avx-Gcc8.2-SelfBuiltPypiUse"
- "TagBuild-Training-Linux-Cpu-Mkl-Avx-Gcc82-SelfBuiltPypiUse"
- "TagBuild-Training-Linux-Cpu-ARM-SelfBuiltPypiUse"
- "TagBuild-Training-Linux-Gpu-Cuda12.6-Cudnn9.5-Trt10.5-Mkl-Avx-Gcc11-SelfBuiltPypiUse"
python_version: ["3.8", "3.10", "3.13"]
is_cuda: ["True", "False"]
exclude:
- ce_task_name: "TagBuild-Training-Linux-Cpu-Mkl-Avx-Gcc82-SelfBuiltPypiUse"
is_cuda: "True"
- ce_task_name: "TagBuild-Training-Linux-Cpu-ARM-SelfBuiltPypiUse"
is_cuda: "True"
- ce_task_name: "TagBuild-Training-Linux-Gpu-Cuda12.6-Cudnn9.5-Trt10.5-Mkl-Avx-Gcc11-SelfBuiltPypiUse"
is_cuda: "False"
- ce_task_name: "TagBuild-Training-Linux-Gpu-Cuda11.8-Cudnn8.6-Mkl-Avx-Gcc8.2-SelfBuiltPypiUse"
is_cuda: "False"
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ inference:python/predict_cls.py -c configs/inference_cls.yaml
-o Global.enable_mkldnn:False
-o Global.cpu_num_threads:1
-o Global.batch_size:1
-o Global.use_tensorrt:False
-o Global.use_fp16:False
-o Global.inference_model_dir:../inference
-o Global.infer_imgs:../dataset/ILSVRC2012/val/ILSVRC2012_val_00000001.JPEG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ inference:null
--enable_mkldnn:False
--cpu_threads:1|6
--batchsize:10
--enable_tensorRT:False
--precision:fp32
--model_dir:
--data_dir:test_tipc/data/infer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ inference:null
--enable_mkldnn:False
--cpu_threads:1|6
--batchsize:10
--enable_tensorRT:False
--precision:fp32
--model_dir:
--data_dir:test_tipc/data/infer
Expand All @@ -56,4 +55,4 @@ epoch:1
run_mode:PGLBOX
fp_items:null
device_num:N1C8|N2C16
gpu_config:models/graph/lightgcn.yaml
gpu_config:models/graph/lightgcn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ inference:null
--enable_mkldnn:False
--cpu_threads:1|6
--batchsize:10
--enable_tensorRT:False
--precision:fp32
--model_dir:
--data_dir:test_tipc/data/infer
Expand All @@ -56,4 +55,4 @@ epoch:1
run_mode:PGLBOX
fp_items:null
device_num:N1C8|N2C16
gpu_config:models/graph/transformer_conv.yaml
gpu_config:models/graph/transformer_conv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class LayerCase(nn.Layer):
return_idx (list): Index of stages whose feature maps are returned.
"""

__shared__ = ['depth_mult', 'width_mult', 'act', 'trt']
__shared__ = ['depth_mult', 'width_mult', 'act']

# in_channels, out_channels, num_blocks, add_shortcut, use_spp(use_sppf)
# 'X' means setting used in YOLOX, 'P5/P6' means setting used in YOLOv5.
Expand All @@ -302,7 +302,6 @@ def __init__(self,
width_mult=1.0,
depthwise=False,
act='silu',
trt=False,
return_idx=[2, 3, 4]):
super(LayerCase, self).__init__()
self.arch = arch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,10 @@ def silu(x):
return F.silu(x)


def swish(x):
return x * F.sigmoid(x)


TRT_ACT_SPEC = {'swish': swish, 'silu': swish}

ACT_SPEC = {'mish': mish, 'silu': silu}


def get_act_fn(act=None, trt=False):
def get_act_fn(act=None):
assert act is None or isinstance(act, (
str, dict)), 'name of activation should be str, dict or None'
if not act:
Expand All @@ -44,9 +38,7 @@ def get_act_fn(act=None, trt=False):
name = act
kwargs = dict()

if trt and name in TRT_ACT_SPEC:
fn = TRT_ACT_SPEC[name]
elif name in ACT_SPEC:
if name in ACT_SPEC:
fn = ACT_SPEC[name]
else:
fn = getattr(F, name)
Expand Down Expand Up @@ -251,7 +243,7 @@ def forward(self, x):


class LayerCase(nn.Layer):
__shared__ = ['width_mult', 'depth_mult', 'trt']
__shared__ = ['width_mult', 'depth_mult']

def __init__(self,
layers=[3, 6, 6, 3],
Expand All @@ -262,17 +254,15 @@ def __init__(self,
use_large_stem=False,
width_mult=1.0,
depth_mult=1.0,
trt=False,
use_checkpoint=False,
use_alpha=False,
**args):
super(LayerCase, self).__init__()
self.use_checkpoint = use_checkpoint
channels = [max(round(c * width_mult), 1) for c in channels]
layers = [max(round(l * depth_mult), 1) for l in layers]
act = get_act_fn(
act, trt=trt) if act is None or isinstance(act,
(str, dict)) else act
act = get_act_fn(act) if act is None or isinstance(act,
(str, dict)) else act

if use_large_stem:
self.stem = nn.Sequential(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,10 @@ def silu(x):
return F.silu(x)


def swish(x):
return x * F.sigmoid(x)


TRT_ACT_SPEC = {'swish': swish, 'silu': swish}

ACT_SPEC = {'mish': mish, 'silu': silu}


def get_act_fn(act=None, trt=False):
def get_act_fn(act=None):
assert act is None or isinstance(act, (
str, dict)), 'name of activation should be str, dict or None'
if not act:
Expand All @@ -43,9 +37,7 @@ def get_act_fn(act=None, trt=False):
name = act
kwargs = dict()

if trt and name in TRT_ACT_SPEC:
fn = TRT_ACT_SPEC[name]
elif name in ACT_SPEC:
if name in ACT_SPEC:
fn = ACT_SPEC[name]
else:
fn = getattr(F, name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ csp_darknet_CSPDarkNet_0:
width_mult: 1.0
depthwise: False
act: 'silu'
trt: False
return_idx: [2, 3, 4]
DataGenerator:
DataGenerator_name: "diy.data.struct_img_dataset.DictImageWithoutLabel"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ cspresnet_CSPResNet_0:
use_large_stem: False
width_mult: 1.0
depth_mult: 1.0
trt: False
use_checkpoint: False
use_alpha: False
DataGenerator:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ custom_pan_CustomCSPPAN_0:
data_format: 'NCHW'
width_mult: 1.0
depth_mult: 1.0
trt: False
DataGenerator:
DataGenerator_name: "diy.data.single_img_dataset.SingleImageWithoutLabel"
data:
Expand Down Expand Up @@ -210,7 +209,6 @@ custom_pan_CustomCSPPAN_1:
data_format: 'NCHW'
width_mult: 1.0
depth_mult: 1.0
trt: False
DataGenerator:
DataGenerator_name: "diy.data.single_img_dataset.SingleImageWithoutLabel"
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,6 @@ yolo_fpn_YOLOCSPPAN_0:
depthwise: False
data_format: 'NCHW'
act: 'silu'
trt: False
DataGenerator:
DataGenerator_name: "diy.data.single_img_dataset.SingleImageWithoutLabel"
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ csp_darknet_CSPDarkNet_0:
width_mult: 1.0
depthwise: False
act: 'silu'
trt: False
return_idx: [2, 3, 4]
DataGenerator:
DataGenerator_name: "diy.data.struct_img_dataset.DictImageWithoutLabel"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ cspresnet_CSPResNet_0:
use_large_stem: False
width_mult: 1.0
depth_mult: 1.0
trt: False
use_checkpoint: False
use_alpha: False
DataGenerator:
Expand Down
2 changes: 0 additions & 2 deletions framework/e2e/paddleLT/yaml/Det/modeling/necks/custom_pan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ custom_pan_CustomCSPPAN_0:
data_format: 'NCHW'
width_mult: 1.0
depth_mult: 1.0
trt: False
DataGenerator:
DataGenerator_name: "diy.data.single_img_dataset.SingleImageWithoutLabel"
data:
Expand Down Expand Up @@ -210,7 +209,6 @@ custom_pan_CustomCSPPAN_1:
data_format: 'NCHW'
width_mult: 1.0
depth_mult: 1.0
trt: False
DataGenerator:
DataGenerator_name: "diy.data.single_img_dataset.SingleImageWithoutLabel"
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,6 @@ yolo_fpn_YOLOCSPPAN_0:
depthwise: False
data_format: 'NCHW'
act: 'silu'
trt: False
DataGenerator:
DataGenerator_name: "diy.data.single_img_dataset.SingleImageWithoutLabel"
data:
Expand Down
7 changes: 0 additions & 7 deletions inference/benchmark/jetson/LICENSE.md

This file was deleted.

94 changes: 0 additions & 94 deletions inference/benchmark/jetson/README.md

This file was deleted.

Loading