Skip to content

Commit b54902b

Browse files
committed
exclude cublas
1 parent acdc3b3 commit b54902b

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ before_install:
2929
- wget https://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/7fa2af80.pub
3030
- sudo apt-key add 7fa2af80.pub
3131
- sudo apt update -qq
32-
- sudo apt install -y cuda-${CUDA_SHORT/./-}
32+
- sudo apt install -y cuda-core-${CUDA_SHORT/./-} cuda-cudart-dev-${CUDA_SHORT/./-} cuda-cufft-dev-${CUDA_SHORT/./-}
3333
- sudo apt clean
3434
- export CUDA_HOME=/usr/local/cuda-${CUDA_SHORT}
3535
- export LD_LIBRARY_PATH=${CUDA_HOME}/lib64:${LD_LIBRARY_PATH}

cpp/include/utils/cuda_utils_kernels.cuh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// LICENSE file in the root directory of this source tree.
66
#pragma once
77
#include <unistd.h>
8-
#include <cublas_v2.h>
8+
// #include <cublas_v2.h>
99
#include <cuda_runtime.h>
1010

1111
#include <thrust/copy.h>
@@ -39,29 +39,29 @@ inline void checkCuda(cudaError_t code, const char *file, int line) {
3939
}
4040
}
4141

42-
inline const char* cublasGetErrorString(cublasStatus_t status) {
43-
switch (status) {
44-
case CUBLAS_STATUS_SUCCESS: return "CUBLAS_STATUS_SUCCESS";
45-
case CUBLAS_STATUS_NOT_INITIALIZED: return "CUBLAS_STATUS_NOT_INITIALIZED";
46-
case CUBLAS_STATUS_ALLOC_FAILED: return "CUBLAS_STATUS_ALLOC_FAILED";
47-
case CUBLAS_STATUS_INVALID_VALUE: return "CUBLAS_STATUS_INVALID_VALUE";
48-
case CUBLAS_STATUS_ARCH_MISMATCH: return "CUBLAS_STATUS_ARCH_MISMATCH";
49-
case CUBLAS_STATUS_MAPPING_ERROR: return "CUBLAS_STATUS_MAPPING_ERROR";
50-
case CUBLAS_STATUS_EXECUTION_FAILED: return "CUBLAS_STATUS_EXECUTION_FAILED";
51-
case CUBLAS_STATUS_INTERNAL_ERROR: return "CUBLAS_STATUS_INTERNAL_ERROR";
52-
}
53-
return "Unknown";
54-
}
55-
56-
#define CHECK_CUBLAS(code) { checkCublas((code), __FILE__, __LINE__); }
57-
inline void checkCublas(cublasStatus_t code, const char * file, int line) {
58-
if (code != CUBLAS_STATUS_SUCCESS) {
59-
std::stringstream err;
60-
err << "cublas error: " << cublasGetErrorString(code)
61-
<< " (" << file << ":" << line << ")";
62-
throw std::runtime_error(err.str());
63-
}
64-
}
42+
// inline const char* cublasGetErrorString(cublasStatus_t status) {
43+
// switch (status) {
44+
// case CUBLAS_STATUS_SUCCESS: return "CUBLAS_STATUS_SUCCESS";
45+
// case CUBLAS_STATUS_NOT_INITIALIZED: return "CUBLAS_STATUS_NOT_INITIALIZED";
46+
// case CUBLAS_STATUS_ALLOC_FAILED: return "CUBLAS_STATUS_ALLOC_FAILED";
47+
// case CUBLAS_STATUS_INVALID_VALUE: return "CUBLAS_STATUS_INVALID_VALUE";
48+
// case CUBLAS_STATUS_ARCH_MISMATCH: return "CUBLAS_STATUS_ARCH_MISMATCH";
49+
// case CUBLAS_STATUS_MAPPING_ERROR: return "CUBLAS_STATUS_MAPPING_ERROR";
50+
// case CUBLAS_STATUS_EXECUTION_FAILED: return "CUBLAS_STATUS_EXECUTION_FAILED";
51+
// case CUBLAS_STATUS_INTERNAL_ERROR: return "CUBLAS_STATUS_INTERNAL_ERROR";
52+
// }
53+
// return "Unknown";
54+
// }
55+
//
56+
// #define CHECK_CUBLAS(code) { checkCublas((code), __FILE__, __LINE__); }
57+
// inline void checkCublas(cublasStatus_t code, const char * file, int line) {
58+
// if (code != CUBLAS_STATUS_SUCCESS) {
59+
// std::stringstream err;
60+
// err << "cublas error: " << cublasGetErrorString(code)
61+
// << " (" << file << ":" << line << ")";
62+
// throw std::runtime_error(err.str());
63+
// }
64+
// }
6565

6666
inline DeviceInfo GetDeviceInfo() {
6767
DeviceInfo ret;

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def __init__(self, name):
9292
extra_compile_args=extra_compile_args,
9393
extra_link_args=["-fopenmp"],
9494
library_dirs=[CUDA['lib64']],
95-
libraries=['cudart', 'cublas', 'curand'],
95+
libraries=['cudart', 'curand'],
9696
extra_objects=[],
9797
include_dirs=[ \
9898
"cpp/include/", np.get_include(), pybind11.get_include(),
@@ -107,7 +107,7 @@ def __init__(self, name):
107107
extra_compile_args=extra_compile_args,
108108
extra_link_args=["-fopenmp"],
109109
library_dirs=[CUDA['lib64']],
110-
libraries=['cudart', 'cublas', 'curand'],
110+
libraries=['cudart', 'curand'],
111111
extra_objects=[],
112112
include_dirs=[ \
113113
"cpp/include/", np.get_include(), pybind11.get_include(),

0 commit comments

Comments
 (0)