From 5ed204d556799468c646f02cebbe207583fdffc7 Mon Sep 17 00:00:00 2001
From: Yifan Zhao <yifanz16@illinois.edu>
Date: Tue, 12 Jan 2021 06:35:15 -0600
Subject: [PATCH] Moved dnn sources one level up and updated cmake

---
 hpvm/test/dnn_benchmarks/CMakeLists.txt                       | 4 ++--
 .../dnn_benchmarks/benchmarks/alexnet/{src => }/alexnet.cpp   | 0
 .../benchmarks/alexnet/{src => }/alexnet_loop.cpp             | 0
 .../dnn_benchmarks/benchmarks/alexnet2/{src => }/alexnet2.cpp | 0
 .../benchmarks/alexnet2/{src => }/alexnet2_loop.cpp           | 0
 .../alexnet_imagenet/{src => }/alexnet_imagenet.cpp           | 0
 .../alexnet_imagenet/{src => }/alexnet_imagenet_loop.cpp      | 0
 .../benchmarks/lenet_mnist/{src => }/lenet_mnist.cpp          | 0
 .../benchmarks/lenet_mnist/{src => }/lenet_mnist_loop.cpp     | 0
 .../benchmarks/mobilenet/{src => }/mobilenet.cpp              | 0
 .../benchmarks/mobilenet/{src => }/mobilenet_loop.cpp         | 0
 .../dnn_benchmarks/benchmarks/resnet18/{src => }/resnet18.cpp | 0
 .../benchmarks/resnet18/{src => }/resnet18_loop.cpp           | 0
 .../resnet50_imagenet/{src => }/resnet50_imagenet.cpp         | 0
 .../resnet50_imagenet/{src => }/resnet50_imagenet_loop.cpp    | 0
 .../benchmarks/vgg16_cifar10/{src => }/vgg16_cifar10.cpp      | 0
 .../benchmarks/vgg16_cifar10/{src => }/vgg16_cifar10_loop.cpp | 0
 .../benchmarks/vgg16_cifar100/{src => }/vgg16_cifar100.cpp    | 0
 .../vgg16_cifar100/{src => }/vgg16_cifar100_loop.cpp          | 0
 .../benchmarks/vgg16_imagenet/{src => }/vgg16_imagenet.cpp    | 0
 .../vgg16_imagenet/{src => }/vgg16_imagenet_loop.cpp          | 0
 21 files changed, 2 insertions(+), 2 deletions(-)
 rename hpvm/test/dnn_benchmarks/benchmarks/alexnet/{src => }/alexnet.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/alexnet/{src => }/alexnet_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/alexnet2/{src => }/alexnet2.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/alexnet2/{src => }/alexnet2_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/{src => }/alexnet_imagenet.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/{src => }/alexnet_imagenet_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/{src => }/lenet_mnist.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/{src => }/lenet_mnist_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/mobilenet/{src => }/mobilenet.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/mobilenet/{src => }/mobilenet_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/resnet18/{src => }/resnet18.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/resnet18/{src => }/resnet18_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/{src => }/resnet50_imagenet.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/{src => }/resnet50_imagenet_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/{src => }/vgg16_cifar10.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/{src => }/vgg16_cifar10_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/{src => }/vgg16_cifar100.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/{src => }/vgg16_cifar100_loop.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/{src => }/vgg16_imagenet.cpp (100%)
 rename hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/{src => }/vgg16_imagenet_loop.cpp (100%)

diff --git a/hpvm/test/dnn_benchmarks/CMakeLists.txt b/hpvm/test/dnn_benchmarks/CMakeLists.txt
index d0e349571f..92d34ad2a5 100644
--- 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}")
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet/src/alexnet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet/alexnet.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/alexnet/src/alexnet.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/alexnet/alexnet.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet/src/alexnet_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet/alexnet_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/alexnet/src/alexnet_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/alexnet/alexnet_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/src/alexnet2.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/alexnet2/src/alexnet2.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/src/alexnet2_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/alexnet2/src/alexnet2_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/alexnet2/alexnet2_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/src/alexnet_imagenet_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/src/lenet_mnist.cpp b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/src/lenet_mnist.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/src/lenet_mnist_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/src/lenet_mnist_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/src/mobilenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/mobilenet.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/mobilenet/src/mobilenet.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/mobilenet/mobilenet.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/src/mobilenet_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet/mobilenet_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/mobilenet/src/mobilenet_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/mobilenet/mobilenet_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/src/resnet18.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/resnet18/src/resnet18.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet18/src/resnet18_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/resnet18/src/resnet18_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/resnet18/resnet18_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/src/resnet50_imagenet_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/src/vgg16_cifar10_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/src/vgg16_cifar100_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100_loop.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/src/vgg16_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/src/vgg16_imagenet.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/src/vgg16_imagenet_loop.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet_loop.cpp
similarity index 100%
rename from hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/src/vgg16_imagenet_loop.cpp
rename to hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet_loop.cpp
-- 
GitLab