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.

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

release 2.10.5 #2449

Merged
merged 35 commits into from
Jun 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0840778
concurrent hash rate calculation
psychocrypt Apr 2, 2019
711c088
fix benchmark mode
psychocrypt Apr 17, 2019
726fa32
Merge pull request #2393 from psychocrypt/topic-concurrentHashRateCalc
fireice-uk Apr 23, 2019
0f5e20d
Merge pull request #2409 from psychocrypt/fix-benchmarkMode
fireice-uk Apr 23, 2019
94063f3
--log CLI parameter
o2genum Apr 27, 2019
2854b31
change lethean POW to cn_r
psychocrypt Apr 30, 2019
cf1be39
Merge pull request #2415 from o2genum/topic-log-parameter
psychocrypt Apr 30, 2019
e9a8563
change xmr pool suggestion
psychocrypt Apr 30, 2019
08492ea
rename intense to lethean
psychocrypt May 1, 2019
a83b48c
change stellite to torque
psychocrypt May 1, 2019
5df0f1b
remove freehaven support
psychocrypt May 1, 2019
3c9c904
Autoconf fallback
o2genum Oct 23, 2018
e6c3f7b
--h-print-time CLI option
o2genum May 3, 2019
b2e4316
Enabling/disabling GPUs from CLI
o2genum May 3, 2019
268eba0
Merge pull request #2419 from psychocrypt/topic-letheanPowUpdate
fireice-uk May 15, 2019
6f873d1
Merge pull request #2420 from psychocrypt/topic-changeXmrPoolSuggestion
fireice-uk May 15, 2019
93d5a6b
Merge pull request #2423 from psychocrypt/fix-missedCoinRename
fireice-uk May 15, 2019
db5ea91
Merge pull request #2425 from psychocrypt/topic-renameFreehavenSupport
fireice-uk May 15, 2019
ec11363
Merge pull request #2426 from psychocrypt/topic-renameCoinStellite
fireice-uk May 18, 2019
89bc144
Merge pull request #2430 from o2genum/topic-cpu-autoadjust-fallback
psychocrypt May 18, 2019
d551d07
Merge pull request #2431 from o2genum/topic-cli-hashrate-print-time
psychocrypt May 19, 2019
0347fce
Store GPU index in miner thread
amoiseev May 20, 2019
55fd122
Accepted/rejected share: print responsible GPU and pool
amoiseev May 20, 2019
6fa64d6
Do not fail with "use_slow_memory" : "warn" and --noUAC on Windows 7…
o2genum Apr 28, 2019
743273c
NVIDIA: optimize cryptonight_gpu
psychocrypt May 31, 2019
4968514
Merge pull request #2442 from o2genum/topic-shares-print-gpu-and-pool
psychocrypt May 31, 2019
4211295
dev release option
psychocrypt May 31, 2019
c0ea66b
Merge pull request #2443 from psychocrypt/topic-cng-tune
fireice-uk Jun 1, 2019
4ce226b
Merge pull request #2444 from psychocrypt/topic-dev_release
fireice-uk Jun 1, 2019
92780ad
increase version to 2.10.5
psychocrypt Jun 8, 2019
a2d6c1a
OpenCL: rocm shuffle
psychocrypt Jun 8, 2019
1b0686c
Merge pull request #2416 from o2genum/topic-nouac-dont-fail
fireice-uk Jun 9, 2019
c6f0217
Merge pull request #2447 from psychocrypt/topic-amdShuffleRocm
fireice-uk Jun 9, 2019
27dc1ec
Merge pull request #2448 from psychocrypt/topic-versionIncreaseTo2.10.5
fireice-uk Jun 9, 2019
38dbae9
Merge pull request #2432 from o2genum/topic-cli-enabled-gpus
psychocrypt Jun 9, 2019
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
19 changes: 16 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ endif()
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "${BUILD_TYPE}")

set(XMR-STAK_COMPILE "native" CACHE STRING "select CPU compute architecture")
set_property(CACHE XMR-STAK_COMPILE PROPERTY STRINGS "native;generic")
set_property(CACHE XMR-STAK_COMPILE PROPERTY STRINGS "native;generic;dev_release")
if(XMR-STAK_COMPILE STREQUAL "native")
if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set(CMAKE_CXX_FLAGS "-march=native -mtune=native ${CMAKE_CXX_FLAGS}")
set(CMAKE_C_FLAGS "-march=native -mtune=native ${CMAKE_C_FLAGS}")
endif()
elseif(XMR-STAK_COMPILE STREQUAL "generic")
elseif(XMR-STAK_COMPILE STREQUAL "generic" OR XMR-STAK_COMPILE STREQUAL "dev_release")
add_definitions("-DCONF_ENFORCE_OpenCL_1_2=1")
else()
message(FATAL_ERROR "XMR-STAK_COMPILE is set to an unknown value '${XMR-STAK_COMPILE}'")
Expand Down Expand Up @@ -496,6 +496,10 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
set(CMAKE_C_FLAGS "-Wl,-z,noexecstack ${CMAKE_C_FLAGS}")
endif()

