Better error handling, when there is an error with init don't run kernel

nginnever · Oct 21, 2016 · f6baa2f · f6baa2f
1 parent be6c0da
commit f6baa2f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/libzogminer/cl_zogminer.cpp b/src/libzogminer/cl_zogminer.cpp
@@ -27,7 +27,7 @@ using namespace std;
 unsigned const cl_zogminer::c_defaultLocalWorkSize = 64;
 unsigned const cl_zogminer::c_defaultGlobalWorkSizeMultiplier = 4096; // * CL_DEFAULT_LOCAL_WORK_SIZE
 unsigned const cl_zogminer::c_defaultMSPerBatch = 0;
-bool cl_zogminer::s_allowCPU = true;
+bool cl_zogminer::s_allowCPU = false;
 unsigned cl_zogminer::s_extraRequiredGPUMem;
 unsigned cl_zogminer::s_msPerBatch = cl_zogminer::c_defaultMSPerBatch;
 unsigned cl_zogminer::s_workgroupSize = cl_zogminer::c_defaultLocalWorkSize;

diff --git a/src/libzogminer/gpusolver.cpp b/src/libzogminer/gpusolver.cpp
@@ -69,7 +69,7 @@ GPUSolver::GPUSolver() {
 	*/
 	std::vector<std::string> kernels {"initial_bucket_hashing", "bucket_collide_and_hash", "produce_solutions"};
 	if(GPU)
-		miner->init(0, 0, kernels);
+		initOK = miner->init(0, 0, kernels);
 
 }
 
@@ -103,7 +103,7 @@ bool GPUSolver::GPUSolve200_9(const eh_HashState& base_state,
 	@params eh_HashState& base_state - Sends to kernel in a buffer. Will update for specific kernels
 	*/
 
-	if(GPU) {
+	if(GPU && initOK) {
         auto t = std::chrono::high_resolution_clock::now();
 
     	miner->run(base_state);

diff --git a/src/libzogminer/gpusolver.h b/src/libzogminer/gpusolver.h
@@ -65,6 +65,7 @@ class GPUSolver {
 private:
 	cl_zogminer * miner;
 	bool GPU;
+	bool initOK;
 
 	//TODO Really wasteful initialize and compile kernels once, not for every iter
 	bool GPUSolve200_9(const eh_HashState& base_state,