Minor improvements from PR review comments

cms-sw · Dec 6, 2022 · 033c52c · 033c52c
1 parent 3b90e74
commit 033c52c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/FWCore/Integration/test/testSubProcess_cfg.py b/FWCore/Integration/test/testSubProcess_cfg.py
@@ -36,7 +36,6 @@
 
 process.ZombieKillerService = cms.Service("ZombieKillerService")
 process.JobReportService = cms.Service("JobReportService")
-process.CUDAService = cms.Service("CUDAService")
 
 # ---------------------------------------------------------------
 
@@ -73,9 +72,6 @@
 copyProcess.ResourceInformationService = cms.Service("ResourceInformationService",
     intentionallyIllegalParameter = cms.bool(True)
 )
-copyProcess.CUDAService = cms.Service("CUDAService",
-    intentionallyIllegalParameter = cms.bool(True)
-)
 copyProcess.CondorStatusService = cms.Service("CondorStatusService",
     intentionallyIllegalParameter = cms.bool(True)
 )

diff --git a/FWCore/Services/plugins/CondorStatusUpdater.cc b/FWCore/Services/plugins/CondorStatusUpdater.cc
@@ -1,6 +1,7 @@
 
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "DataFormats/Provenance/interface/ParameterSetID.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/ResourceInformation.h"
 #include "FWCore/Utilities/interface/TimingServiceBase.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -253,7 +254,7 @@ void CondorStatusService::lastUpdate() {
   updateChirp("Done", "true");
   edm::Service<edm::ResourceInformation> resourceInformationService;
   if (!resourceInformationService.isAvailable()) {
-    std::cout << "At post, ResourceInformationService is NOT available.\n";
+    edm::LogWarning("CondorStatusService") << "At post, ResourceInformationService is NOT available.\n";
   }
 }
 

diff --git a/FWCore/Services/test/test_resourceInformationService_cfg.py b/FWCore/Services/test/test_resourceInformationService_cfg.py
@@ -8,11 +8,10 @@ class ProcessAcceleratorTest(cms.ProcessAccelerator):
     def __init__(self):
         super(ProcessAcceleratorTest,self).__init__()
         self._labels = ["test1", "gpu-foo", "test2"]
-        self._enabled = ["test1", "gpu-foo", "test2"]
     def labels(self):
         return self._labels
     def enabledLabels(self):
-        return self._enabled
+        return self._labels
 
 process = cms.Process("PROD")
 process.add_(ProcessAcceleratorTest())