diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | xmrstak/backend/nvidia/nvcc_code/cuda_extra.cu | 1 | ||||
| -rw-r--r-- | xmrstak/cli/cli-miner.cpp | 1 | ||||
| -rw-r--r-- | xmrstak/misc/console.cpp | 5 |
4 files changed, 11 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 10f43c4..d865e13 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" diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index 6da0855..828f714 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -51,6 +51,7 @@ #ifdef _WIN32 # define strcasecmp _stricmp +# include <windows.h> #endif // _WIN32 void do_benchmark(); diff --git a/xmrstak/misc/console.cpp b/xmrstak/misc/console.cpp index 980760e..de5eed3 100644 --- a/xmrstak/misc/console.cpp +++ b/xmrstak/misc/console.cpp @@ -211,6 +211,11 @@ void printer::print_str(const char* str) std::unique_lock<std::mutex> lck(print_mutex); fputs(str, stdout); + if (b_flush_stdout) + { + fflush(stdout); + } + if(logfile != nullptr) { fputs(str, logfile); |
