mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-07 07:55:04 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1900 from SChernykh/dev

Browse Source 
Fixed roundSize() usage in OCL/CUDA
This commit is contained in:
xmrig
2020-10-15 19:44:03 +07:00
committed by GitHub
parent 75403ee275 8c45e3226d
commit 7727014eea
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/cuda/CudaWorker.cpp
View File

@@ -189,7 +189,7 @@ void xmrig::CudaWorker::start()
}
const size_t batch_size = intensity();
if (!Nonce::isOutdated(Nonce::CUDA, m_job.sequence()) && !m_job.nextRound(roundSize(batch_size), batch_size)) {
if (!Nonce::isOutdated(Nonce::CUDA, m_job.sequence()) && !m_job.nextRound(1, roundSize(batch_size))) {
JobResults::done(m_job.currentJob());
}
@@ -211,7 +211,7 @@ bool xmrig::CudaWorker::consumeJob()
}
const size_t batch_size = intensity();
m_job.add(m_miner->job(), roundSize(batch_size) * batch_size, Nonce::CUDA);
m_job.add(m_miner->job(), roundSize(batch_size), Nonce::CUDA);
return m_runner->set(m_job.currentJob(), m_job.blob());
}

6
src/backend/opencl/OclWorker.cpp
View File

@@ -180,7 +180,7 @@ void xmrig::OclWorker::start()
{
cl_uint results[0x100];
const uint32_t runnerRoundSize = m_runner->roundSize();
const uint32_t runnerRoundSize = roundSize(m_runner->roundSize());
while (Nonce::sequence(Nonce::OPENCL) > 0) {
if (!isReady()) {
@@ -220,7 +220,7 @@ void xmrig::OclWorker::start()
JobResults::submit(m_job.currentJob(), results, results[0xFF], m_deviceIndex);
}
if (!Nonce::isOutdated(Nonce::OPENCL, m_job.sequence()) && !m_job.nextRound(roundSize(runnerRoundSize), runnerRoundSize)) {
if (!Nonce::isOutdated(Nonce::OPENCL, m_job.sequence()) && !m_job.nextRound(1, runnerRoundSize)) {
JobResults::done(m_job.currentJob());
}
@@ -241,7 +241,7 @@ bool xmrig::OclWorker::consumeJob()
return false;
}
m_job.add(m_miner->job(), roundSize(m_intensity) * m_intensity, Nonce::OPENCL);
m_job.add(m_miner->job(), roundSize(m_intensity), Nonce::OPENCL);
try {
m_runner->set(m_job.currentJob(), m_job.blob());