mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-19 05:33:02 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/Arribas/gnss-sdr.git into next

Browse Source 
Conflicts:
	src/algorithms/tracking/libs/cuda_multicorrelator.cu
This commit is contained in:
Javier Arribas 2015-08-06 17:13:03 +02:00
commit af99f340a4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/tracking/libs/cuda_multicorrelator.h
View File

@ -162,6 +162,8 @@ private:
cudaStream_t stream1; cudaStream_t stream1;
cudaStream_t stream2; cudaStream_t stream2;
int num_gpu_devices;
int selected_device;
}; };