diff --git a/Core.h b/Core.h index f6f10f6..fd28d3d 100644 --- a/Core.h +++ b/Core.h @@ -81,7 +81,7 @@ class Manager { #ifdef CUDACC std::unordered_map mStreams; cublasHandle_t mCublas; - cusparseHandle_t mCusparse; + // cusparseHandle_t mCusparse; #endif public: /** @@ -95,7 +95,7 @@ class Manager { #ifdef CUDACC cudaStream_t stream(const StreamID& stream) const; cublasHandle_t cublasHandle() const; - cusparseHandle_t cusparseHandle() const; + // cusparseHandle_t cusparseHandle() const; #endif }; @@ -393,7 +393,7 @@ Manager::Manager(const std::vector& names) { addStream(name); } CUBLAS_CHECK(cublasCreate(&mCublas)); - CUSPARSE_CHECK(cusparseCreate(&mCusparse)); + // CUSPARSE_CHECK(cusparseCreate(&mCusparse)); #endif } @@ -403,7 +403,7 @@ Manager::~Manager() { CUDA_CHECK(cudaStreamDestroy(it.second)); } CUBLAS_CHECK(cublasDestroy(mCublas)); - CUSPARSE_CHECK(cusparseDestroy(mCusparse)); + // CUSPARSE_CHECK(cusparseDestroy(mCusparse)); #endif } @@ -443,10 +443,9 @@ cudaStream_t Manager::stream(const StreamID& stream) const { } cublasHandle_t Manager::cublasHandle() const { return mCublas; }; -cusparseHandle_t Manager::cusparseHandle() const { return mCusparse; }; +// cusparseHandle_t Manager::cusparseHandle() const { return mCusparse; }; -Manager Manager::mManagerInstance = - Manager({"defaultMemory", "defaultCublas", "defaultCusparse", "defaultKernel"}); +Manager Manager::mManagerInstance = Manager({"defaultMemory", "defaultCublas", "defaultKernel"}); #else Manager Manager::mManagerInstance = Manager({""}); #endif diff --git a/Macros.h b/Macros.h index abf3e42..ac08a14 100644 --- a/Macros.h +++ b/Macros.h @@ -124,7 +124,7 @@ #include #include #include -#include +//#include #define DEVICE_FUNC __device__ #define HD __host__ __device__ @@ -257,6 +257,7 @@ } \ } while (0) +/* #define CUSPARSE_CHECK(call) \ do { \ cusparseStatus_t err = (call); \ @@ -265,6 +266,7 @@ throw std::exception(); \ } \ } while (0) +*/ #define CUDA_MEM(call, name) \ size_t free_bef_##name, free_aft_##name; \ diff --git a/Makefile b/Makefile index 8bf16d1..3a3b631 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ INCLUDE := LIBS_DIR := LIBS_DIR_GPU := /usr/local/cuda/lib64 LIBS := -LIBS_GPU := cuda cudart cublas cusparse +LIBS_GPU := cuda cudart cublas TARGET = tests SRC_DIR = . diff --git a/Makefile.template b/Makefile.template index 83fc049..48f72f8 100644 --- a/Makefile.template +++ b/Makefile.template @@ -7,7 +7,7 @@ INCLUDE := <> LIBS_DIR := <> LIBS_DIR_GPU := /usr/local/cuda/lib64 <> LIBS := <> -LIBS_GPU := cuda cudart cublas cusparse <> +LIBS_GPU := cuda cudart cublas <> TARGET = <> SRC_DIR = . diff --git a/Sparse.h b/Sparse.h deleted file mode 100644 index ca0baf3..0000000 --- a/Sparse.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CUDATOOLS_SPARSE_H -#define CUDATOOLS_SPARSE_H - -#include "Array.h" -#include "Core.h" -#include "Macros.h" -#include "Types.h" -#endif - -#endif