Add abstract interfaces for the CUDA and ROCm services

Split the CUDA and ROCm services into an interface and a concrete
implementation.

Author: fwyzard

PhysicsTools/TensorFlow/test/testBaseCUDA.h

@@ -23,18 +23,9 @@
 #include "FWCore/ServiceRegistry/interface/ServiceToken.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Utilities/interface/ResourceInformation.h"
-#include "HeterogeneousCore/CUDAServices/interface/CUDAService.h"
+#include "HeterogeneousCore/CUDAServices/interface/CUDAInterface.h"
 #include "HeterogeneousCore/CUDAUtilities/interface/requireDevices.h"
 
-namespace {
-  CUDAService makeCUDAService(edm::ParameterSet ps) {
-    auto desc = edm::ConfigurationDescriptions("Service", "CUDAService");
-    CUDAService::fillDescriptions(desc);
-    desc.validate(ps, "CUDAService");
-    return CUDAService(ps);
-  }
-}  // namespace
-
 class testBaseCUDA : public CppUnit::TestFixture {
 public:
   std::string dataPath_;

PhysicsTools/TensorFlow/test/testConstSessionCUDA.cc

@@ -46,16 +46,14 @@ process.add_(cms.Service('CUDAService'))
   edm::makeParameterSets(config, params);
   edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));
   edm::ServiceRegistry::Operate operate2(tempToken);
-
-  auto cs = makeCUDAService(edm::ParameterSet{});
-  std::cout << "CUDA service enabled: " << cs.enabled() << std::endl;
-
-  std::string pbFile = dataPath_ + "/constantgraph.pb";
+  edm::Service<CUDAInterface> cuda;
+  std::cout << "CUDA service enabled: " << cuda->enabled() << std::endl;
 
   std::cout << "Testing CUDA backend" << std::endl;
   tensorflow::Backend backend = tensorflow::Backend::cuda;
 
   // load the graph
+  std::string pbFile = dataPath_ + "/constantgraph.pb";
   tensorflow::setLogging();
   tensorflow::GraphDef* graphDef = tensorflow::loadGraphDef(pbFile);
   CPPUNIT_ASSERT(graphDef != nullptr);

PhysicsTools/TensorFlow/test/testGraphLoadingCUDA.cc

@@ -46,16 +46,14 @@ process.add_(cms.Service('CUDAService'))
   edm::makeParameterSets(config, params);
   edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));
   edm::ServiceRegistry::Operate operate2(tempToken);
-
-  auto cs = makeCUDAService(edm::ParameterSet{});
-  std::cout << "CUDA service enabled: " << cs.enabled() << std::endl;
-
-  std::string pbFile = dataPath_ + "/constantgraph.pb";
+  edm::Service<CUDAInterface> cuda;
+  std::cout << "CUDA service enabled: " << cuda->enabled() << std::endl;
 
   std::cout << "Testing CUDA backend" << std::endl;
   tensorflow::Backend backend = tensorflow::Backend::cuda;
 
   // load the graph
+  std::string pbFile = dataPath_ + "/constantgraph.pb";
   tensorflow::setLogging();
   tensorflow::GraphDef* graphDef = tensorflow::loadGraphDef(pbFile);
   CPPUNIT_ASSERT(graphDef != nullptr);

PhysicsTools/TensorFlow/test/testHelloWorldCUDA.cc

@@ -48,12 +48,9 @@ process.add_(cms.Service('CUDAService'))
   edm::makeParameterSets(config, params);
   edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));
   edm::ServiceRegistry::Operate operate2(tempToken);
+  edm::Service<CUDAInterface> cuda;
+  std::cout << "CUDA service enabled: " << cuda->enabled() << std::endl;
 
-  auto cs = makeCUDAService(edm::ParameterSet{});
-  std::cout << "CUDA service enabled: " << cs.enabled() << std::endl;
-
-  std::string modelDir = dataPath_ + "/simplegraph";
-  // Testing CPU
   std::cout << "Testing CUDA backend" << std::endl;
   tensorflow::Backend backend = tensorflow::Backend::cuda;
 
@@ -65,6 +62,7 @@ process.add_(cms.Service('CUDAService'))
   tensorflow::SavedModelBundle bundle;
 
   // load everything
+  std::string modelDir = dataPath_ + "/simplegraph";
   status = tensorflow::LoadSavedModel(sessionOptions, runOptions, modelDir, {"serve"}, &bundle);
   if (!status.ok()) {
     std::cout << status.ToString() << std::endl;

PhysicsTools/TensorFlow/test/testMetaGraphLoadingCUDA.cc

@@ -46,15 +46,14 @@ process.add_(cms.Service('CUDAService'))
   edm::makeParameterSets(config, params);
   edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));
   edm::ServiceRegistry::Operate operate2(tempToken);
