From 08f41eceb9a8a926ddcdb4f2cdcc17b1f5dce260 Mon Sep 17 00:00:00 2001
From: Yifan Zhao <yifanz16@illinois.edu>
Date: Sat, 23 May 2020 19:44:03 -0500
Subject: [PATCH] Adjusted and added alexnet2 canny
---
llvm/projects/hpvm-tensor-rt/CMakeLists.txt | 3 +++
.../dnn_sources/src/{alexnet_canny.cc => alexnet2_canny.cc} | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
rename llvm/projects/hpvm-tensor-rt/dnn_sources/src/{alexnet_canny.cc => alexnet2_canny.cc} (96%)
diff --git a/llvm/projects/hpvm-tensor-rt/CMakeLists.txt b/llvm/projects/hpvm-tensor-rt/CMakeLists.txt
index 2434e773b0..85b1e31020 100644
--- a/llvm/projects/hpvm-tensor-rt/CMakeLists.txt
+++ b/llvm/projects/hpvm-tensor-rt/CMakeLists.txt
@@ -149,6 +149,9 @@ target_link_libraries(alexnet_cifar10 tensor_runtime ${GPU_PROFILER_LIB} ${SOC_
#add_executable(alexnet_cifar10_approx dnn_sources/src/alexnet_cifar10_approx.cc)
#target_link_libraries(alexnet_cifar10_approx tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+add_executable(alexnet2_canny dnn_sources/src/alexnet2_canny.cc)
+target_link_libraries(alexnet2_canny tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
+
add_executable(alexnet2_cifar10 dnn_sources/src/alexnet2_cifar10.cc)
target_link_libraries(alexnet2_cifar10 tensor_runtime ${GPU_PROFILER_LIB} ${SOC_SIMULATOR_LIB})
diff --git a/llvm/projects/hpvm-tensor-rt/dnn_sources/src/alexnet_canny.cc b/llvm/projects/hpvm-tensor-rt/dnn_sources/src/alexnet2_canny.cc
similarity index 96%
rename from llvm/projects/hpvm-tensor-rt/dnn_sources/src/alexnet_canny.cc
rename to llvm/projects/hpvm-tensor-rt/dnn_sources/src/alexnet2_canny.cc
index 65d6335f75..628ce6616c 100644
--- a/llvm/projects/hpvm-tensor-rt/dnn_sources/src/alexnet_canny.cc
+++ b/llvm/projects/hpvm-tensor-rt/dnn_sources/src/alexnet2_canny.cc
@@ -119,6 +119,7 @@ int main(){
std::string dir_prefix = std::string("../model_params/alexnet2_cifar10/");
std::string input_path = dir_prefix + std::string("norm_cifar_input.bin");
+ std::string canny_input_path = dir_prefix + std::string("canny_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
void* conv1_filter = readTrainedWeights("../model_params/alexnet2_cifar10/conv1.bin",
@@ -171,6 +172,7 @@ int main(){
void* input = readInputBatch(input_path.c_str(), 0,start,end,3,32,32);
+ void* canny_input = readInputBatch(canny_input_path.c_str(), 0,start,end, 3, 128, 128);
void* conv1out = tensorConvolution(input, conv1_filter, 1, 1, 1, 1,
conv_mode, conv_precision);
@@ -232,9 +234,8 @@ int main(){
void* argmax_out = tensorArgMax(result);
void* select_out = tensorSelect2(argmax_out, index_vector);
- void* reduced_input = tensorContract(input, select_out);
+ void* reduced_input = tensorContract(canny_input, select_out);
-
invoke_canny(reduced_input);
--
GitLab