From cb27c235f379769ad88e69a0a32e1d49a9fefc5b Mon Sep 17 00:00:00 2001
From: Matti Kortelainen <matti.kortelainen@cern.ch>
Date: Thu, 28 Nov 2019 04:18:37 -0600
Subject: [PATCH] Remove {get,set}CurrentDevice() from CUDAService (#418)

---
 HeterogeneousCore/CUDAServices/interface/CUDAService.h |  6 ------
 HeterogeneousCore/CUDAServices/src/CUDAService.cc      |  4 ----
 .../CUDAServices/test/testCUDAService.cpp              | 10 ----------
 3 files changed, 20 deletions(-)

diff --git a/HeterogeneousCore/CUDAServices/interface/CUDAService.h b/HeterogeneousCore/CUDAServices/interface/CUDAService.h
index 220d18e196655..625ce40fdcdc9 100644
--- a/HeterogeneousCore/CUDAServices/interface/CUDAService.h
+++ b/HeterogeneousCore/CUDAServices/interface/CUDAService.h
@@ -37,12 +37,6 @@ class CUDAService {
   // Returns the id of device with most free memory. If none is found, returns -1.
   int deviceWithMostFreeMemory() const;
 
-  // Set the current device
-  void setCurrentDevice(int device) const;
-
-  // Get the current device
-  int getCurrentDevice() const;
-
 private:
   int numberOfDevices_ = 0;
   std::vector<std::pair<int, int>> computeCapabilities_;
diff --git a/HeterogeneousCore/CUDAServices/src/CUDAService.cc b/HeterogeneousCore/CUDAServices/src/CUDAService.cc
index 4a18ed2dcf176..1568e5bb508eb 100644
--- a/HeterogeneousCore/CUDAServices/src/CUDAService.cc
+++ b/HeterogeneousCore/CUDAServices/src/CUDAService.cc
@@ -385,7 +385,3 @@ int CUDAService::deviceWithMostFreeMemory() const {
   cudaCheck(cudaSetDevice(currentDevice));
   return device;
 }
-
-void CUDAService::setCurrentDevice(int device) const { cudaCheck(cudaSetDevice(device)); }
-
-int CUDAService::getCurrentDevice() const { return cudautils::currentDevice(); }
diff --git a/HeterogeneousCore/CUDAServices/test/testCUDAService.cpp b/HeterogeneousCore/CUDAServices/test/testCUDAService.cpp
index 816d0f1c83da7..88e9508b7206c 100644
--- a/HeterogeneousCore/CUDAServices/test/testCUDAService.cpp
+++ b/HeterogeneousCore/CUDAServices/test/testCUDAService.cpp
@@ -111,16 +111,6 @@ TEST_CASE("Tests of CUDAService", "[CUDAService]") {
       WARN("Device with most free memory " << dev << "\n"
                                            << "     as given by CUDAService " << cs.deviceWithMostFreeMemory());
     }
-
-    SECTION("CUDAService set/get the current device") {
-      for (int i = 0; i < deviceCount; ++i) {
-        cs.setCurrentDevice(i);
-        int device = -1;
-        cudaGetDevice(&device);
-        REQUIRE(device == i);
-        REQUIRE(device == cs.getCurrentDevice());
-      }
-    }
   }
 
   SECTION("Force to be disabled") {