diff options
author | fireice-uk <fireice-uk@users.noreply.github.com> | 2017-10-22 14:14:57 +0100 |
---|---|---|
committer | fireice-uk <fireice-uk@users.noreply.github.com> | 2017-10-22 14:18:32 +0100 |
commit | 203fad6181ee224762d5e37828849605c10f5adf (patch) | |
tree | fa45d1816538ee964ee13f1f82f7fff550e3dcbb | |
parent | 610f4f0fa72c60daa14dc0661f58ba23563afb61 (diff) | |
download | xmr-stak-203fad6181ee224762d5e37828849605c10f5adf.zip xmr-stak-203fad6181ee224762d5e37828849605c10f5adf.tar.gz |
Proper removal of gpu_thread_num
-rw-r--r-- | doc/tuning.md | 9 | ||||
-rw-r--r-- | xmrstak/backend/amd/jconf.cpp | 11 |
2 files changed, 6 insertions, 14 deletions
diff --git a/doc/tuning.md b/doc/tuning.md index 806f059..6459235 100644 --- a/doc/tuning.md +++ b/doc/tuning.md @@ -53,15 +53,16 @@ In the most cases a `worksize` of `16` or `8` is optimal. ### Add More GPUs -To add a new GPU you need to add a new config set to `gpu_threads_conf` and increase `gpu_thread_num"` to the number of gpus (entries in `gpu_threads_conf`). -`index` is the number of the gpu. +To add a new GPU you need to add a new config set to `gpu_threads_conf`. `index` is the OpenCL index of the gpu. +`platform_index`is the index of the OpenCL platform (Intel / AMD / Nvidia). +If you are unsure of either GPU or platform index value, you can use `clinfo` tool that comes with AMD APP SDK to dump the values. ``` -"gpu_thread_num" : 2, - "gpu_threads_conf" : [ { "index" : 0, "intensity" : 1000, "worksize" : 8, "affine_to_cpu" : false }, { "index" : 1, "intensity" : 1000, "worksize" : 8, "affine_to_cpu" : false }, ], + +"platform_index" : 0, ``` 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++) { |