Skip to content
Snippets Groups Projects
Unverified Commit c7fe0b2c authored by fireice-uk's avatar fireice-uk Committed by GitHub
Browse files

Merge pull request #1219 from psychocrypt/fix-autoAdjust

fix autoAdjust(non hwloc)
parents 09a5dcce 5cdabae1
No related branches found
No related tags found
No related merge requests found
......@@ -55,6 +55,22 @@ matrix:
- CMAKE_C_COMPILER=gcc-6
- XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF"
# test with disabled HWLOC, MICROHTTPD, OpenSSL and no accelerators
- os: linux
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- *default_packages
- gcc-6
- g++-6
env:
- CMAKE_CXX_COMPILER=g++-6
- CMAKE_C_COMPILER=gcc-6
- XMRSTAK_CMAKE_FLAGS="-DCUDA_ENABLE=OFF -DOpenCL_ENABLE=OFF -DHWLOC_ENABLE=OFF -DOpenSSL_ENABLE=OFF -DMICROHTTPD_ENABLE=OFF"
- os: linux
compiler: gcc
addons:
......
......@@ -35,19 +35,9 @@ public:
bool printConfig()
{
size_t hashMemSizeKB;
size_t halfHashMemSizeKB;
if(::jconf::inst()->IsCurrencyMonero())
{
hashMemSizeKB = MONERO_MEMORY / 1024u;
halfHashMemSizeKB = hashMemSizeKB / 2u;
}
else
{
hashMemSizeKB = AEON_MEMORY / 1024u;
halfHashMemSizeKB = hashMemSizeKB / 2u;
}
const size_t hashMemSizeKB = cn_select_memory(::jconf::inst()->GetMiningAlgo()) / 1024u;
const size_t halfHashMemSizeKB = hashMemSizeKB / 2u;
configEditor configTpl{};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment