Remove dependencies on umpire

Author: koparasy

tests/AMSlib/ams_interface/ams_ete.cpp

@@ -8,8 +8,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <limits>
-#include <umpire/Umpire.hpp>
-#include <umpire/strategy/QuickPool.hpp>
 #include <wf/basedb.hpp>
 #include <wf/resource_manager.hpp>
 
@@ -19,14 +17,6 @@
 
 using namespace ams;
 
-void createUmpirePool(std::string parent_name, std::string pool_name)
-{
-  auto &rm = umpire::ResourceManager::getInstance();
-  auto alloc_resource = rm.makeAllocator<umpire::strategy::QuickPool, true>(
-      pool_name, rm.getAllocator(parent_name));
-}
-
-
 AMSDType getDataType(char *d_type)
 {
   AMSDType dType = AMSDType::AMS_DOUBLE;
@@ -75,8 +65,6 @@ struct Problem {
                int iterations,
                int num_elements)
   {
-    auto &rm = umpire::ResourceManager::getInstance();
-
     for (int i = 0; i < iterations; i++) {
       int elements = num_elements;  // * ((DType)(rand()) / RAND_MAX) + 1;
       SmallVector<AMSTensor> input_tensors;
@@ -184,9 +172,6 @@ int main(int argc, char **argv)
           uq_policy == AMSUQPolicy::AMS_RANDOM) &&
          "Test only supports duq models");
 
-  createUmpirePool("HOST", "TEST_HOST");
-  AMSSetAllocator(AMSResourceType::AMS_HOST, "TEST_HOST");
-
   AMSCAbstrModel model_descr = AMSRegisterAbstractModel(
       "test", uq_policy, threshold, model_path, "test");
 

tests/AMSlib/ams_interface/ams_ete_env.cpp

@@ -6,23 +6,13 @@
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
-#include <umpire/Umpire.hpp>
-#include <umpire/strategy/QuickPool.hpp>
 #include <wf/basedb.hpp>
 #include <wf/resource_manager.hpp>
 
 #include "AMS.h"
 
 using namespace ams;
 
-void createUmpirePool(std::string parent_name, std::string pool_name)
-{
-  auto &rm = umpire::ResourceManager::getInstance();
-  auto alloc_resource = rm.makeAllocator<umpire::strategy::QuickPool, true>(
-      pool_name, rm.getAllocator(parent_name));
-}
-
-
 AMSDType getDataType(char *d_type)
 {
   AMSDType dType = AMSDType::AMS_DOUBLE;
@@ -71,8 +61,6 @@ struct Problem {
                int iterations,
                int num_elements)
   {
-    auto &rm = umpire::ResourceManager::getInstance();
-
     for (int i = 0; i < iterations; i++) {
       int elements = num_elements;  // * ((DType)(rand()) / RAND_MAX) + 1;
       SmallVector<AMSTensor> input_tensors;
@@ -185,10 +173,6 @@ int main(int argc, char **argv)
   AMSResourceType resource = AMSResourceType::AMS_HOST;
   srand(time(NULL));
 
-
-  createUmpirePool("HOST", "TEST_HOST");
-  AMSSetAllocator(AMSResourceType::AMS_HOST, "TEST_HOST");
-
   AMSCAbstrModel models[] = {AMSQueryModel(model1), AMSQueryModel(model2)};
 
   for (int i = 0; i < 2; i++) {

tests/AMSlib/ams_interface/ams_multi_model_ete.cpp

@@ -8,22 +8,12 @@
 #include <cstring>
 #include <limits>
 #include <ml/uq.hpp>
-#include <umpire/Umpire.hpp>
-#include <umpire/strategy/QuickPool.hpp>
 #include <wf/basedb.hpp>
 #include <wf/resource_manager.hpp>
 
 #include "AMS.h"
 #include "wf/debug.h"
 
-void createUmpirePool(std::string parent_name, std::string pool_name)
-{
-  auto &rm = umpire::ResourceManager::getInstance();
-  auto alloc_resource = rm.makeAllocator<umpire::strategy::QuickPool, true>(
-      pool_name, rm.getAllocator(parent_name));
-}
-
-
 AMSDType getDataType(char *d_type)
 {
   AMSDType dType = AMSDType::AMS_DOUBLE;
@@ -72,8 +62,6 @@ struct Problem {
                int iterations,
                int num_elements)
   {
-    auto &rm = umpire::ResourceManager::getInstance();
-
     for (int i = 0; i < iterations; i++) {
       int elements = num_elements;  // * ((DType)(rand()) / RAND_MAX) + 1;
       std::vector<const DType *> inputs;
@@ -168,9 +156,6 @@ int main(int argc, char **argv)
           uq_policy == AMSUQPolicy::AMS_RANDOM) &&
          "Test only supports duq models");
 
-  createUmpirePool("HOST", "TEST_HOST");
-  AMSSetAllocator(AMSResourceType::AMS_HOST, "TEST_HOST");
-
   AMSCAbstrModel model_descr_1 = AMSRegisterAbstractModel(
       "test_1", uq_policy, threshold, model_path_1, nullptr, "test_1", -1);
 

tests/AMSlib/ams_interface/ams_rmq_env.cpp

@@ -8,21 +8,12 @@
 #include <cstring>
 #include <limits>
 #include <ml/uq.hpp>
-#include <umpire/Umpire.hpp>
-#include <umpire/strategy/QuickPool.hpp>
 #include <wf/basedb.hpp>
 #include <wf/resource_manager.hpp>
 
 #include "AMS.h"
 #include "wf/debug.h"
 
-void createUmpirePool(std::string parent_name, std::string pool_name)
-{
-  auto &rm = umpire::ResourceManager::getInstance();
-  auto alloc_resource = rm.makeAllocator<umpire::strategy::QuickPool, true>(
-      pool_name, rm.getAllocator(parent_name));
-}
-
 
 AMSDType getDataType(char *d_type)
 {
@@ -71,8 +62,6 @@ struct Problem {
                int iterations,
                int num_elements)
   {
-    auto &rm = umpire::ResourceManager::getInstance();
-
     for (int i = 0; i < iterations; i++) {
       int elements = num_elements;  // * ((DType)(rand()) / RAND_MAX) + 1;
       std::vector<const DType *> inputs;
@@ -169,9 +158,6 @@ int main(int argc, char **argv)
   //   dbType = AMSDBType::AMS_RMQ;
   // }
 
-  createUmpirePool("HOST", "TEST_HOST");
-  AMSSetAllocator(AMSResourceType::AMS_HOST, "TEST_HOST");
-
   AMSCAbstrModel ams_model = AMSRegisterAbstractModel("rmq_db_no_model",
                                                         AMSUQPolicy::AMS_RANDOM,
                                                         0.5,