Skip to content
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

Build kawpow on OSX #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Build kawpow on OSX #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e6c631
Build kawpow on OSX
hwh57 May 11, 2020
6defed0
Merge pull request #1 from RavenCommunity/master
hwh57 May 17, 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 @@ -14,8 +14,8 @@ cable_configure_toolchain(DEFAULT cxx11)
set(HUNTER_CONFIGURATION_TYPES Release CACHE STRING "Build type of Hunter packages")
set(HUNTER_JOBS_NUMBER 6 CACHE STRING "Number of parallel builds used by Hunter")
HunterGate(
URL "https://github.com/ruslo/hunter/archive/v0.23.214.tar.gz"
SHA1 "e14bc153a7f16d6a5eeec845fb0283c8fad8c358"
URL "https://github.com/cpp-pm/hunter/archive/v0.23.253.tar.gz"
SHA1 "88ea6d37c897a81a080eb9ae0f69d7807bbb3c73"
LOCAL
)

Expand Down
4 changes: 2 additions & 2 deletions cmake/Hunter/config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
hunter_config(CURL VERSION ${HUNTER_CURL_VERSION} CMAKE_ARGS HTTP_ONLY=ON CMAKE_USE_OPENSSL=ON CMAKE_USE_LIBSSH2=OFF CURL_CA_PATH=none)
hunter_config(Boost VERSION 1.70.0-p0)
hunter_config(Boost VERSION 1.72.0-p1)

hunter_config(ethash VERSION 1.0.0
URL https://github.com/RavenCommunity/cpp-kawpow/archive/1.1.0.tar.gz
SHA1 fff78f555a43900b6726c131305a71be769ef769
)
)
2 changes: 1 addition & 1 deletion libethash-cl/CLMiner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ void CLMiner::enumDevices(std::map<string, DeviceDescriptor>& _DevicesCollection
{
std::string platformName = platforms.at(pIdx).getInfo<CL_PLATFORM_NAME>();
ClPlatformTypeEnum platformType = ClPlatformTypeEnum::Unknown;
if (platformName == "AMD Accelerated Parallel Processing")
if (platformName == "AMD Accelerated Parallel Processing" || platformName == "Apple")
platformType = ClPlatformTypeEnum::Amd;
else if (platformName == "Clover")
platformType = ClPlatformTypeEnum::Clover;
Expand Down
4 changes: 2 additions & 2 deletions libethash-cl/CLMiner_kernel.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ ethash_search(__global struct SearchResults* restrict g_output, __constant hash3
if (g_output->abort)
return;

__local shuffle_t share[HASHES_PER_GROUP];
__local uint32_t c_dag[PROGPOW_CACHE_WORDS];
shuffle_t share[HASHES_PER_GROUP];
uint32_t c_dag[PROGPOW_CACHE_WORDS];

uint32_t const lid = get_local_id(0);
uint32_t const gid = get_global_id(0);
Expand Down
4 changes: 2 additions & 2 deletions libprogpow/ProgPow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ std::string ProgPow::getKern(uint64_t prog_seed, kernel_t kern)
ret << "inline void progPowLoop(const uint32_t loop,\n";
ret << " volatile uint32_t mix_arg[PROGPOW_REGS],\n";
ret << " __global const dag_t *g_dag,\n";
ret << " __local const uint32_t c_dag[PROGPOW_CACHE_WORDS],\n";
ret << " __local uint64_t share[GROUP_SHARE],\n";
ret << " const uint32_t c_dag[PROGPOW_CACHE_WORDS],\n";
ret << " uint64_t share[GROUP_SHARE],\n";
ret << " const bool hack_false)\n";
}
ret << "{\n";
Expand Down