Moved dnn sources one level up and updated cmake

5ed204d5 · Yifan Zhao · 669e933f · 5ed204d5 · 5ed204d5 · 5ed204d5
Commit 5ed204d5 authored 4 years ago by Yifan Zhao
--- a/hpvm/test/dnn_benchmarks/CMakeLists.txt
+++ b/hpvm/test/dnn_benchmarks/CMakeLists.txt
@@ -49,8 +49,8 @@ list(
 file(GLOB entries ./benchmarks/*)
 set(test_targets "")
 foreach(entry ${entries})
-  if(IS_DIRECTORY ${entry} AND IS_DIRECTORY ${entry}/src)
-    file(GLOB src_files ${entry}/src/*.cpp)
+  if(IS_DIRECTORY ${entry})
+    file(GLOB src_files ${entry}/*.cpp)
    foreach(src_file ${src_files})
      get_filename_component(target "${src_file}" NAME_WE)
      set(target "test_${target}")

--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet/src/alexnet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet/src/alexnet.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet/src/alexnet_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet/src/alexnet_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/src/alexnet2.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/src/alexnet2.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/src/alexnet2_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/src/alexnet2_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/src/lenet_mnist.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/src/lenet_mnist.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/src/lenet_mnist_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/src/lenet_mnist_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/src/mobilenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/src/mobilenet.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/src/mobilenet_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/src/mobilenet_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/src/resnet18.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/src/resnet18.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/src/resnet18_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/src/resnet18_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_loop.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_loop.cpp
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/src/vgg16_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/src/vgg16_imagenet.cpp