From e265ef4ab3de8dfe7fbc4c0b5b768d016189b7cb Mon Sep 17 00:00:00 2001
From: Hashim Sharif <hsharif3@miranda.cs.illinois.edu>
Date: Mon, 22 Mar 2021 02:14:46 -0500
Subject: [PATCH] Fixing more HPVM tensor RT sources - more left
---
.../dnn_sources/src/fp32/alexnet_imagenet.cc | 8 ++++----
.../hpvm-tensor-rt/dnn_sources/src/fp32/mobilenet.cc | 10 +++++-----
.../dnn_sources/src/fp32/resnet50_imagenet.cc | 8 ++++----
.../dnn_sources/src/fp32/vgg16_cifar10.cc | 8 ++++----
.../dnn_sources/src/fp32/vgg16_cifar100.cc | 8 ++++----
.../dnn_sources/src/fp32/vgg16_imagenet.cc | 8 ++++----
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/alexnet_imagenet.cc b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/alexnet_imagenet.cc
index 0f8df1a420..94da804e8a 100644
--- a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/alexnet_imagenet.cc
+++ b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/alexnet_imagenet.cc
@@ -7,10 +7,10 @@ int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix =
- std::string("/home/nvidia/sd_card/alexnet_imagenet_tune/");
- std::string input_path = dir_prefix + std::string("input.bin");
- std::string labels_path = dir_prefix + std::string("labels.bin");
+ std::string dir_prefix = model_params_path + std::string("/alexnet_imagenet/");
+
+ std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string labels_path = dir_prefix + std::string("test_labels.bin");
std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
void *conv2d_1_w =
readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 11, 11);
diff --git a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/mobilenet.cc b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/mobilenet.cc
index 44336b02e0..618b418ec9 100644
--- a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/mobilenet.cc
+++ b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/mobilenet.cc
@@ -7,9 +7,9 @@ int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix = model_params_path + std::string("/mobilenet/");
- std::string input_path = dir_prefix + std::string("input.bin");
- std::string labels_path = dir_prefix + std::string("labels.bin");
+ std::string dir_prefix = model_params_path + std::string("/mobilenet_cifar10/");
+ std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string labels_path = dir_prefix + std::string("test_labels.bin");
std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
void *conv2d_1_w =
readTrainedWeights(conv2d_1_w_path.c_str(), 0, 32, 3, 3, 3);
@@ -709,9 +709,9 @@ int main() {
void *var_102 = tensorAdd(var_101, dense_1_b);
void *var_103 = tensorSoftmax(var_102);
- uint8_t *labels = readLabelsBatch(labels_path.c_str(), start, end);
+ uint32_t *labels = readLabelsBatch3(labels_path.c_str(), start, end);
- float accuracy = computeAccuracy2(labels, batch_size, var_103);
+ float accuracy = computeAccuracy3(labels, var_103);
final_accuracy += accuracy;
freeBatchMemory();
}
diff --git a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/resnet50_imagenet.cc b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/resnet50_imagenet.cc
index afa3f0bcc1..e19c0b2107 100644
--- a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/resnet50_imagenet.cc
+++ b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/resnet50_imagenet.cc
@@ -7,10 +7,10 @@ int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix =
- model_params_path + std::string("/shared/hsharif3/resnet50_imagenet/");
- std::string input_path = dir_prefix + std::string("input.bin");
- std::string labels_path = dir_prefix + std::string("labels.bin");
+ std::string dir_prefix = model_params_path + std::string("/resnet50_imagenet/");
+
+ std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string labels_path = dir_prefix + std::string("test_labels.bin");
std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
void *conv2d_1_w =
readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 7, 7);
diff --git a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_cifar10.cc b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_cifar10.cc
index 034ddb0cf8..813874f0ed 100644
--- a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_cifar10.cc
+++ b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_cifar10.cc
@@ -8,8 +8,8 @@ int main() {
llvm_hpvm_initTensorRt(0);
std::string dir_prefix = model_params_path + std::string("/vgg16_cifar10/");
- std::string input_path = dir_prefix + std::string("input.bin");
- std::string labels_path = dir_prefix + std::string("labels.bin");
+ std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string labels_path = dir_prefix + std::string("test_labels.bin");
std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
void *conv2d_1_w =
readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);
@@ -164,9 +164,9 @@ int main() {
void *var_59 = tensorAdd(var_58, dense_2_b);
void *var_60 = tensorSoftmax(var_59);
- uint8_t *labels = readLabelsBatch(labels_path.c_str(), start, end);
+ uint32_t *labels = readLabelsBatch3(labels_path.c_str(), start, end);
- float accuracy = computeAccuracy2(labels, batch_size, var_60);
+ float accuracy = computeAccuracy3(labels, var_60);
final_accuracy += accuracy;
freeBatchMemory();
diff --git a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_cifar100.cc b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_cifar100.cc
index 94ca77329b..84164bf24b 100644
--- a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_cifar100.cc
+++ b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_cifar100.cc
@@ -8,8 +8,8 @@ int main() {
llvm_hpvm_initTensorRt(0);
std::string dir_prefix = model_params_path + std::string("/vgg16_cifar100/");
- std::string input_path = dir_prefix + std::string("input.bin");
- std::string labels_path = dir_prefix + std::string("labels.bin");
+ std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string labels_path = dir_prefix + std::string("test_labels.bin");
std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
void *conv2d_1_w =
@@ -165,9 +165,9 @@ int main() {
void *var_59 = tensorAdd(var_58, dense_2_b);
void *var_60 = tensorSoftmax(var_59);
- uint8_t *labels = readLabelsBatch(labels_path.c_str(), start, end);
+ uint32_t *labels = readLabelsBatch3(labels_path.c_str(), start, end);
- float accuracy = computeAccuracy2(labels, batch_size, var_60, 100);
+ float accuracy = computeAccuracy3(labels, var_60);
final_accuracy += accuracy;
freeBatchMemory();
}
diff --git a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_imagenet.cc b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_imagenet.cc
index c5da3faf78..eca833b08f 100644
--- a/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_imagenet.cc
+++ b/hpvm/projects/hpvm-tensor-rt/dnn_sources/src/fp32/vgg16_imagenet.cc
@@ -7,10 +7,10 @@ int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix =
- std::string("/home/nvidia/sd_card/vgg16_imagenet_new/");
- std::string input_path = dir_prefix + std::string("input.bin");
- std::string labels_path = dir_prefix + std::string("labels.bin");
+ std::string dir_prefix = model_params_path + std::string("/vgg16_imagenet/");
+
+ std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string labels_path = dir_prefix + std::string("test_labels.bin");
std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
void *conv2d_1_w =
readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);
--
GitLab