-
-  auto cs = makeCUDAService(edm::ParameterSet{});
-  std::cout << "CUDA service enabled: " << cs.enabled() << std::endl;
-  std::string exportDir = dataPath_ + "/simplegraph";
+  edm::Service<CUDAInterface> cuda;
+  std::cout << "CUDA service enabled: " << cuda->enabled() << std::endl;
 
   std::cout << "Testing CUDA backend" << std::endl;
   tensorflow::Backend backend = tensorflow::Backend::cuda;
 
   // load the graph
+  std::string exportDir = dataPath_ + "/simplegraph";
   tensorflow::setLogging();
   tensorflow::MetaGraphDef* metaGraphDef = tensorflow::loadMetaGraphDef(exportDir);
   CPPUNIT_ASSERT(metaGraphDef != nullptr);

PhysicsTools/TensorFlow/test/testSessionCacheCUDA.cc

@@ -45,18 +45,15 @@ process.add_(cms.Service('CUDAService'))
   edm::makeParameterSets(config, params);
   edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));
   edm::ServiceRegistry::Operate operate2(tempToken);
-
-  auto cs = makeCUDAService(edm::ParameterSet{});
-  std::cout << "CUDA service enabled: " << cs.enabled() << std::endl;
-
-  std::string pbFile = dataPath_ + "/constantgraph.pb";
+  edm::Service<CUDAInterface> cuda;
+  std::cout << "CUDA service enabled: " << cuda->enabled() << std::endl;
 
   std::cout << "Testing CUDA backend" << std::endl;
   tensorflow::Backend backend = tensorflow::Backend::cuda;
 
-  tensorflow::setLogging();
-
   // load the graph and the session
+  std::string pbFile = dataPath_ + "/constantgraph.pb";
+  tensorflow::setLogging();
   tensorflow::SessionCache cache(pbFile, backend);
   CPPUNIT_ASSERT(cache.graph.load() != nullptr);
   CPPUNIT_ASSERT(cache.session.load() != nullptr);

PhysicsTools/TensorFlow/test/testThreadPoolsCUDA.cc

@@ -46,11 +46,8 @@ process.add_(cms.Service('CUDAService'))
   edm::makeParameterSets(config, params);
   edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));
   edm::ServiceRegistry::Operate operate2(tempToken);
-
-  auto cs = makeCUDAService(edm::ParameterSet{});
-  std::cout << "CUDA service enabled: " << cs.enabled() << std::endl;
-
-  std::string pbFile = dataPath_ + "/constantgraph.pb";
+  edm::Service<CUDAInterface> cuda;
+  std::cout << "CUDA service enabled: " << cuda->enabled() << std::endl;
 
   std::cout << "Testing CUDA backend" << std::endl;
   tensorflow::Backend backend = tensorflow::Backend::cuda;
@@ -60,6 +57,7 @@ process.add_(cms.Service('CUDAService'))
   tensorflow::TBBThreadPool::instance(nThreads);
 
   // load the graph
+  std::string pbFile = dataPath_ + "/constantgraph.pb";
   tensorflow::setLogging();
   tensorflow::GraphDef* graphDef = tensorflow::loadGraphDef(pbFile);
   CPPUNIT_ASSERT(graphDef != nullptr);

PhysicsTools/TensorFlow/test/testVisibleDevicesCUDA.cc

@@ -49,16 +49,14 @@ process.add_(cms.Service('CUDAService'))
   edm::makeParameterSets(config, params);
   edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));
   edm::ServiceRegistry::Operate operate2(tempToken);
-
-  auto cs = makeCUDAService(edm::ParameterSet{});
-  std::cout << "CUDA service enabled: " << cs.enabled() << std::endl;
-
-  std::string pbFile = dataPath_ + "/constantgraph.pb";
+  edm::Service<CUDAInterface> cuda;
+  std::cout << "CUDA service enabled: " << cuda->enabled() << std::endl;
 
   std::cout << "Testing CUDA backend" << std::endl;
   tensorflow::Backend backend = tensorflow::Backend::cuda;
 
   // load the graph
+  std::string pbFile = dataPath_ + "/constantgraph.pb";
   tensorflow::setLogging();
   tensorflow::GraphDef* graphDef = tensorflow::loadGraphDef(pbFile);
   CPPUNIT_ASSERT(graphDef != nullptr);