Checks Compute Capability and forcibly disables Tensor Cores for CC < 7.0

This commit is contained in:
AlexeyAB
2019-02-04 23:28:40 +03:00
parent f7cb538b32
commit 5446d19576
3 changed files with 29 additions and 15 deletions

View File

@ -13,14 +13,14 @@ void cuda_set_device(int n)
{
gpu_index = n;
cudaError_t status = cudaSetDevice(n);
check_error(status);
CHECK_CUDA(status);
}
int cuda_get_device()
{
int n = 0;
cudaError_t status = cudaGetDevice(&n);
check_error(status);
CHECK_CUDA(status);
return n;
}
@ -92,7 +92,7 @@ cudaStream_t get_cuda_stream() {
char buffer[256];
printf("CUDA Error: %s\n", s);
status = cudaStreamCreateWithFlags(&streamsArray[i], cudaStreamDefault);
check_error(status);
CHECK_CUDA(status);
}
streamInit[i] = 1;
}
@ -113,7 +113,7 @@ cudaStream_t get_cuda_memcpy_stream() {
char buffer[256];
printf("CUDA Error: %s\n", s);
status = cudaStreamCreateWithFlags(&streamsArray2[i], cudaStreamDefault);
check_error(status);
CHECK_CUDA(status);
}
streamInit2[i] = 1;
}
@ -192,6 +192,7 @@ cublasHandle_t blas_handle()
if(!init[i]) {
cublasCreate(&handle[i]);
cublasStatus_t status = cublasSetStream(handle[i], get_cuda_stream());
CHECK_CUDA(status);
init[i] = 1;
}
return handle[i];
@ -203,11 +204,11 @@ float *cuda_make_array(float *x, size_t n)
size_t size = sizeof(float)*n;
cudaError_t status = cudaMalloc((void **)&x_gpu, size);
if (status != cudaSuccess) fprintf(stderr, " Try to set subdivisions=64 in your cfg-file. \n");
check_error(status);
CHECK_CUDA(status);
if(x){
//status = cudaMemcpy(x_gpu, x, size, cudaMemcpyHostToDevice);
status = cudaMemcpyAsync(x_gpu, x, size, cudaMemcpyHostToDevice, get_cuda_stream());
check_error(status);
CHECK_CUDA(status);
}
if(!x_gpu) error("Cuda malloc failed\n");
return x_gpu;
@ -224,7 +225,7 @@ void cuda_random(float *x_gpu, size_t n)
init[i] = 1;
}
curandGenerateUniform(gen[i], x_gpu, n);
check_error(cudaPeekAtLastError());
CHECK_CUDA(cudaPeekAtLastError());
}
float cuda_compare(float *x_gpu, float *x, size_t n, char *s)
@ -246,7 +247,7 @@ int *cuda_make_int_array(size_t n)
size_t size = sizeof(int)*n;
cudaError_t status = cudaMalloc((void **)&x_gpu, size);
if(status != cudaSuccess) fprintf(stderr, " Try to set subdivisions=64 in your cfg-file. \n");
check_error(status);
CHECK_CUDA(status);
return x_gpu;
}
@ -255,11 +256,11 @@ int *cuda_make_int_array_new_api(int *x, size_t n)
int *x_gpu;
size_t size = sizeof(int)*n;
cudaError_t status = cudaMalloc((void **)&x_gpu, size);
check_error(status);
CHECK_CUDA(status);
if (x) {
//status = cudaMemcpy(x_gpu, x, size, cudaMemcpyHostToDevice, get_cuda_stream());
cudaError_t status = cudaMemcpyAsync(x_gpu, x, size, cudaMemcpyHostToDevice, get_cuda_stream());
check_error(status);
CHECK_CUDA(status);
}
if (!x_gpu) error("Cuda malloc failed\n");
return x_gpu;
@ -269,7 +270,7 @@ void cuda_free(float *x_gpu)
{
//cudaStreamSynchronize(get_cuda_stream());
cudaError_t status = cudaFree(x_gpu);
check_error(status);
CHECK_CUDA(status);
}
void cuda_push_array(float *x_gpu, float *x, size_t n)
@ -277,7 +278,7 @@ void cuda_push_array(float *x_gpu, float *x, size_t n)
size_t size = sizeof(float)*n;
//cudaError_t status = cudaMemcpy(x_gpu, x, size, cudaMemcpyHostToDevice);
cudaError_t status = cudaMemcpyAsync(x_gpu, x, size, cudaMemcpyHostToDevice, get_cuda_stream());
check_error(status);
CHECK_CUDA(status);
}
void cuda_pull_array(float *x_gpu, float *x, size_t n)
@ -285,7 +286,7 @@ void cuda_pull_array(float *x_gpu, float *x, size_t n)
size_t size = sizeof(float)*n;
//cudaError_t status = cudaMemcpy(x, x_gpu, size, cudaMemcpyDeviceToHost);
cudaError_t status = cudaMemcpyAsync(x, x_gpu, size, cudaMemcpyDeviceToHost, get_cuda_stream());
check_error(status);
CHECK_CUDA(status);
cudaStreamSynchronize(get_cuda_stream());
}
@ -302,6 +303,16 @@ int get_number_of_blocks(int array_size, int block_size)
return array_size / block_size + ((array_size % block_size > 0) ? 1 : 0);
}
int get_gpu_compute_capability(int i)
{
typedef struct cudaDeviceProp cudaDeviceProp;
cudaDeviceProp prop;
cudaError_t status = cudaGetDeviceProperties(&prop, i);
CHECK_CUDA(status);
int cc = prop.major * 10 + prop.minor;
return cc;
}
#else // GPU
#include "cuda.h"
void cuda_set_device(int n) {}

View File

@ -15,6 +15,8 @@ extern int gpu_index;
#include "cuda_runtime.h"
#include "curand.h"
#include "cublas_v2.h"
#include "cuda_runtime_api.h"
#include "driver_types.h"
#ifdef CUDNN
#include "cudnn.h"
@ -62,6 +64,7 @@ extern "C" {
cudaStream_t get_cuda_stream();
cudaStream_t get_cuda_memcpy_stream();
int get_number_of_blocks(int array_size, int block_size);
int get_gpu_compute_capability(int i);
#ifdef __cplusplus
}
#endif // __cplusplus

View File

@ -671,8 +671,8 @@ void parse_net_options(list *options, network *net)
net->policy = get_policy(policy_s);
net->burn_in = option_find_int_quiet(options, "burn_in", 0);
#ifdef CUDNN_HALF
//net->burn_in = 0;
net->cudnn_half = 1;
if(get_gpu_compute_capability(net->gpu_index) >= 7000) net->cudnn_half = 1;
else net->cudnn_half = 0;
#endif
if(net->policy == STEP){
net->step = option_find_int(options, "step", 1);