diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2017-12-15 22:32:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 22:32:26 +0000 |
| commit | 1bd3ec488f3b7087ea8009f1bec3ebd94f205ce7 (patch) | |
| tree | 19a024f014d53897215af6c8246a34c189d59ac5 | |
| parent | 14d7e52984ab85b8012b19131aaa3578053d2f3a (diff) | |
| parent | 74378a5ab5f5ef3290a62e284b9008892489079a (diff) | |
| download | xmr-stak-1bd3ec488f3b7087ea8009f1bec3ebd94f205ce7.zip xmr-stak-1bd3ec488f3b7087ea8009f1bec3ebd94f205ce7.tar.gz | |
Merge pull request #532 from psychocrypt/fix-CUDA9andOSCCompile
fix cuda9.1 compile
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b8f1eef..87ba391 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,11 @@ if(CUDA_ENABLE) endif() # add Volta support for CUDA >= 9.0 if(NOT CUDA_VERSION VERSION_LESS 9.0) - list(APPEND DEFAULT_CUDA_ARCH "70") + # Volta GPUs are currently not supported on MACOSX + # https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#cuda-general-known-issues + if(NOT APPLE) + list(APPEND DEFAULT_CUDA_ARCH "70") + endif() endif() set(CUDA_ARCH "${DEFAULT_CUDA_ARCH}" CACHE STRING "Set GPU architecture (semicolon separated list, e.g. '-DCUDA_ARCH=20;35;60')") diff --git a/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu index 734426c..4ec388e 100644 --- a/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu +++ b/xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu @@ -6,7 +6,6 @@ #include <vector> #include <cuda.h> #include <cuda_runtime.h> -#include <device_functions.hpp> #include <algorithm> #include "xmrstak/jconf.hpp" |
