diff --git a/cuda/ccusparse.h b/cuda/ccusparse.h index f101c73d..a5380a0a 100644 --- a/cuda/ccusparse.h +++ b/cuda/ccusparse.h @@ -38,8 +38,6 @@ #include #include #include "cintrf.h" -#include "fcusparse.h" - /* Double precision real */ #define TYPE float complex @@ -97,4 +95,6 @@ #endif +#include "fcusparse.h" + #endif diff --git a/cuda/dcusparse.h b/cuda/dcusparse.h index d7875650..34849b1e 100644 --- a/cuda/dcusparse.h +++ b/cuda/dcusparse.h @@ -38,8 +38,6 @@ #include #include #include "cintrf.h" -#include "fcusparse.h" - /* Double precision real */ #define TYPE double @@ -97,5 +95,7 @@ #endif +#include "fcusparse.h" + #endif diff --git a/cuda/fcusparse.h b/cuda/fcusparse.h index 7d2972f8..6ef22db2 100644 --- a/cuda/fcusparse.h +++ b/cuda/fcusparse.h @@ -65,4 +65,7 @@ cusparseHandle_t *getHandle(); } \ } + #endif + + diff --git a/cuda/fcusparse_fct.h b/cuda/fcusparse_fct.h index 28d900da..ecba8484 100644 --- a/cuda/fcusparse_fct.h +++ b/cuda/fcusparse_fct.h @@ -27,7 +27,7 @@ /* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) */ /* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE */ /* POSSIBILITY OF SUCH DAMAGE. */ - + typedef struct T_CSRGDeviceMat { #if CUDA_SHORT_VERSION <= 10 @@ -129,7 +129,7 @@ int T_spsvHYBGDevice(T_Hmat *Matrix, TYPE alpha, void *deviceX, int T_HYBGHost2Device(T_Hmat *Matrix, int m, int n, int nz, int *irp, int *ja, TYPE *val); #endif - + int T_spmvCSRGDevice(T_Cmat *Matrix, TYPE alpha, void *deviceX, TYPE beta, void *deviceY) { diff --git a/cuda/scusparse.h b/cuda/scusparse.h index 724bdc2a..479f5069 100644 --- a/cuda/scusparse.h +++ b/cuda/scusparse.h @@ -31,7 +31,6 @@ #ifndef SCUSPARSE_ #define SCUSPARSE_ - #include #include @@ -39,8 +38,6 @@ #include #include #include "cintrf.h" -#include "fcusparse.h" - /* Double precision real */ #define TYPE float @@ -98,5 +95,6 @@ #endif -#endif +#include "fcusparse.h" +#endif diff --git a/cuda/zcusparse.h b/cuda/zcusparse.h index 364e8ecc..b63aa103 100644 --- a/cuda/zcusparse.h +++ b/cuda/zcusparse.h @@ -38,8 +38,6 @@ #include #include #include "cintrf.h" -#include "fcusparse.h" - /* Double precision real */ #define TYPE double complex @@ -97,5 +95,6 @@ #endif -#endif +#include "fcusparse.h" +#endif