Skip to content

Commit

Permalink
support for compute_30 cards, remove stale rejection logic responsibl…
Browse files Browse the repository at this point in the history
…e for large discrepencies between nominal hashrate and the one reported

by pools
  • Loading branch information
djm34 committed Jun 3, 2017
1 parent 1b8da27 commit 877b7aa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions ccminer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ int opt_time_limit = -1;
int opt_shares_limit = -1;
time_t firstwork_time = 0;
int opt_timeout = 300; // curl
int opt_scantime = 10;
int opt_scantime = 30;
static json_t *opt_config;
static const bool opt_time = true;
volatile enum sha_algos opt_algo = ALGO_AUTO;
Expand Down Expand Up @@ -787,6 +787,7 @@ static bool submit_upstream_work(CURL *curl, struct work *work)
int idnonce = 0;

/* discard if a newer block was received */
/*
stale_work = work->height && work->height < g_work.height;
if (have_stratum && !stale_work && opt_algo != ALGO_ZR5 && opt_algo != ALGO_SCRYPT_JANE) {
pthread_mutex_lock(&g_work_lock);
Expand Down Expand Up @@ -824,7 +825,7 @@ static bool submit_upstream_work(CURL *curl, struct work *work)
applog(LOG_WARNING, "stale work detected, discarding");
return true;
}

*/
if (pool->type & POOL_STRATUM) {
uint32_t sent = 0;
uint32_t ntime, nonce;
Expand Down
2 changes: 1 addition & 1 deletion ccminer.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<MaxRegCount>80</MaxRegCount>
<PtxAsOptionV>true</PtxAsOptionV>
<Keep>true</Keep>
<CodeGeneration>compute_61,sm_61;compute_60,sm_60;compute_52,sm_52;compute_50,sm_50;compute_35,sm_35</CodeGeneration>
<CodeGeneration>compute_61,sm_61;compute_60,sm_60;compute_52,sm_52;compute_50,sm_50;compute_35,sm_35;compute_30,sm_30</CodeGeneration>
<AdditionalOptions>--ptxas-options="-O2" %(AdditionalOptions)</AdditionalOptions>
<Optimization>O2</Optimization>
<CompileOut>$(IntDir)Cuda\%(Filename)%(Extension).obj</CompileOut>
Expand Down

0 comments on commit 877b7aa

Please sign in to comment.