Skip to content

Commit

Permalink
Merge commit '495cc54081bba085f329ef06c7e9f639c7ad16eb' into 1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
qianglin-xlnx committed Apr 21, 2021
2 parents f517975 + 495cc54 commit 8d3b18c
Show file tree
Hide file tree
Showing 33 changed files with 190 additions and 42 deletions.
2 changes: 1 addition & 1 deletion tools/Vitis-AI-Runtime/VART/target_factory/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.
#
cmake_minimum_required(VERSION 3.5)
project(target-factory VERSION 1.3.1 LANGUAGES C CXX)
project(target-factory VERSION 1.3.2 LANGUAGES C CXX)

include(${CMAKE_SOURCE_DIR}/cmake/VitisCommon.cmake)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const Target create_target_v2(const std::uint64_t fingerprint) {
pool_nonlinear->add_nonlinear_type(Target::Nonlinear::relu);
pool_engine->add_pool_type(Target::Pool::max);
auto max_limit = pool_engine->mutable_max_limit();
max_limit->set_kernel_size("2-8");
max_limit->set_kernel_size("1-8");
max_limit->set_stride("1-8");
if (PL_AVG) {
pool_engine->add_pool_type(Target::Pool::avg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -105,7 +105,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -121,7 +121,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
# Copyright 2019 Xilinx Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: "DPUCVDX8G_ISA0_B4096C16B1_DW_QT"
type: "DPUCVDX8G"
isa_version: 0x00
feature_code: 0x0004f2022210
bank_group {
name: "VB0"
type: "Virtual"
base_id: 0
bank_num: 8
bank_width: 16
bank_depth: 4096
}
bank_group {
name: "VB1"
type: "Virtual"
base_id: 8
bank_num: 8
bank_width: 16
bank_depth: 4096
}
bank_group {
name: "CONVW"
type: "Param"
base_id: 16
bank_num: 16
bank_width: 16
bank_depth: 4096
}
bank_group {
name: "DWCONVW"
type: "Param"
base_id: 32
bank_num: 1
bank_width: 16
bank_depth: 4096
}
bank_group {
name: "BIAS"
type: "Param"
base_id: 33
bank_num: 1
bank_width: 16
bank_depth: 2048
}
bank_group {
name: "DWCVBIAS"
type: "Param"
base_id: 34
bank_num: 1
bank_width: 16
bank_depth: 2048
}
load_engine {
channel_parallel: 16
output_bank: "VB0"
output_bank: "VB1"
}
save_engine {
channel_parallel: 16
input_bank: "VB0"
input_bank: "VB1"
}
conv_engine {
input_channel_parallel: 16
output_channel_parallel: 16
pixel_parallel: 8
input_bank: "VB0"
input_bank: "VB1"
output_bank: "VB0"
output_bank: "VB1"
weight_bank: "CONVW"
bias_bank: "BIAS"
nonlinear {
nonlinear_type: relu
nonlinear_type: leaky_relu
nonlinear_type: relu_six
}
conv_limit {
kernel_size: "1-16"
stride: "1-8"
}
}
eltwise_engine {
channel_parallel: 16
pixel_parallel: 2
input_bank: "VB0"
input_bank: "VB1"
output_bank: "VB0"
output_bank: "VB1"
nonlinear {
nonlinear_type: relu
}
elew_type: add
}
pool_engine {
channel_parallel: 16
pixel_parallel: 2
input_bank: "VB0"
input_bank: "VB1"
output_bank: "VB0"
output_bank: "VB1"
nonlinear {
nonlinear_type: relu
}
pool_type: max
max_limit {
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
avg_limit {
kernel_size: "2-8"
stride: "1-4"
}
}
dwconv_engine {
channel_parallel: 16
pixel_parallel: 2
input_bank: "VB0"
input_bank: "VB1"
output_bank: "VB0"
output_bank: "VB1"
weight_bank: "DWCONVW"
bias_bank: "DWCVBIAS"
nonlinear {
nonlinear_type: relu
nonlinear_type: relu_six
}
dwconv_limit {
kernel_size: "1-16"
stride: "1-4"
}
}
batch: 1
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -121,7 +121,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -105,7 +105,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -105,7 +105,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -105,7 +105,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -121,7 +121,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -105,7 +105,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -105,7 +105,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ conv_engine {
}
conv_limit {
kernel_size: "1-16"
stride: "1-4"
stride: "1-8"
}
}
eltwise_engine {
Expand All @@ -105,7 +105,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-4"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-8"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-8"
}
pool_type: max_reduce
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-8"
}
pool_type: avg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-8"
}
pool_type: max_reduce
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pool_engine {
}
pool_type: max
max_limit {
kernel_size: "2-8"
kernel_size: "1-8"
stride: "1-8"
}
pool_type: avg
Expand Down
Loading

0 comments on commit 8d3b18c

Please sign in to comment.