Skip to content

Next 2 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rantahar wants to merge 3 commits into
base: next_2
Choose a base branch
from
Open

Next 2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0948951
Update compute capabilities
Dec 10, 2020
2febe65
Add two missing headers
Dec 10, 2020
7cbe82e
Guards around the new includes
Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ option( GENERATE_TESTS "Adds the compilation of a test program as a target." OFF

# Configuration-dependent settings.
set( CMAKE_DEBUG_POSTFIX "_d" )
set( CUDA_NVCC_FLAGS_RELEASE ${CUDA_NVCC_FLAGS_RELEASE};-gencode arch=compute_30,code=sm_30 )
set( CUDA_NVCC_FLAGS_DEBUG ${CUDA_NVCC_FLAGS_DEBUG};-gencode arch=compute_30,code=sm_30 )
set( CUDA_NVCC_FLAGS_RELEASE ${CUDA_NVCC_FLAGS_RELEASE};-gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 )
set( CUDA_NVCC_FLAGS_DEBUG ${CUDA_NVCC_FLAGS_DEBUG};-gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 )

# Unix-specific compiler flags.
if ( UNIX )
Expand Down
4 changes: 0 additions & 4 deletions include/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
#ifndef VOX_COMMON_H
#define VOX_COMMON_H

#if defined(unix) || defined(__unix__) || defined(__unix)
#include <stdint.h>
#else
#include <stdint.h>
#endif

#include <limits>
#include <cuda.h>
Expand Down
4 changes: 4 additions & 0 deletions src/voxelizer.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
#include <thrust/copy.h>
#include <thrust/unique.h>
#include <thrust/count.h>
#if defined(unix) || defined(__unix__) || defined(__unix)
#include <thrust/device_malloc.h>
#include <thrust/device_free.h>
#endif

#include <iostream>
#include <ctime>
Expand Down