summaryrefslogtreecommitdiffstats
path: root/xmrstak
diff options
context:
space:
mode:
authorpsychocrypt <psychocrypt@users.noreply.github.com>2017-10-22 18:22:42 +0200
committerGitHub <noreply@github.com>2017-10-22 18:22:42 +0200
commita7116b999efae0b303cd2474bbea3c918a4fe8b3 (patch)
treedbd154024eebcc0a6c4208021960cfe2d45b7e68 /xmrstak
parent336f2325f9c7b54b44e7712f250c85c8c109d5ee (diff)
parent203fad6181ee224762d5e37828849605c10f5adf (diff)
downloadxmr-stak-a7116b999efae0b303cd2474bbea3c918a4fe8b3.zip
xmr-stak-a7116b999efae0b303cd2474bbea3c918a4fe8b3.tar.gz
Merge pull request #61 from fireice-uk/topic-gpu-thread-num
Proper removal of gpu_thread_num
Diffstat (limited to 'xmrstak')
-rw-r--r--xmrstak/backend/amd/jconf.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/xmrstak/backend/amd/jconf.cpp b/xmrstak/backend/amd/jconf.cpp
index c2bf1fa..0617aeb 100644
--- a/xmrstak/backend/amd/jconf.cpp
+++ b/xmrstak/backend/amd/jconf.cpp
@@ -48,7 +48,7 @@ using namespace rapidjson;
/*
* This enum needs to match index in oConfigValues, otherwise we will get a runtime error
*/
-enum configEnum { iGpuThreadNum, aGpuThreadsConf, iPlatformIdx };
+enum configEnum { aGpuThreadsConf, iPlatformIdx };
struct configVal {
configEnum iName;
@@ -58,7 +58,6 @@ struct configVal {
//Same order as in configEnum, as per comment above
configVal oConfigValues[] = {
- { iGpuThreadNum, "gpu_thread_num", kNumberType },
{ aGpuThreadsConf, "gpu_threads_conf", kArrayType },
{ iPlatformIdx, "platform_index", kNumberType }
};
@@ -235,14 +234,6 @@ bool jconf::parse_config(const char* sFilename)
}
size_t n_thd = prv->configValues[aGpuThreadsConf]->Size();
- if(prv->configValues[iGpuThreadNum]->GetUint64() != n_thd)
- {
- printer::inst()->print_msg(L0,
- "Invalid config file. Your GPU config array has %llu members, while you want to use %llu threads.",
- int_port(n_thd), int_port(prv->configValues[iGpuThreadNum]->GetUint64()));
- return false;
- }
-
thd_cfg c;
for(size_t i=0; i < n_thd; i++)
{
OpenPOWER on IntegriCloud