Relax cusparse windows guard on cuda 11 (#42412)

xwang233 · facebook-github-bot · commit c8cb5e5bcb5b · 2020-08-03T19:59:59.000-07:00
Summary: Fixes #42406 ### cusparse Xcsrmm2 API: (#37202) - new: https://docs.nvidia.com/cuda/cusparse/index.html#cusparse-generic-function-spmm - old (deprecated in cuda 11): https://docs.nvidia.com/cuda/archive/10.2/cusparse/index.html#csrmm2 Before: |cuda ver | windows | linux | |--|--|--| | 10.1 | old api | old api | | 10.2 | old api | new api | | 11 | old api (build error claimed in #42406) | new api | After: |cuda ver | windows | linux | |--|--|--| | 10.1 | old api | old api | | 10.2 | old api | **old api** | | 11 | **new api** | new api | ### cusparse bmm-sparse-dense API <details><summary>reverted, will be revisited in the future</summary> (cc kurtamohler #33430) - new: https://docs.nvidia.com/cuda/cusparse/index.html#cusparse-generic-function-spmm Before: |cuda ver | windows | linux | |--|--|--| | 10.1 | not supported | new api | | 10.2 | not supported | new api | | 11 | not supported | new api | After: |cuda ver | windows | linux | |--|--|--| | 10.1 | not supported | new api | | 10.2 | not supported | new api | | 11 | **new api** | new api | </details> Pull Request resolved: #42412 Reviewed By: agolynski Differential Revision: D22892032 Pulled By: ezyang fbshipit-source-id: cded614af970f0efdc79c74e18e1d9ea8a46d012
diff --git a/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu b/aten/src/ATen/native/sparse/cuda/SparseCUDABlas.cu
@@ -9,16 +9,11 @@
 
 #include <cusparse.h>
 
-#if !defined(_MSC_VER) && defined(__CUDACC__) && CUSPARSE_VERSION >= 10301 // CUDA release >= 10.2 and not windows
+#if defined(__CUDACC__) && CUSPARSE_VERSION >= 11000
 #include <library_types.h>
 #endif
 
-// LIMITATION (cusparseSpMM): 
-// The generic APIs are currently (CUDA 10.1) available for all platforms except Windows. 
-// Using these APIs in any other systems will result in compile-time or run-time failures. 
-// Their support will be extended in the next releases. 
-
-#if !defined(CUSPARSE_VERSION) || (CUSPARSE_VERSION < 10200)
+#if !defined(CUSPARSE_VERSION) || (CUSPARSE_VERSION < 10100)
 const char* cusparseGetErrorString(cusparseStatus_t status) {
   switch(status)
   {
@@ -81,7 +76,7 @@ cusparseOperation_t convertTransToCusparseOperation(char trans) {
   }
 }
 
-#if !defined(_MSC_VER) && defined(__CUDACC__) && CUSPARSE_VERSION >= 10301 // CUDA release >= 10.2 and not windows
+#if defined(__CUDACC__) && CUSPARSE_VERSION >= 11000
 
 template<typename T> 
 void csrmm2(
