Small changes: remove old stuff

This commit is contained in:
Tomasz Dwojak 2016-11-01 18:06:33 +00:00
parent 191e7a6835
commit 7f7a76946a
3 changed files with 2 additions and 4 deletions

View File

@ -17,7 +17,7 @@ if(CUDA)
find_package(CUDA)
if(CUDA_FOUND)
LIST(APPEND CUDA_NVCC_FLAGS --default-stream per-thread; -std=c++11; -O3; -arch=sm_35; -lineinfo; --use_fast_math;)
add_definitions(-DCUDA_API_PER_THREAD_DEFAULT_STREAM)
# add_definitions(-DCUDA_API_PER_THREAD_DEFAULT_STREAM)
add_definitions(-DCUDA)
SET(CUDA_PROPAGATE_HOST_FLAGS OFF)
message("-- Compiling with CUDA support")

View File

@ -323,7 +323,7 @@ Matrix& Broadcast(Functor functor, Matrix& Out, const Matrix& In) {
size_t rows = rows1 * rows2;
size_t cols = Out.Cols();
Matrix Temp(rows, cols, 1.0);
Matrix Temp(rows, cols, 1.0f);
float* d_out = Temp.data();
const float* d_in1 = Out.data();

View File

@ -22,7 +22,6 @@ __global__ void gMaxElement(float* d_out, int* d_ind, float* d_in, int in_size)
int i = blockIdx.x * (blockDim.x * 2) + tid;
sdata[tid] = -3.40282e+38f;
__syncthreads();
if (i >= in_size) return;
@ -61,7 +60,6 @@ __global__ void gMaxElement(float* d_out, int* d_ind, float* d_in, int in_size)
__global__ void gSet(float* d_in, int* d_idx, int* index) {
*index = d_idx[*index];
// d_in[*index] = std::numeric_limits<float>::lowest();
d_in[*index] = -3.40282e+38f;
}