GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-01-22 04:24:29 +00:00
Code Issues Releases Wiki Activity

vstudio: remove remains, move sha in tree

Browse Source 
+ small code fixes
This commit is contained in:
Tanguy Pruvot 2017-03-11 18:36:01 +01:00
parent 6c9852c153
commit d2f836119a
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccminer.vcxproj
View File

@ -352,7 +352,6 @@
<ClInclude Include="quark\cuda_bmw512_sm3.cuh" /> <ClInclude Include="quark\cuda_bmw512_sm3.cuh" />
<ClInclude Include="quark\cuda_quark_groestl512_sm2.cuh" /> <ClInclude Include="quark\cuda_quark_groestl512_sm2.cuh" />
<ClInclude Include="quark\cuda_quark_blake512_sp.cuh" /> <ClInclude Include="quark\cuda_quark_blake512_sp.cuh" />
<ClInclude Include="quark\cuda_skein512_sp.cuh" />
<ClInclude Include="res\resource.h" /> <ClInclude Include="res\resource.h" />
<ClInclude Include="sia\sia-rpc.h" /> <ClInclude Include="sia\sia-rpc.h" />
<ClInclude Include="scrypt\salsa_kernel.h" /> <ClInclude Include="scrypt\salsa_kernel.h" />

13
ccminer.vcxproj.filters
View File

@ -85,7 +85,7 @@
<Filter Include="Source Files\CUDA\lbry"> <Filter Include="Source Files\CUDA\lbry">
<UniqueIdentifier>{3079ea1f-f768-455a-acd6-f517fac535b4}</UniqueIdentifier> <UniqueIdentifier>{3079ea1f-f768-455a-acd6-f517fac535b4}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\sha256"> <Filter Include="Source Files\CUDA\sha256">
<UniqueIdentifier>{86a896c0-1688-4854-98e3-285d166069a3}</UniqueIdentifier> <UniqueIdentifier>{86a896c0-1688-4854-98e3-285d166069a3}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files\sia"> <Filter Include="Source Files\sia">
@ -518,9 +518,6 @@
<ClInclude Include="quark\cuda_quark_blake512_sp.cuh"> <ClInclude Include="quark\cuda_quark_blake512_sp.cuh">
<Filter>Source Files\CUDA\quark</Filter> <Filter>Source Files\CUDA\quark</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="quark\cuda_skein512_sp.cuh">
<Filter>Source Files\CUDA\quark</Filter>
</ClInclude>
<ClInclude Include="quark\cuda_bmw512_sm3.cuh"> <ClInclude Include="quark\cuda_bmw512_sm3.cuh">
<Filter>Source Files\CUDA\quark</Filter> <Filter>Source Files\CUDA\quark</Filter>
</ClInclude> </ClInclude>
@ -860,16 +857,16 @@
<Filter>Source Files\CUDA\lbry</Filter> <Filter>Source Files\CUDA\lbry</Filter>
</CudaCompile> </CudaCompile>
<CudaCompile Include="sha256\cuda_sha256d.cu"> <CudaCompile Include="sha256\cuda_sha256d.cu">
<Filter>Source Files\sha256</Filter> <Filter>Source Files\CUDA\sha256</Filter>
</CudaCompile> </CudaCompile>
<CudaCompile Include="sha256\sha256d.cu"> <CudaCompile Include="sha256\sha256d.cu">
<Filter>Source Files\sha256</Filter> <Filter>Source Files\CUDA\sha256</Filter>
</CudaCompile> </CudaCompile>
<CudaCompile Include="sha256\cuda_sha256t.cu"> <CudaCompile Include="sha256\cuda_sha256t.cu">
<Filter>Source Files\sha256</Filter> <Filter>Source Files\CUDA\sha256</Filter>
</CudaCompile> </CudaCompile>
<CudaCompile Include="sha256\sha256t.cu"> <CudaCompile Include="sha256\sha256t.cu">
<Filter>Source Files\sha256</Filter> <Filter>Source Files\CUDA\sha256</Filter>
</CudaCompile> </CudaCompile>
<CudaCompile Include="sia\sia.cu"> <CudaCompile Include="sia\sia.cu">
<Filter>Source Files\sia</Filter> <Filter>Source Files\sia</Filter>

2
x11/veltor.cu
View File

@ -147,7 +147,7 @@ extern "C" int scanhash_veltor(int thr_id, struct work* work, uint32_t max_nonce
if (!opt_quiet) if (!opt_quiet)
gpulog(LOG_WARNING, thr_id, "result for %08x does not validate on CPU!", h_resNonce[0]); gpulog(LOG_WARNING, thr_id, "result for %08x does not validate on CPU!", h_resNonce[0]);
cudaMemset(d_resNonce[thr_id], 0xff, NBN*sizeof(uint32_t)); cudaMemset(d_resNonce[thr_id], 0xff, NBN*sizeof(uint32_t));
pdata[19] = h_resNonce[0] + 1; pdata[19] = startNounce + h_resNonce[0] + 1;
continue; continue;
} }
} }

2
x15/cuda_x15_whirlpool.cu
View File

@ -62,7 +62,7 @@ __device__ static uint2 c_PaddedMessage80[16];
*/ */
__device__ uint2 InitVector_RC[10]; __device__ uint2 InitVector_RC[10];
static uint32_t *d_resNonce[MAX_GPUS]; static uint32_t *d_resNonce[MAX_GPUS] = { 0 };
//--------START OF WHIRLPOOL DEVICE MACROS--------------------------------------------------------------------------- //--------START OF WHIRLPOOL DEVICE MACROS---------------------------------------------------------------------------
__device__ __forceinline__ __device__ __forceinline__