if(XMR-STAK_COMPILE STREQUAL "dev_release")
add_definitions(-DXMRSTAK_DEV_RELEASE)
endif()

# activate static libgcc and libstdc++ linking
if(CMAKE_LINK_STATIC)
set(BUILD_SHARED_LIBRARIES OFF)
Expand Down Expand Up @@ -586,7 +590,16 @@ if(CUDA_FOUND)
)
endif()

set(CUDA_LIBRARIES ${CUDA_LIB} ${CUDA_NVRTC_LIB} ${CUDA_LIBRARIES})
set(CUDA_LIBRARIES ${CUDA_LIB} ${CUDA_LIBRARIES})
if(XMR-STAK_COMPILE STREQUAL "dev_release")
# do not link nvrtc for linux binaries, cn-r will be disabled
if(WIN32)
set(CUDA_LIBRARIES ${CUDA_LIBRARIES} ${CUDA_NVRTC_LIB})
endif()
else()
set(CUDA_LIBRARIES ${CUDA_LIBRARIES} ${CUDA_NVRTC_LIB})
endif()

target_link_libraries(xmrstak_cuda_backend ${CUDA_LIBRARIES})
target_link_libraries(xmrstak_cuda_backend xmr-stak-backend xmr-stak-asm)
endif()
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Besides [Monero](https://getmonero.org), following coins can be mined using this
- [Plenteum](https://www.plenteum.com/)
- [QRL](https://theqrl.org)
- **[Ryo](https://ryo-currency.com) - Upcoming xmr-stak-gui is sponsored by Ryo**
- [Stellite](https://stellite.cash/)
- [Torque](https://torque.cash/)
- [TurtleCoin](https://turtlecoin.lol)
- [Zelerius](https://zelerius.org/)
- [X-CASH](https://x-network.io/)
Expand All @@ -72,7 +72,7 @@ If your prefered coin is not listed, you can choose one of the following algorit
- cryptonight_v7_stellite
- cryptonight_v8
- cryptonight_v8_double (used by X-CASH)
- cryptonight_v8_half (used by masari and stellite)
- cryptonight_v8_half (used by masari and torque)
- cryptonight_v8_reversewaltz (used by graft)
- cryptonight_v8_zelerius
- 4MiB scratchpad memory
Expand Down
6 changes: 3 additions & 3 deletions xmrstak/backend/amd/amd_gpu/gpu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1280,17 +1280,17 @@ size_t XMRRunJob(GpuContext* ctx, cl_uint* HashOutput, const xmrstak_algo& miner
}
}

if((ret = clEnqueueNDRangeKernel(ctx->CommandQueues, Kernels[2], 2, Nonce, gthreads, lthreads, 0, NULL, NULL)) != CL_SUCCESS)
size_t NonceT[2] = {0, ctx->Nonce}, gthreadsT[2] = {8, g_thd}, lthreadsT[2] = {8 , w_size};
if((ret = clEnqueueNDRangeKernel(ctx->CommandQueues, Kernels[2], 2, NonceT, gthreadsT, lthreadsT, 0, NULL, NULL)) != CL_SUCCESS)
{
printer::inst()->print_msg(L1, "Error %s when calling clEnqueueNDRangeKernel for kernel %d.", err_to_str(ret), 2);
return ERR_OCL_API;
return ERR_OCL_API;
}

if(miner_algo != cryptonight_gpu)
{
for(int i = 0; i < 4; ++i)
{
size_t tmpNonce = ctx->Nonce;
if((ret = clEnqueueNDRangeKernel(ctx->CommandQueues, Kernels[i + 3], 1, &tmpNonce, &g_thd, &w_size, 0, NULL, NULL)) != CL_SUCCESS)
{
printer::inst()->print_msg(L1, "Error %s when calling clEnqueueNDRangeKernel for kernel %d.", err_to_str(ret), i + 3);
Expand Down
Loading