Browse Source

fix the dreaded FEMRI spelling mistake

2upstream v0.7
Christian Buchner 11 years ago
parent
commit
61cbdc62d0
  1. 1
      README.txt
  2. 5
      ccminer.vcxproj
  3. 15
      ccminer.vcxproj.filters
  4. 4
      cuda_myriadgroestl.cu
  5. 4
      quark/cuda_quark_groestl512.cu

1
README.txt

@ -119,6 +119,7 @@ from your old clunkers.
May 1st 2014 adapt the Jackpot algorithms to changes made by the May 1st 2014 adapt the Jackpot algorithms to changes made by the
coin developers. We keep our unique nVidia advantage coin developers. We keep our unique nVidia advantage
because we have a way to break up the divergence. because we have a way to break up the divergence.
NOTE: Jackpot Hash now requires Compute 3.0 or later.
April, 27 2014 this release adds Myriad-Groestl and Jackpot Coin. April, 27 2014 this release adds Myriad-Groestl and Jackpot Coin.
we apply an optimization to Jackpot that turns this we apply an optimization to Jackpot that turns this

5
ccminer.vcxproj

@ -287,11 +287,6 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
<ClInclude Include="sph\sph_simd.h" /> <ClInclude Include="sph\sph_simd.h" />
<ClInclude Include="sph\sph_skein.h" /> <ClInclude Include="sph\sph_skein.h" />
<ClInclude Include="sph\sph_types.h" /> <ClInclude Include="sph\sph_types.h" />
<ClInclude Include="sph_blake.h" />
<ClInclude Include="sph_fugue.h" />
<ClInclude Include="sph_groestl.h" />
<ClInclude Include="sph_keccak.h" />
<ClInclude Include="sph_types.h" />
<ClInclude Include="uint256.h" /> <ClInclude Include="uint256.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

15
ccminer.vcxproj.filters

@ -164,18 +164,6 @@
<ClInclude Include="cpuminer-config.h"> <ClInclude Include="cpuminer-config.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="sph_blake.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="sph_types.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="sph_groestl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="sph_keccak.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="hefty1.h"> <ClInclude Include="hefty1.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -197,9 +185,6 @@
<ClInclude Include="cuda_groestl512.h"> <ClInclude Include="cuda_groestl512.h">
<Filter>Header Files\CUDA</Filter> <Filter>Header Files\CUDA</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="sph_fugue.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="uint256.h"> <ClInclude Include="uint256.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>

4
cuda_myriadgroestl.cu

@ -8,7 +8,7 @@
#include <memory.h> #include <memory.h>
// it's unfortunate that this is a compile time constant. // it's unfortunate that this is a compile time constant.
#define MAXWELL_OR_FERMI 0 #define MAXWELL_OR_FERMI 1
// aus cpu-miner.c // aus cpu-miner.c
extern int device_map[8]; extern int device_map[8];
@ -230,7 +230,7 @@ __device__ void myriadgroestl_gpu_sha256(uint32_t *message)
#define B32_3(x) __byte_perm(x, 0, 0x4443) #define B32_3(x) __byte_perm(x, 0, 0x4443)
//((x) >> 24) //((x) >> 24)
#if MAXWELL_OR_FEMRI #if MAXWELL_OR_FERMI
#define USE_SHARED 1 #define USE_SHARED 1
// Maxwell and Fermi cards get the best speed with SHARED access it seems. // Maxwell and Fermi cards get the best speed with SHARED access it seems.
#if USE_SHARED #if USE_SHARED

4
quark/cuda_quark_groestl512.cu

@ -8,7 +8,7 @@
#include <memory.h> #include <memory.h>
// it's unfortunate that this is a compile time constant. // it's unfortunate that this is a compile time constant.
#define MAXWELL_OR_FERMI 0 #define MAXWELL_OR_FERMI 1
// aus cpu-miner.c // aus cpu-miner.c
extern int device_map[8]; extern int device_map[8];
@ -41,7 +41,7 @@ static cudaDeviceProp props[8];
#define B32_3(x) __byte_perm(x, 0, 0x4443) #define B32_3(x) __byte_perm(x, 0, 0x4443)
//((x) >> 24) //((x) >> 24)
#if MAXWELL_OR_FEMRI #if MAXWELL_OR_FERMI
#define USE_SHARED 1 #define USE_SHARED 1
// Maxwell and Fermi cards get the best speed with SHARED access it seems. // Maxwell and Fermi cards get the best speed with SHARED access it seems.
#if USE_SHARED #if USE_SHARED

Loading…
Cancel
Save