From e902fcc891552a68cf8d24d8e33e4a1c77260794 Mon Sep 17 00:00:00 2001 From: Konrad Kusiak Date: Mon, 19 Aug 2024 14:04:09 +0100 Subject: [PATCH] Changed naming of pi_removed ifdef --- src/blas/backends/cublas/cublas_scope_handle.cpp | 4 ++-- src/blas/backends/cublas/cublas_scope_handle.hpp | 6 +++--- src/blas/backends/cublas/cublas_task.hpp | 4 ++-- src/blas/backends/rocblas/rocblas_scope_handle.cpp | 4 ++-- src/blas/backends/rocblas/rocblas_scope_handle.hpp | 6 +++--- src/blas/backends/rocblas/rocblas_task.hpp | 4 ++-- src/lapack/backends/cusolver/cusolver_scope_handle.cpp | 4 ++-- src/lapack/backends/cusolver/cusolver_scope_handle.hpp | 6 +++--- src/lapack/backends/cusolver/cusolver_task.hpp | 4 ++-- src/lapack/backends/rocsolver/rocsolver_scope_handle.cpp | 4 ++-- src/lapack/backends/rocsolver/rocsolver_scope_handle.hpp | 6 +++--- src/lapack/backends/rocsolver/rocsolver_task.hpp | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/blas/backends/cublas/cublas_scope_handle.cpp b/src/blas/backends/cublas/cublas_scope_handle.cpp index edcfa67f5..1f84de776 100644 --- a/src/blas/backends/cublas/cublas_scope_handle.cpp +++ b/src/blas/backends/cublas/cublas_scope_handle.cpp @@ -35,7 +35,7 @@ namespace cublas { * 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). */ -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED thread_local cublas_handle CublasScopedContextHandler::handle_helper = cublas_handle{}; #else @@ -97,7 +97,7 @@ cublasHandle_t CublasScopedContextHandler::get_handle(const sycl::queue &queue) CUresult cuErr; CUcontext desired; CUDA_ERROR_FUNC(cuDevicePrimaryCtxRetain, cuErr, &desired, cudaDevice); -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED auto piPlacedContext_ = reinterpret_cast(desired); #else auto piPlacedContext_ = reinterpret_cast(desired); diff --git a/src/blas/backends/cublas/cublas_scope_handle.hpp b/src/blas/backends/cublas/cublas_scope_handle.hpp index 0e406bad8..341316d2f 100644 --- a/src/blas/backends/cublas/cublas_scope_handle.hpp +++ b/src/blas/backends/cublas/cublas_scope_handle.hpp @@ -36,8 +36,8 @@ // After Plugin Interface removal in DPC++ ur.hpp is the new include #if __has_include() #include -#ifndef _PI_INTERFACE_REMOVED_ -#define _PI_INTERFACE_REMOVED_ +#ifndef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED +#define ONEAPI_ONEMKL_PI_INTERFACE_REMOVED #endif #elif __has_include() #include @@ -88,7 +88,7 @@ class CublasScopedContextHandler { sycl::context *placedContext_; bool needToRecover_; sycl::interop_handle &ih; -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED static thread_local cublas_handle handle_helper; #else static thread_local cublas_handle handle_helper; diff --git a/src/blas/backends/cublas/cublas_task.hpp b/src/blas/backends/cublas/cublas_task.hpp index 8c6ad759d..a486aafee 100644 --- a/src/blas/backends/cublas/cublas_task.hpp +++ b/src/blas/backends/cublas/cublas_task.hpp @@ -38,8 +38,8 @@ // After Plugin Interface removal in DPC++ ur.hpp is the new include #if __has_include() #include -#ifndef _PI_INTERFACE_REMOVED_ -#define _PI_INTERFACE_REMOVED_ +#ifndef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED +#define ONEAPI_ONEMKL_PI_INTERFACE_REMOVED #endif #elif __has_include() #include diff --git a/src/blas/backends/rocblas/rocblas_scope_handle.cpp b/src/blas/backends/rocblas/rocblas_scope_handle.cpp index cbc282cac..5edca96f7 100644 --- a/src/blas/backends/rocblas/rocblas_scope_handle.cpp +++ b/src/blas/backends/rocblas/rocblas_scope_handle.cpp @@ -50,7 +50,7 @@ rocblas_handle_container::~rocblas_handle_container() noexcept(false) { * 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). */ -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED thread_local rocblas_handle_container RocblasScopedContextHandler::handle_helper = rocblas_handle_container{}; #else @@ -113,7 +113,7 @@ rocblas_handle RocblasScopedContextHandler::get_handle(const sycl::queue &queue) hipError_t hipErr; hipCtx_t desired; HIP_ERROR_FUNC(hipDevicePrimaryCtxRetain, hipErr, &desired, hipDevice); -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED auto piPlacedContext_ = reinterpret_cast(desired); #else auto piPlacedContext_ = reinterpret_cast(desired); diff --git a/src/blas/backends/rocblas/rocblas_scope_handle.hpp b/src/blas/backends/rocblas/rocblas_scope_handle.hpp index 7dfe7011a..734e58fb1 100644 --- a/src/blas/backends/rocblas/rocblas_scope_handle.hpp +++ b/src/blas/backends/rocblas/rocblas_scope_handle.hpp @@ -29,8 +29,8 @@ // After Plugin Interface removal in DPC++ ur.hpp is the new include #if __has_include() #include -#ifndef _PI_INTERFACE_REMOVED_ -#define _PI_INTERFACE_REMOVED_ +#ifndef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED +#define ONEAPI_ONEMKL_PI_INTERFACE_REMOVED #endif #elif __has_include() #include @@ -55,7 +55,7 @@ class RocblasScopedContextHandler { sycl::context *placedContext_; bool needToRecover_; sycl::interop_handle &interop_h; -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED static thread_local rocblas_handle_container handle_helper; #else static thread_local rocblas_handle_container handle_helper; diff --git a/src/blas/backends/rocblas/rocblas_task.hpp b/src/blas/backends/rocblas/rocblas_task.hpp index eff7d5c68..a52bd4c2e 100644 --- a/src/blas/backends/rocblas/rocblas_task.hpp +++ b/src/blas/backends/rocblas/rocblas_task.hpp @@ -37,8 +37,8 @@ // After Plugin Interface removal in DPC++ ur.hpp is the new include #if __has_include() #include -#ifndef _PI_INTERFACE_REMOVED_ -#define _PI_INTERFACE_REMOVED_ +#ifndef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED +#define ONEAPI_ONEMKL_PI_INTERFACE_REMOVED #endif #elif __has_include() #include diff --git a/src/lapack/backends/cusolver/cusolver_scope_handle.cpp b/src/lapack/backends/cusolver/cusolver_scope_handle.cpp index ad5c9ac2d..a0c9c6b6f 100644 --- a/src/lapack/backends/cusolver/cusolver_scope_handle.cpp +++ b/src/lapack/backends/cusolver/cusolver_scope_handle.cpp @@ -35,7 +35,7 @@ namespace cusolver { * 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). */ -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED thread_local cusolver_handle CusolverScopedContextHandler::handle_helper = cusolver_handle{}; #else @@ -98,7 +98,7 @@ cusolverDnHandle_t CusolverScopedContextHandler::get_handle(const sycl::queue &q CUresult cuErr; CUcontext desired; CUDA_ERROR_FUNC(cuDevicePrimaryCtxRetain, cuErr, &desired, cudaDevice); -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED auto piPlacedContext_ = reinterpret_cast(desired); #else auto piPlacedContext_ = reinterpret_cast(desired); diff --git a/src/lapack/backends/cusolver/cusolver_scope_handle.hpp b/src/lapack/backends/cusolver/cusolver_scope_handle.hpp index c0bb50bc9..390f9bb46 100644 --- a/src/lapack/backends/cusolver/cusolver_scope_handle.hpp +++ b/src/lapack/backends/cusolver/cusolver_scope_handle.hpp @@ -42,8 +42,8 @@ // After Plugin Interface removal in DPC++ ur.hpp is the new include #if __has_include() #include -#ifndef _PI_INTERFACE_REMOVED_ -#define _PI_INTERFACE_REMOVED_ +#ifndef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED +#define ONEAPI_ONEMKL_PI_INTERFACE_REMOVED #endif #elif __has_include() #include @@ -92,7 +92,7 @@ class CusolverScopedContextHandler { sycl::context *placedContext_; bool needToRecover_; sycl::interop_handle &ih; -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED static thread_local cusolver_handle handle_helper; #else static thread_local cusolver_handle handle_helper; diff --git a/src/lapack/backends/cusolver/cusolver_task.hpp b/src/lapack/backends/cusolver/cusolver_task.hpp index 6fc6e70ab..00e6e26be 100644 --- a/src/lapack/backends/cusolver/cusolver_task.hpp +++ b/src/lapack/backends/cusolver/cusolver_task.hpp @@ -34,8 +34,8 @@ // After Plugin Interface removal in DPC++ ur.hpp is the new include #if __has_include() #include -#ifndef _PI_INTERFACE_REMOVED_ -#define _PI_INTERFACE_REMOVED_ +#ifndef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED +#define ONEAPI_ONEMKL_PI_INTERFACE_REMOVED #endif #elif __has_include() #include diff --git a/src/lapack/backends/rocsolver/rocsolver_scope_handle.cpp b/src/lapack/backends/rocsolver/rocsolver_scope_handle.cpp index 930e0139b..480ee9fc3 100644 --- a/src/lapack/backends/rocsolver/rocsolver_scope_handle.cpp +++ b/src/lapack/backends/rocsolver/rocsolver_scope_handle.cpp @@ -37,7 +37,7 @@ namespace rocsolver { * 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). */ -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED thread_local rocsolver_handle RocsolverScopedContextHandler::handle_helper = rocsolver_handle{}; #else @@ -100,7 +100,7 @@ rocblas_handle RocsolverScopedContextHandler::get_handle(const sycl::queue &queu hipError_t hipErr; hipCtx_t desired; HIP_ERROR_FUNC(hipDevicePrimaryCtxRetain, hipErr, &desired, hipDevice); -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED auto piPlacedContext_ = reinterpret_cast(desired); #else auto piPlacedContext_ = reinterpret_cast(desired); diff --git a/src/lapack/backends/rocsolver/rocsolver_scope_handle.hpp b/src/lapack/backends/rocsolver/rocsolver_scope_handle.hpp index c9144481d..1be98a3b9 100644 --- a/src/lapack/backends/rocsolver/rocsolver_scope_handle.hpp +++ b/src/lapack/backends/rocsolver/rocsolver_scope_handle.hpp @@ -36,8 +36,8 @@ // After Plugin Interface removal in DPC++ ur.hpp is the new include #if __has_include() #include -#ifndef _PI_INTERFACE_REMOVED_ -#define _PI_INTERFACE_REMOVED_ +#ifndef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED +#define ONEAPI_ONEMKL_PI_INTERFACE_REMOVED #endif #elif __has_include() #include @@ -55,7 +55,7 @@ class RocsolverScopedContextHandler { sycl::context *placedContext_; bool needToRecover_; sycl::interop_handle &ih; -#ifdef _PI_INTERFACE_REMOVED_ +#ifdef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED static thread_local rocsolver_handle handle_helper; #else static thread_local rocsolver_handle handle_helper; diff --git a/src/lapack/backends/rocsolver/rocsolver_task.hpp b/src/lapack/backends/rocsolver/rocsolver_task.hpp index 7f321500c..902b2f080 100644 --- a/src/lapack/backends/rocsolver/rocsolver_task.hpp +++ b/src/lapack/backends/rocsolver/rocsolver_task.hpp @@ -36,8 +36,8 @@ // After Plugin Interface removal in DPC++ ur.hpp is the new include #if __has_include() #include -#ifndef _PI_INTERFACE_REMOVED_ -#define _PI_INTERFACE_REMOVED_ +#ifndef ONEAPI_ONEMKL_PI_INTERFACE_REMOVED +#define ONEAPI_ONEMKL_PI_INTERFACE_REMOVED #endif #elif __has_include() #include