diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/CMakeLists.txt b/hpvm/test/dnn_benchmarks/hpvm-c/CMakeLists.txt
index f56312e9c3dabf22731bdc910672748c67ddf50d..aedf0640025703b62ed5e9a810f5c3d68e800f6f 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/CMakeLists.txt
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/CMakeLists.txt
@@ -1,17 +1,16 @@
-# Each source file contains a @MODEL_PARAMS_DIR@ waiting to be filled in.
+# MODEL_PARAMS_DIR is given as -DMODEL_PARAMS_DIR=<value> to compiler.
set(MODEL_PARAMS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../model_params/")
set(test_compile_targets "")
function(compile_hpvm_c target_name src_filepath codegen_target)
- set(generated_file_path "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.cpp")
set(output_bin_path "${CMAKE_CURRENT_BINARY_DIR}/hpvm_${target_name}")
- configure_file(${src_filepath} ${generated_file_path})
# Add an "hpvm_" prefix here because Ninja generator doesn't like
# the name of output file and custom target to clash.
add_custom_command(
OUTPUT ${output_bin_path}
- DEPENDS ${generated_file_path} hpvm-clang
+ DEPENDS ${src_filepath} hpvm-clang
COMMAND hpvm-clang
- ${generated_file_path} ${output_bin_path} -O3 -fno-exceptions
+ ${src_filepath} ${output_bin_path} -O3 -fno-exceptions
+ "-DMODEL_PARAMS_DIR=${MODEL_PARAMS_DIR}"
-t ${codegen_target} ${ARGN}
)
add_custom_target(${target_name} DEPENDS ${output_bin_path})
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
index 2faf1413bcdb7c87e280107d38913ae86740a414..8a043d3644aa360b5104e34503f80b187204a03c 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -428,7 +436,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/alexnet2_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/alexnet2_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");
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 bca6ca47cd48015524b496b90219f24e1f27ddb9..b0a8fe8102dbba10cfe19fa3b825ec7f2d9ba31c 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -433,7 +441,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/alexnet2_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/alexnet2_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");
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
index d274d52ec18af99393f47d9fdb69b0b593dcbefc..1ff20c28a691ffd8c764eca6b75bbc5abba1c17d 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -379,7 +387,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/alexnet_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/alexnet_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
uint8_t *labels = readLabels(labels_path.c_str(), 5000);
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 e82985d04fea11c1d30079e4eacbbee81c95080a..48ce0864174f5401e295cdb3c01011009bfe338b 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -385,7 +393,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/alexnet_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/alexnet_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
uint32_t *labels = readLabels3(labels_path.c_str(), 5000);
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
index c058e913c9f7c5bca6eb304759a380d319495caf..b20aab8720923e0eb3f1eb3bcf6f964ebe37a510 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
@@ -1,4 +1,12 @@
#include <config.h>
+
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
#include <hpvm.h>
#include <string>
#include <tensorUtils.h>
@@ -477,7 +485,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/alexnet_imagenet/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/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");
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 26e717fd732567eb9e6b97f19c60428e564fc9e5..239d4ea5793e010562a7d4963f590fff85b932dc 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -482,7 +490,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/alexnet_imagenet/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/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");
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist.cpp
index 8185d9dc69b6899cad46833d71d18be01653bfb3..f9d8bc3e436630b9778dc5c4d1cfe271884d75a1 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/lenet_mnist/lenet_mnist.cpp
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -281,7 +289,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/lenet_mnist/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/lenet_mnist/";
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");
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 a0cd32151e5743d51df34edbe041e0fe8485aced..b607e9e653063437b72179ab83ea74921b9bd3ef 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -286,7 +294,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/lenet_mnist/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/lenet_mnist/";
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");
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
index 77b448d81d1b352f8ac4ee9e3fc943e69f466772..d309cd5b5ea74563c1ee1fd868e55b092fd6a7cb 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -1983,7 +1991,7 @@ int main(int argc, char *argv[]) {
}
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/mobilenet_cifar10/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/mobilenet_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
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 adb140bd699e74be7199f54888ee4249e5515004..7cfeca00418f2f580227b880cb4d6e63afaaf6f1 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -1988,7 +1996,7 @@ int main(int argc, char *argv[]) {
}
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/mobilenet_cifar10/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/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");
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
index ef94b055bd6a741405c4c9da55958143d3b8c4d1..54e93e0ff5f9b02a811dc15aa76d0bb30d8c1d2b 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
@@ -4,6 +4,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -1317,7 +1325,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/resnet18_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/resnet18_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");
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 ecfa22957352ca2c418c5beb9b041762da9b6de9..7eb4acc44ac6c7061c0a500bd8f68e1ea6a1a7d7 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
@@ -4,6 +4,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -1248,7 +1256,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/resnet18_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/resnet18_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
uint32_t *labels = readLabels3(labels_path.c_str(), 5000);
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
index 37a4111411229602ca18f806c2186af54728081e..54d008932687a895a1819c5480af2b39b87aadf6 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -5150,7 +5158,7 @@ int main(int argc, char *argv[]) {
}
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/resnet50_imagenet/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/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");
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 1ac5141bca54d7dc60bb63c09cde9dcb8f8c6d32..fa1e616156683131b40d25ee243d5925bab9cf42 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -4926,7 +4934,7 @@ int main(int argc, char *argv[]) {
}
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/resnet50_imagenet/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/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");
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
index c1de0703df94b3f27dfd55b0379377ecf5f0edbe..bf1c007ff389fa80cd41dec1fea05f5be4f07e3a 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -844,7 +852,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_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");
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 7bda1213358d0c37d16623425bf19bace4d3a715..79970b6395c3d02c9fca1810e06dfd636fd682f8 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -849,7 +857,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_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");
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
index bee78428df49c52f06bfa618afd7920d113e1647..c45e115fb31b50a428ace6a7344532ade12b1989 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -844,7 +852,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_cifar100/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_cifar100/";
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");
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 c12855437b28686528ff4c916a987bfa7b2f280e..7c6fd3ff4048d6e7a9c1317abd484a0f9c990d9c 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -849,7 +857,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_cifar100/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_cifar100/";
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");
diff --git a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
index b046f4255185e47b44be1a78ca29c05189fc894b..dcf237bd7897febdfd4a3972dc0a47a873f3646b 100644
--- a/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/hpvm-c/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::TENSOR_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -892,7 +900,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_imagenet/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/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");
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 b06c992f3c2108544676c6e7f27810e3ef7244fc..e516b9117b816cc0cc29d21527e7873eb04e33ac 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
@@ -3,6 +3,14 @@
#include <tensorUtils.h>
#include <config.h>
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
void var_0_node(void *t1, size_t bytes_t1, void *t2, size_t bytes_t2) {
__hpvm__hint(hpvm::CUDNN_TARGET);
__hpvm__attributes(2, t1, t2, 0);
@@ -897,7 +905,7 @@ int main(int argc, char *argv[]) {
}
}
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_imagenet/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/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");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/CMakeLists.txt b/hpvm/test/dnn_benchmarks/tensor-rt-src/CMakeLists.txt
index 6e22eba67471855971005bf9e57ed0aa38dafff8..1cadb68b801186316e90a9ff1a5f8880925b2ac8 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/CMakeLists.txt
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/CMakeLists.txt
@@ -2,13 +2,13 @@
# Don't put binaries in build/bin. This doesn't affect global setting.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+# MODEL_PARAMS_DIR is given as -DMODEL_PARAMS_DIR=<value> to compiler.
set(MODEL_PARAMS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../model_params/")
set(test_compile_targets "")
function(add_trt_source target_name filepath)
- set(generated_file_path "${CMAKE_CURRENT_BINARY_DIR}/${target_name}.cpp")
- configure_file(${filepath} ${generated_file_path})
- add_executable(${target_name} ${generated_file_path})
+ add_executable(${target_name} ${filepath})
target_link_libraries(${target_name} tensor_runtime_online)
+ target_compile_definitions(${target_name} PRIVATE "-DMODEL_PARAMS_DIR=${MODEL_PARAMS_DIR}")
set(test_compile_targets ${test_compile_targets} ${target_name} PARENT_SCOPE)
endfunction(add_trt_source)
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet2_cifar10_half.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet2_cifar10_half.cc
index ab80718fd33d0b9787be4a0f183e3a7a65dc76e7..5bc3ea6428382c93ccf77cd16056f9ed8cbae542 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet2_cifar10_half.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet2_cifar10_half.cc
@@ -1,8 +1,13 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
/* NOTE: Reference Architecture to use for profiling */
void testCifarNet() {
@@ -10,7 +15,7 @@ void testCifarNet() {
printf("********* Alexnet2 CIFAR-10 DNN ********** \n");
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/alexnet2_cifar10/"; std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string(MODEL_PARAMS_DIR_STR) + "/alexnet2_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");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet_cifar10_half.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet_cifar10_half.cc
index b3b69d6b695eca9286b90685f3e071e234887d27..bf01835c2e6a23ca9e0916b6747096905788004c 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet_cifar10_half.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/alexnet_cifar10_half.cc
@@ -1,14 +1,19 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/alexnet_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/alexnet_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/lenet_mnist_half.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/lenet_mnist_half.cc
index 44b78b9169707fd6c7b9ff6503a4a9aa8d2ec947..2e80dd98f9406b216af29ef5f843b84655ea1d86 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/lenet_mnist_half.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/lenet_mnist_half.cc
@@ -1,8 +1,13 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
/* NOTE: Reference Architecture to use for profiling */
void testLenetTanh() {
@@ -12,7 +17,7 @@ void testLenetTanh() {
int test_batch_size = 5000;
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/lenet_mnist/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/lenet_mnist/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/mobilenet_cifar10_half.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/mobilenet_cifar10_half.cc
index d4423bf4345756e72ad46b140ae8cafc26eae264..5ecb8618f8db55da5e4cc435d07d799cd98beaca 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/mobilenet_cifar10_half.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/mobilenet_cifar10_half.cc
@@ -1,15 +1,20 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/mobilenet_cifar10/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/mobilenet_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/resnet18_cifar10_half.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/resnet18_cifar10_half.cc
index 76dea5ef08713d22fe7086b678bb3274378d0fd9..1e1bc36f79d022cc8c8fa4289de68e2817dda8b3 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/resnet18_cifar10_half.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/resnet18_cifar10_half.cc
@@ -1,15 +1,20 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/resnet18_cifar10/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/resnet18_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar100_half.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar100_half.cc
index 2772fd3da42d50aa2ff5391d1e3c85c610a4960a..73b057c0971102c709e2f4c5fce141e9146c45f7 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar100_half.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar100_half.cc
@@ -1,14 +1,19 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_cifar100/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_cifar100/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar10_half.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar10_half.cc
index 954f6778b899d2cefb2b28d68a32fad33d52f70c..1928398c43ef19c626a80636018d8e50d969e3c7 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar10_half.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp16/vgg16_cifar10_half.cc
@@ -1,14 +1,19 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_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");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet2_cifar10.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet2_cifar10.cc
index e7431234d705449efa0fc5aafe23238e89be1d30..8f08e80d1f722060e89437e3a0c5e7963b58eb9d 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet2_cifar10.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet2_cifar10.cc
@@ -2,7 +2,13 @@
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
/* NOTE: Reference Architecture to use for profiling */
void testCifarNet() {
@@ -10,7 +16,7 @@ void testCifarNet() {
printf("********* Alexnet2 CIFAR-10 DNN ********** \n");
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/alexnet2_cifar10/"; std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string(MODEL_PARAMS_DIR_STR) + "/alexnet2_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");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_cifar10.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_cifar10.cc
index 12c304c9b401c586a0da4658b092f2b791268983..9f23cc656678f01bc9eea9611b943264d1b848f2 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_cifar10.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_cifar10.cc
@@ -1,14 +1,19 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/alexnet_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/alexnet_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
// std::string labels_path = dir_prefix + std::string("labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_imagenet.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_imagenet.cc
index b57e60c0fef41b283ad57a7b203759a8f014252d..74de9507e540a620299068624a5a6b6d8efdbe6a 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_imagenet.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/alexnet_imagenet.cc
@@ -1,15 +1,20 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/alexnet_imagenet/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/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");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/lenet_mnist.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/lenet_mnist.cc
index 9777670722b69c8b23a82a77312d17386f2d5c3f..e973f712c9e06ced1a37a721fcc7d5eb27126350 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/lenet_mnist.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/lenet_mnist.cc
@@ -1,8 +1,13 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int total_runs = 1;
@@ -11,7 +16,7 @@ void testLenetTanh() {
int test_batch_size = 5000;
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/lenet_mnist/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/lenet_mnist/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/mobilenet_cifar10.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/mobilenet_cifar10.cc
index 3e37bf7feb6641af3afdeb8fb9f3a65fdfcbdce3..36f90e4954d4ad885cb56b1e36cf516e72c65cb2 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/mobilenet_cifar10.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/mobilenet_cifar10.cc
@@ -1,14 +1,20 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
int main() {
llvm_hpvm_initTensorRt(0);
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/mobilenet_cifar10/"; std::string input_path = dir_prefix + std::string("test_input.bin");
+ std::string(MODEL_PARAMS_DIR_STR) + "/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 =
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet18_cifar10.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet18_cifar10.cc
index c8a99419a81d19b374642c21c977a511413f9ae2..6cfcfbfbe183d894ed4ebba79e709de8d9523205 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet18_cifar10.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet18_cifar10.cc
@@ -1,15 +1,20 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/resnet18_cifar10/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/resnet18_cifar10/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet50_imagenet.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet50_imagenet.cc
index 3aeabc22736e6955a9ad5ad07144fc38057616ea..56e02cc4aa4e353739637e0ece46f1193a66cd15 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet50_imagenet.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/resnet50_imagenet.cc
@@ -1,15 +1,20 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
std::string dir_prefix =
- std::string("@MODEL_PARAMS_DIR@") + "/resnet50_imagenet/";
+ std::string(MODEL_PARAMS_DIR_STR) + "/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");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar10.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar10.cc
index f7fffadfc36ba0fd248371efb35a1b7dfede68d3..a7b05ee731542e0fb6ccd5c4ae29fb4789890224 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar10.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar10.cc
@@ -1,13 +1,19 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
+
int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_cifar10/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_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");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar100.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar100.cc
index d3949c7cc568063f3b344d8497551fa1f4f4102c..b908f4201bf4bccb9f947de7fc703be764bdc15d 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar100.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_cifar100.cc
@@ -1,14 +1,19 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_cifar100/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_cifar100/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");
diff --git a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_imagenet.cc b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_imagenet.cc
index 2bb1be2821a8d33062bf1cfd83bb978f59884fa9..a881e7905f6b52a77da9a48e7dc0fe7d29af93cb 100644
--- a/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_imagenet.cc
+++ b/hpvm/test/dnn_benchmarks/tensor-rt-src/fp32/vgg16_imagenet.cc
@@ -1,14 +1,19 @@
-
-
#include "tensor_runtime.h"
#include "tensorUtils.h"
+#ifndef MODEL_PARAMS_DIR
+#error MODEL_PARAMS_DIR is not defined
+#endif
+
+#define STR_VALUE(X) #X
+#define STRINGIFY(X) STR_VALUE(X)
+#define MODEL_PARAMS_DIR_STR STRINGIFY(MODEL_PARAMS_DIR)
int main() {
llvm_hpvm_initTensorRt(0);
- std::string dir_prefix = std::string("@MODEL_PARAMS_DIR@") + "/vgg16_imagenet/";
+ std::string dir_prefix = std::string(MODEL_PARAMS_DIR_STR) + "/vgg16_imagenet/";
std::string input_path = dir_prefix + std::string("test_input.bin");
std::string labels_path = dir_prefix + std::string("test_labels.bin");