From c5e1297ba0cbdbb9c30af89b7ec6c3662ee0aa8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Gr=C3=BCtzmacher?= Date: Wed, 12 Jan 2022 05:09:29 +0100 Subject: [PATCH] Exclude CUDA 11.3.0 from the triangular solver Only CUDA 11.3.1 starts to support `cusparseSpSM_solve`, version 11.3.0 does not support it yet. --- cuda/base/cusparse_bindings.hpp | 8 ++++---- cuda/solver/common_trs_kernels.cuh | 2 +- cuda/test/solver/lower_trs_kernels.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cuda/base/cusparse_bindings.hpp b/cuda/base/cusparse_bindings.hpp index 27a09ae2800..0204dd5c714 100644 --- a/cuda/base/cusparse_bindings.hpp +++ b/cuda/base/cusparse_bindings.hpp @@ -879,7 +879,7 @@ inline void destroy(cusparseSpMatDescr_t descr) } -#if (CUDA_VERSION >= 11030) +#if (CUDA_VERSION > 11030) template @@ -905,7 +905,7 @@ inline void destroy(cusparseSpSMDescr_t info) } -#endif // CUDA_VERSION >= 11030 +#endif // CUDA_VERSION > 11030 #endif // defined(CUDA_VERSION) && (CUDA_VERSION >= 11000) @@ -1108,7 +1108,7 @@ GKO_BIND_CUSPARSE64_CSRSM2_SOLVE(ValueType, detail::not_implemented); #undef GKO_BIND_CUSPARSE64_CSRSM2_SOLVE -#if (defined(CUDA_VERSION) && (CUDA_VERSION >= 11030)) +#if (defined(CUDA_VERSION) && (CUDA_VERSION > 11030)) template @@ -1153,7 +1153,7 @@ void spsm_solve(cusparseHandle_t handle, cusparseOperation_t op_a, } -#endif // (defined(CUDA_VERSION) && (CUDA_VERSION >= 11030)) +#endif // (defined(CUDA_VERSION) && (CUDA_VERSION > 11030)) template diff --git a/cuda/solver/common_trs_kernels.cuh b/cuda/solver/common_trs_kernels.cuh index 492ca5cbdf8..0840323baff 100644 --- a/cuda/solver/common_trs_kernels.cuh +++ b/cuda/solver/common_trs_kernels.cuh @@ -75,7 +75,7 @@ namespace cuda { namespace { -#if (defined(CUDA_VERSION) && (CUDA_VERSION >= 11030)) +#if (defined(CUDA_VERSION) && (CUDA_VERSION > 11030)) template diff --git a/cuda/test/solver/lower_trs_kernels.cpp b/cuda/test/solver/lower_trs_kernels.cpp index 89d09d1c97b..763986df7be 100644 --- a/cuda/test/solver/lower_trs_kernels.cpp +++ b/cuda/test/solver/lower_trs_kernels.cpp @@ -199,7 +199,7 @@ TEST_F(LowerTrs, CudaMultipleRhsApplyIsEquivalentToRef) d_b2->convert_to(db2_strided.get()); // The cuSPARSE Generic SpSM implementation uses the wrong stride here // so the input and output stride need to match -#if CUDA_VERSION >= 11030 +#if CUDA_VERSION > 11030 auto dx_strided = Mtx::create(cuda, x->get_size(), 4); #else auto dx_strided = Mtx::create(cuda, x->get_size(), 5);