Moving utils.hpp under tests/ and added DBG print in Init/Finalize

Signed-off-by: Loic Pottier <[email protected]>

Author: lpottier

src/AMSlib/AMS.cpp

@@ -604,12 +604,14 @@ static std::unique_ptr<AMSWrap> _amsWrap;
 
 void AMSInit() {
   std::call_once(_amsInitFlag, [&]() {
+    DBG(AMS, "Initialization of AMS")
     _amsWrap = std::make_unique<AMSWrap>();
   });
 }
 
 void AMSFinalize() {
   std::call_once(_amsFinalizeFlag, [&]() {
+    DBG(AMS, "Finalization of AMS")
     _amsWrap.reset();
   });
 }

tests/AMSlib/ams_allocate.cpp

@@ -17,7 +17,7 @@ constexpr int SUCCESS = 0;
 #include <umpire/strategy/QuickPool.hpp>
 #include <wf/resource_manager.hpp>
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 int test_allocation(AMSResourceType resource, std::string pool_name)
 {

tests/AMSlib/ams_bench_db.cpp

@@ -18,7 +18,7 @@
 
 #include "AMS.h"
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 AMSDType getDataType(const char *d_type)
 {

tests/AMSlib/ams_ete.cpp

@@ -16,7 +16,7 @@
 #include "AMS.h"
 #include "wf/debug.h"
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 void createUmpirePool(std::string parent_name, std::string pool_name)
 {

tests/AMSlib/ams_ete_env.cpp

@@ -16,7 +16,7 @@
 #include "AMS.h"
 #include "wf/debug.h"
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 void createUmpirePool(std::string parent_name, std::string pool_name)
 {

tests/AMSlib/ams_rmq_env.cpp

@@ -16,7 +16,7 @@
 #include "AMS.h"
 #include "wf/debug.h"
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 void createUmpirePool(std::string parent_name, std::string pool_name)
 {

tests/AMSlib/ams_update_model.cpp

@@ -11,7 +11,7 @@
 #include <vector>
 #include <wf/resource_manager.hpp>
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 #define SIZE (32L)
 

tests/AMSlib/ams_uq_model.cpp

@@ -9,7 +9,7 @@
 #include <vector>
 #include <wf/resource_manager.hpp>
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 #define SIZE (32L * 1024L + 3L)
 

tests/AMSlib/cpu_packing_test.cpp

@@ -13,7 +13,7 @@
 #include <wf/data_handler.hpp>
 #include <wf/resource_manager.hpp>
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 #define SIZE (32 * 1024 + 1)
 

tests/AMSlib/gpu_packing_test.cpp

@@ -13,7 +13,7 @@
 #include "utils/allocator.hpp"
 #include "utils/utils_data.hpp"
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 // All allocations and operations will happen on top of this 'SIZE'. 
 // Keep a small value for test to be 'fast'.

tests/AMSlib/lb.cpp

@@ -10,6 +10,8 @@
 
 #include "wf/redist_load.hpp"
 
+#include "../utils.hpp"
+
 #define SIZE (10)
 
 void init(double *data, int elements, double value)
@@ -34,6 +36,10 @@ int main(int argc, char *argv[])
 {
   using namespace ams;
   int device = std::atoi(argv[1]);
+
+  installSignals();
+  AMSInit();
+
   MPI_Init(&argc, &argv);
   AMSSetupAllocator(AMSResourceType::AMS_HOST);
   AMSResourceType resource = AMSResourceType::AMS_HOST;
@@ -101,5 +107,6 @@ int main(int argc, char *argv[])
   ResourceManager::deallocate(srcHData, AMSResourceType::AMS_HOST);
 
   MPI_Finalize();
+  AMSFinalize();
   return ret;
 }

tests/AMSlib/test_hdcache.cpp

@@ -16,7 +16,7 @@
 #include <vector>
 #include <wf/resource_manager.hpp>
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 template <typename T>
 std::vector<const T *> generate_vectors(const int num_clusters,

tests/AMSlib/torch_model.cpp

@@ -15,7 +15,7 @@
 #include <vector>
 #include <wf/resource_manager.hpp>
 
-#include "utils.hpp"
+#include "../utils.hpp"
 
 #define SIZE (32L * 1024L + 3L)