diff --git a/libethash-cl/CMakeLists.txt b/libethash-cl/CMakeLists.txt index 8757ae863..fdc2dad07 100644 --- a/libethash-cl/CMakeLists.txt +++ b/libethash-cl/CMakeLists.txt @@ -10,7 +10,6 @@ file(GLOB HEADERS "*.h") include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${OpenCL_INCLUDE_DIRS}) -include_directories(${Boost_INCLUDE_DIRS}) include_directories(..) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) TARGET_LINK_LIBRARIES(${EXECUTABLE} ${OpenCL_LIBRARIES} ethash) diff --git a/libethash-cl/ethash_cl_miner.cpp b/libethash-cl/ethash_cl_miner.cpp index 61f35b035..111f92529 100644 --- a/libethash-cl/ethash_cl_miner.cpp +++ b/libethash-cl/ethash_cl_miner.cpp @@ -24,12 +24,12 @@ #include #include +#include #include #include #include #include #include -#include #include "ethash_cl_miner.h" #include "ethash_cl_miner_kernel.h" @@ -44,6 +44,8 @@ #undef min #undef max +using namespace std; + static void add_definition(std::string& source, char const* id, unsigned value) { char buf[256]; @@ -64,7 +66,7 @@ std::string ethash_cl_miner::platform_info(unsigned _platformId, unsigned _devic cl::Platform::get(&platforms); if (platforms.empty()) { - cwarn << "No OpenCL platforms found."; + cout << "No OpenCL platforms found." << endl; return std::string(); } @@ -74,7 +76,7 @@ std::string ethash_cl_miner::platform_info(unsigned _platformId, unsigned _devic platforms[platform_num].getDevices(CL_DEVICE_TYPE_ALL, &devices); if (devices.empty()) { - cwarn << "No OpenCL devices found."; + cout << "No OpenCL devices found." << endl; return std::string(); } @@ -92,7 +94,7 @@ unsigned ethash_cl_miner::get_num_devices(unsigned _platformId) cl::Platform::get(&platforms); if (platforms.empty()) { - cwarn << "No OpenCL platforms found."; + cout << "No OpenCL platforms found." << endl; return 0; } @@ -101,7 +103,7 @@ unsigned ethash_cl_miner::get_num_devices(unsigned _platformId) platforms[platform_num].getDevices(CL_DEVICE_TYPE_ALL, &devices); if (devices.empty()) { - cwarn << "No OpenCL devices found."; + cout << "No OpenCL devices found." << endl; return 0; } return devices.size(); @@ -125,7 +127,7 @@ bool ethash_cl_miner::init(ethash_params const& params, std::function(_platformId, platforms.size() - 1); - cnote << "Using platform: " << platforms[_platformId].getInfo().c_str(); + cout << "Using platform: " << platforms[_platformId].getInfo().c_str() << endl; // get GPU device of the default platform std::vector devices; platforms[_platformId].getDevices(CL_DEVICE_TYPE_ALL, &devices); if (devices.empty()) { - cwarn << "No OpenCL devices found."; + cout << "No OpenCL devices found." << endl; return false; } // use selected device cl::Device& device = devices[std::min(_deviceId, devices.size() - 1)]; std::string device_version = device.getInfo(); - cnote << "Using device: "<< device.getInfo().c_str() << "(" << device_version.c_str() << ")"; + cout << "Using device: " << device.getInfo().c_str() << "(" << device_version.c_str() << ")" << endl; if (strncmp("OpenCL 1.0", device_version.c_str(), 10) == 0) { - cwarn << "OpenCL 1.0 is not supported."; + cout << "OpenCL 1.0 is not supported." << endl; return false; } if (strncmp("OpenCL 1.1", device_version.c_str(), 10) == 0) @@ -185,7 +187,7 @@ bool ethash_cl_miner::init(ethash_params const& params, std::function(device).c_str(); + cout << program.getBuildInfo(device).c_str(); return false; } m_hash_kernel = cl::Kernel(program, "ethash_hash");