From 466d59305fbca0358b4858a5589bfa9ec56d2861 Mon Sep 17 00:00:00 2001
From: Yifan Zhao <yifanz16@illinois.edu>
Date: Wed, 24 Mar 2021 01:40:13 -0500
Subject: [PATCH] Fix various problems with hpvm-c benchmarks
---
.../benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp | 4 ++--
.../benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp | 4 ++--
.../benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp | 7 +++----
.../hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp | 4 ++--
.../mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp | 7 ++++---
.../benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp | 4 ++--
.../resnet50_imagenet/resnet50_imagenet_cudnn.cpp | 4 ++--
.../benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp | 4 ++--
.../benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp | 4 ++--
.../benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp | 4 ++--
10 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp
index 9c0c980d97..448db0b4c8 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10_cudnn.cpp
@@ -415,7 +415,7 @@ int main() {
std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/alexnet2_cifar10/";
- std::string labels_path = dir_prefix + std::string("tune_labels.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);
@@ -494,7 +494,7 @@ int main() {
int test_input_size = 5000;
int batch_count = test_input_size / batch_size;
- std::string input_path = dir_prefix + std::string("tune_input.bin");
+ std::string input_path = dir_prefix + std::string("test_input.bin");
void *input = create4DTensor(0, nchw, batch_size, 3, 32, 32);
startMemTracking();
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp
index 7ce1608813..ab4f6a2402 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10_cudnn.cpp
@@ -367,9 +367,9 @@ int main() {
std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/alexnet_cifar10/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
+ std::string input_path = dir_prefix + std::string("test_input.bin");
void *input = readTrainedWeights(input_path.c_str(), 0, 5000, 3, 32, 32);
- std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+ std::string labels_path = dir_prefix + std::string("test_labels.bin");
uint32_t *labels = readLabels3(labels_path.c_str(), 5000);
std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
void *conv2d_1_w =
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp
index 73175982ab..4acba95173 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet_cudnn.cpp
@@ -462,10 +462,9 @@ typedef struct __attribute__((__packed__)) {
int main() {
- std::string dir_prefix =
- std::string(MODEL_PARAMS_DIR) + "/alexnet_imagenet/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
- std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/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/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp
index 4e0adc7bbe..2159cfe286 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist_cudnn.cpp
@@ -268,8 +268,8 @@ int main() {
std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/lenet_mnist/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
- std::string labels_path = dir_prefix + std::string("tune_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 =
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp
index b7e0a71459..9f4069b34b 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10_cudnn.cpp
@@ -1967,10 +1967,11 @@ typedef struct __attribute__((__packed__)) {
int main() {
- std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/mobilenet_cifar10/";
+ std::string dir_prefix =
+ std::string(MODEL_PARAMS_DIR) + "/mobilenet_cifar10/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
- std::string labels_path = dir_prefix + std::string("tune_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, 32, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp
index e1429ada17..1b6c98b886 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10_cudnn.cpp
@@ -1230,9 +1230,9 @@ int main() {
std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/resnet18_cifar10/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
+ std::string input_path = dir_prefix + std::string("test_input.bin");
void *input = readTrainedWeights(input_path.c_str(), 0, 5000, 3, 32, 32);
- std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+ std::string labels_path = dir_prefix + std::string("test_labels.bin");
uint32_t *labels = readLabels3(labels_path.c_str(), 5000);
std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
void *conv2d_1_w =
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet_cudnn.cpp
index ab613983a0..c7817caf53 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet_cudnn.cpp
@@ -4907,8 +4907,8 @@ int main() {
std::string dir_prefix =
std::string(MODEL_PARAMS_DIR) + "/resnet50_imagenet/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
- std::string labels_path = dir_prefix + std::string("tune_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, 7, 7);
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp
index c1cb38327d..2f18dc17c6 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10_cudnn.cpp
@@ -830,8 +830,8 @@ typedef struct __attribute__((__packed__)) {
int main() {
std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_cifar10/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
- std::string labels_path = dir_prefix + std::string("tune_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);
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp
index 326542a038..a3e147cb1a 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100_cudnn.cpp
@@ -831,8 +831,8 @@ int main() {
std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_cifar100/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
- std::string labels_path = dir_prefix + std::string("tune_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);
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp
index 16f145efad..995502f907 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet_cudnn.cpp
@@ -878,8 +878,8 @@ typedef struct __attribute__((__packed__)) {
int main() {
std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_imagenet/";
- std::string input_path = dir_prefix + std::string("tune_input.bin");
- std::string labels_path = dir_prefix + std::string("tune_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);
--
GitLab