Move cublas_handle into own header file

Author: sbalint98

src/blas/backends/cublas/cublas_handle.hpp

@@ -0,0 +1,56 @@
+/***************************************************************************
+*  Copyright (C) Codeplay Software Limited
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+*  For your convenience, a copy of the License has been included in this
+*  repository.
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+**************************************************************************/
+#ifndef CUBLAS_HANDLE_HIPSYCL_HPP
+#define CUBLAS_HANDLE_HIPSYCL_HPP
+#include<atomic>
+#include<unordered_map>
+
+namespace oneapi {
+namespace mkl {
+namespace blas {
+namespace cublas {
+
+template<typename T>
+struct cublas_handle {
+    using handle_container_t = std::unordered_map<T, std::atomic<cublasHandle_t> *>;
+    handle_container_t cublas_handle_mapper_{};
+    ~cublas_handle() noexcept(false){
+    for (auto &handle_pair : cublas_handle_mapper_) {
+        cublasStatus_t err;
+        if (handle_pair.second != nullptr) {
+            auto handle = handle_pair.second->exchange(nullptr);
+            if (handle != nullptr) {
+                CUBLAS_ERROR_FUNC(cublasDestroy, err, handle);
+                handle = nullptr;
+            }
+            delete handle_pair.second;
+            handle_pair.second = nullptr;
+        }
+    }
+    cublas_handle_mapper_.clear();
+}
+};
+
+
+} // namespace cublas
+} // namespace blas
+} // namespace mkl
+} // namespace oneapi
+
+#endif // CUBLAS_HANDLE_HIPSYCL_HPP

src/blas/backends/cublas/cublas_scope_handle.cpp

@@ -24,29 +24,14 @@ namespace mkl {
 namespace blas {
 namespace cublas {
 
-cublas_handle::~cublas_handle() noexcept(false) {
-    for (auto &handle_pair : cublas_handle_mapper_) {
-        cublasStatus_t err;
-        if (handle_pair.second != nullptr) {
-            auto handle = handle_pair.second->exchange(nullptr);
-            if (handle != nullptr) {
-                CUBLAS_ERROR_FUNC(cublasDestroy, err, handle);
-                handle = nullptr;
-            }
-            delete handle_pair.second;
-            handle_pair.second = nullptr;
-        }
-    }
-    cublas_handle_mapper_.clear();
-}
 /**
  * Inserts a new element in the map if its key is unique. This new element
  * is constructed in place using args as the arguments for the construction
  * of a value_type (which is an object of a pair type). The insertion only
  * takes place if no other element in the container has a key equivalent to
  * the one being emplaced (keys in a map container are unique).
  */
-thread_local cublas_handle CublasScopedContextHandler::handle_helper = cublas_handle{};
+thread_local cublas_handle<pi_context> CublasScopedContextHandler::handle_helper = cublas_handle<pi_context>{};
 
 CublasScopedContextHandler::CublasScopedContextHandler(cl::sycl::queue queue,
                                                        cl::sycl::interop_handler &ih)

src/blas/backends/cublas/cublas_scope_handle.hpp

@@ -27,17 +27,13 @@
 #include <thread>
 #include <unordered_map>
 #include "cublas_helper.hpp"
+#include "cublas_handle.hpp"
+
 namespace oneapi {
 namespace mkl {
 namespace blas {
 namespace cublas {
 
-struct cublas_handle {
-    using handle_container_t = std::unordered_map<pi_context, std::atomic<cublasHandle_t> *>;
-    handle_container_t cublas_handle_mapper_{};
-    ~cublas_handle() noexcept(false);
-};
-
 /**
 * @brief NVIDIA advise for handle creation:
 https://devtalk.nvidia.com/default/topic/838794/gpu-accelerated libraries/using-cublas-in-different-cuda-streams/
@@ -69,7 +65,7 @@ class CublasScopedContextHandler {
     cl::sycl::context placedContext_;
     bool needToRecover_;
     cl::sycl::interop_handler &ih;
-    static thread_local cublas_handle handle_helper;
+    static thread_local cublas_handle<pi_context> handle_helper;
     CUstream get_stream(const cl::sycl::queue &queue);
     cl::sycl::context get_context(const cl::sycl::queue &queue);
 

src/blas/backends/cublas/cublas_scope_handle_hipsycl.cpp

@@ -1,27 +1,12 @@
 #include "cublas_scope_handle_hipsycl.hpp"
+#include "cublas_handle.hpp"
 
 namespace oneapi {
 namespace mkl {
 namespace blas {
 namespace cublas {
 
-cublas_handle::~cublas_handle() noexcept(false) {
-    for (auto &handle_pair : cublas_handle_mapper_) {
-        cublasStatus_t err;
-        if (handle_pair.second != nullptr) {
-            auto handle = handle_pair.second->exchange(nullptr);
-            if (handle != nullptr) {
-                CUBLAS_ERROR_FUNC(cublasDestroy, err, handle);
-                handle = nullptr;
-            }
-            delete handle_pair.second;
-            handle_pair.second = nullptr;
-        }
-    }
-    cublas_handle_mapper_.clear();
-}
-
-thread_local cublas_handle CublasScopedContextHandler::handle_helper = cublas_handle{};
+thread_local cublas_handle<int> CublasScopedContextHandler::handle_helper = cublas_handle<int>{};
 
 CublasScopedContextHandler::CublasScopedContextHandler(cl::sycl::queue queue,
                                                        cl::sycl::interop_handle &ih)

src/blas/backends/cublas/cublas_scope_handle_hipsycl.hpp

@@ -23,17 +23,12 @@
 #include <thread>
 #include <unordered_map>
 #include "cublas_helper.hpp"
+#include "cublas_handle.hpp"
 namespace oneapi {
 namespace mkl {
 namespace blas {
 namespace cublas {
 
-struct cublas_handle {
-    using handle_container_t = std::unordered_map<int, std::atomic<cublasHandle_t> *>;
-    handle_container_t cublas_handle_mapper_{};
-    ~cublas_handle() noexcept(false);
-};
-
 /**
 * @brief NVIDIA advise for handle creation:
 https://devtalk.nvidia.com/default/topic/838794/gpu-accelerated libraries/using-cublas-in-different-cuda-streams/
@@ -61,7 +56,7 @@ the handle must be destroyed when the context goes out of scope. This will bind
 
 class CublasScopedContextHandler {
     cl::sycl::interop_handle interop_h;
-    static thread_local cublas_handle handle_helper;
+    static thread_local cublas_handle<int> handle_helper;
     cl::sycl::context get_context(const cl::sycl::queue &queue);
     CUstream get_stream(const cl::sycl::queue &queue);