From 8e49a3759c9a2b6ebefce25214672afd2b20f2c2 Mon Sep 17 00:00:00 2001
From: Hashim Sharif <hsharif3@miranda.cs.illinois.edu>
Date: Tue, 2 Feb 2021 02:39:03 -0600
Subject: [PATCH] Default input test_input.bin (from tune_input.bin
---
.../benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp | 4 ++--
.../benchmarks/alexnet_cifar10/alexnet_cifar10.cpp | 4 ++--
.../benchmarks/alexnet_imagenet/alexnet_imagenet.cpp | 4 ++--
.../dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp | 4 ++--
.../benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp | 4 ++--
.../benchmarks/resnet18_cifar10/resnet18_cifar10.cpp | 4 ++--
.../benchmarks/resnet50_imagenet/resnet50_imagenet.cpp | 4 ++--
.../benchmarks/vgg16_cifar10/vgg16_cifar10.cpp | 4 ++--
.../benchmarks/vgg16_cifar100/vgg16_cifar100.cpp | 6 +++---
.../benchmarks/vgg16_imagenet/vgg16_imagenet.cpp | 4 ++--
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
index 42f8756f7f..2bb5fa2335 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2_cifar10/alexnet2_cifar10.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);
@@ -497,7 +497,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/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
index e5edc8a589..ae5f31b7dc 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
@@ -366,9 +366,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");
uint8_t *labels = readLabels(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/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
index 24f4d1520a..500199589b 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
@@ -465,8 +465,8 @@ 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 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/benchmarks/lenet_mnist/lenet_mnist.cpp b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
index a20315cb9c..b67d585d01 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.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/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
index 5ea5c298bf..a4de282621 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
@@ -1968,8 +1968,8 @@ typedef struct __attribute__((__packed__)) {
int main() {
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/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
index c6fa02c784..66ab37cd33 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
@@ -1303,9 +1303,9 @@ typedef struct __attribute__((__packed__)) {
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");
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
index b41e0bc96d..db6b64daa0 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
@@ -5136,8 +5136,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/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
index 13d150e7a9..39c2ffc876 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.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/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
index 6e26f89b75..ce899cd0a2 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.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);
@@ -998,7 +998,7 @@ int main() {
startMemTracking();
startProfiling();
- for (int j = 0; j < 14; j++) {
+ for (int j = 0; j < 1; j++) {
for (int i = 0; i < batch_count; i++) {
int start = i * batch_size;
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
index 4fad931efc..91af01fe8e 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
@@ -879,8 +879,8 @@ 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