diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2018-03-28 19:19:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 19:19:13 +0100 |
| commit | c7fe0b2c4b3d02e25e156406ce2887f9ff546bc1 (patch) | |
| tree | 22a097d0837430e80dda0cb3f353d6bb3b36a2b5 | |
| parent | 09a5dcce2c51d87d77244970d2c09bea3207da7a (diff) | |
| parent | 5cdabae1258ffe7e0069b652d94fcd574047c206 (diff) | |
| download | xmr-stak-c7fe0b2c4b3d02e25e156406ce2887f9ff546bc1.zip xmr-stak-c7fe0b2c4b3d02e25e156406ce2887f9ff546bc1.tar.gz | |
Merge pull request #1219 from psychocrypt/fix-autoAdjust
fix autoAdjust(non hwloc)
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rw-r--r-- | xmrstak/backend/cpu/autoAdjust.hpp | 14 |
2 files changed, 18 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index de5b45f..f263e86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/xmrstak/backend/cpu/autoAdjust.hpp b/xmrstak/backend/cpu/autoAdjust.hpp index db805ec..969d478 100644 --- a/xmrstak/backend/cpu/autoAdjust.hpp +++ b/xmrstak/backend/cpu/autoAdjust.hpp @@ -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{}; |
