Upgrade to CUDA 11.4 SDK

BitCrack.props

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-	<CUDA_INCLUDE>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1\include</CUDA_INCLUDE>
-	<CUDA_LIB>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1\lib\x64</CUDA_LIB>
-    <OPENCL_INCLUDE>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1\include</OPENCL_INCLUDE>
-    <OPENCL_LIB>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1\lib\x64</OPENCL_LIB>
+	<CUDA_INCLUDE>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\include</CUDA_INCLUDE>
+	<CUDA_LIB>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\lib\x64</CUDA_LIB>
+    <OPENCL_INCLUDE>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\include</OPENCL_INCLUDE>
+    <OPENCL_LIB>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\lib\x64</OPENCL_LIB>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup />

BitCrack.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2018
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31702.278
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "secp256k1lib", "secp256k1lib\secp256k1lib.vcxproj", "{BFF4B5FE-C2C5-4384-8941-CD6CB29E78C6}"
 EndProject
@@ -14,7 +14,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cuKeyFinder", "KeyFinder\KeyFinder.vcxproj", "{D77642A9-365C-420C-A726-469649D2927E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{53EE0C03-4419-4767-A91B-7FC7D4B3D2AA} = {53EE0C03-4419-4767-A91B-7FC7D4B3D2AA}
-		{CCA3D02C-5E5A-4A24-B34B-5961DFA93946} = {CCA3D02C-5E5A-4A24-B34B-5961DFA93946}
+		{29B2FE33-ED2A-49BF-A967-143E9A507173} = {29B2FE33-ED2A-49BF-A967-143E9A507173}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AddrGen", "AddrGen\AddrGen.vcxproj", "{7AE5E38D-5731-404E-A4F3-229ADF981EFC}"
@@ -46,10 +46,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cudaInfo", "cudaInfo\cudaIn
 		{EADAAA54-E304-4656-8263-E5E688FF323D} = {EADAAA54-E304-4656-8263-E5E688FF323D}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cudaMath", "cudaMath\cudaMath.vcxproj", "{E1BDB205-8994-4E49-8B35-172A84E7118C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CudaKeySearchDevice", "CudaKeySearchDevice\CudaKeySearchDevice.vcxproj", "{CCA3D02C-5E5A-4A24-B34B-5961DFA93946}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clUtil", "clUtil\clUtil.vcxproj", "{D9A5823D-C472-40AC-B23A-21B1586CEEB0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{93B89BF6-32B9-4EBA-AA44-BCFEC4836B76} = {93B89BF6-32B9-4EBA-AA44-BCFEC4836B76}
@@ -79,6 +75,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLUnitTests", "CLUnitTests\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clMath", "clMath\clMath.vcxproj", "{83327841-C283-4D46-A873-97AC674C68AC}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CudaKeySearchDevice", "CudaKeySearchDevice\CudaKeySearchDevice.vcxproj", "{29B2FE33-ED2A-49BF-A967-143E9A507173}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cudaMath", "cudaMath\cudaMath.vcxproj", "{782E95EF-E7CB-475E-A67B-1BE144C0D413}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -171,18 +171,6 @@ Global
 		{9E8ECC85-AF9F-4F17-9397-633CA2FEE94E}.Release|x64.ActiveCfg = Release|x64
 		{9E8ECC85-AF9F-4F17-9397-633CA2FEE94E}.Release|x64.Build.0 = Release|x64
 		{9E8ECC85-AF9F-4F17-9397-633CA2FEE94E}.Release|x86.ActiveCfg = Release|x64
-		{E1BDB205-8994-4E49-8B35-172A84E7118C}.Debug|x64.ActiveCfg = Debug|x64
-		{E1BDB205-8994-4E49-8B35-172A84E7118C}.Debug|x64.Build.0 = Debug|x64
-		{E1BDB205-8994-4E49-8B35-172A84E7118C}.Debug|x86.ActiveCfg = Debug|x64
-		{E1BDB205-8994-4E49-8B35-172A84E7118C}.Release|x64.ActiveCfg = Release|x64
-		{E1BDB205-8994-4E49-8B35-172A84E7118C}.Release|x64.Build.0 = Release|x64
-		{E1BDB205-8994-4E49-8B35-172A84E7118C}.Release|x86.ActiveCfg = Release|x64
-		{CCA3D02C-5E5A-4A24-B34B-5961DFA93946}.Debug|x64.ActiveCfg = Debug|x64
-		{CCA3D02C-5E5A-4A24-B34B-5961DFA93946}.Debug|x64.Build.0 = Debug|x64
-		{CCA3D02C-5E5A-4A24-B34B-5961DFA93946}.Debug|x86.ActiveCfg = Debug|x64
-		{CCA3D02C-5E5A-4A24-B34B-5961DFA93946}.Release|x64.ActiveCfg = Release|x64
-		{CCA3D02C-5E5A-4A24-B34B-5961DFA93946}.Release|x64.Build.0 = Release|x64
-		{CCA3D02C-5E5A-4A24-B34B-5961DFA93946}.Release|x86.ActiveCfg = Release|x64
 		{D9A5823D-C472-40AC-B23A-21B1586CEEB0}.Debug|x64.ActiveCfg = Debug|x64
 		{D9A5823D-C472-40AC-B23A-21B1586CEEB0}.Debug|x64.Build.0 = Debug|x64
 		{D9A5823D-C472-40AC-B23A-21B1586CEEB0}.Debug|x86.ActiveCfg = Debug|Win32
@@ -231,6 +219,18 @@ Global
 		{83327841-C283-4D46-A873-97AC674C68AC}.Release|x64.Build.0 = Release|x64
 		{83327841-C283-4D46-A873-97AC674C68AC}.Release|x86.ActiveCfg = Release|Win32
 		{83327841-C283-4D46-A873-97AC674C68AC}.Release|x86.Build.0 = Release|Win32
+		{29B2FE33-ED2A-49BF-A967-143E9A507173}.Debug|x64.ActiveCfg = Debug|x64
+		{29B2FE33-ED2A-49BF-A967-143E9A507173}.Debug|x64.Build.0 = Debug|x64
+		{29B2FE33-ED2A-49BF-A967-143E9A507173}.Debug|x86.ActiveCfg = Debug|x64
+		{29B2FE33-ED2A-49BF-A967-143E9A507173}.Release|x64.ActiveCfg = Release|x64
+		{29B2FE33-ED2A-49BF-A967-143E9A507173}.Release|x64.Build.0 = Release|x64
+		{29B2FE33-ED2A-49BF-A967-143E9A507173}.Release|x86.ActiveCfg = Release|x64
+		{782E95EF-E7CB-475E-A67B-1BE144C0D413}.Debug|x64.ActiveCfg = Debug|x64
+		{782E95EF-E7CB-475E-A67B-1BE144C0D413}.Debug|x64.Build.0 = Debug|x64
+		{782E95EF-E7CB-475E-A67B-1BE144C0D413}.Debug|x86.ActiveCfg = Debug|x64
+		{782E95EF-E7CB-475E-A67B-1BE144C0D413}.Release|x64.ActiveCfg = Release|x64
+		{782E95EF-E7CB-475E-A67B-1BE144C0D413}.Release|x64.Build.0 = Release|x64
+		{782E95EF-E7CB-475E-A67B-1BE144C0D413}.Release|x86.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CudaKeySearchDevice/CudaKeySearchDevice.vcxproj

@@ -11,32 +11,27 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="CudaKeySearchDevice.cpp" />
+    <CudaCompile Include="CudaAtomicList.cu" />
+    <CudaCompile Include="cudabridge.cu" />
+    <CudaCompile Include="CudaDeviceKeys.cu" />
+    <CudaCompile Include="CudaHashLookup.cu" />
+    <CudaCompile Include="CudaKeySearchDevice.cu" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CudaAtomicList.cuh" />
     <ClInclude Include="CudaAtomicList.h" />
     <ClInclude Include="cudabridge.h" />
-    <ClInclude Include="CudaKeySearchDevice.h" />
     <ClInclude Include="CudaDeviceKeys.cuh" />
     <ClInclude Include="CudaDeviceKeys.h" />
     <ClInclude Include="CudaHashLookup.cuh" />
     <ClInclude Include="CudaHashLookup.h" />
+    <ClInclude Include="CudaKeySearchDevice.h" />
   </ItemGroup>
   <ItemGroup>
-    <CudaCompile Include="CudaAtomicList.cu" />
-    <CudaCompile Include="cudabridge.cu" />
-    <CudaCompile Include="CudaKeySearchDevice.cu" />
-    <CudaCompile Include="CudaDeviceKeys.cu" />
-    <CudaCompile Include="CudaHashLookup.cu" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Logger\Logger.vcxproj">
-      <Project>{150af404-1f80-4a13-855b-4383c4a3326f}</Project>
-    </ProjectReference>
+    <ClCompile Include="CudaKeySearchDevice.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{CCA3D02C-5E5A-4A24-B34B-5961DFA93946}</ProjectGuid>
+    <ProjectGuid>{29B2FE33-ED2A-49BF-A967-143E9A507173}</ProjectGuid>
     <RootNamespace>CudaKeySearchDevice</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
@@ -56,27 +51,24 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 10.1.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.4.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\BitCrack.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\BitCrack.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalIncludeDirectories>$(SolutionDir)\secp256k1lib;$(SolutionDir)\KeyFinderLib;$(SolutionDir)\Logger;$(SolutionDir)\Util;$(SolutionDir)\CudaMath;$(SolutionDir)\cudaUtil;$(SolutionDir)\AddressUtil;$(CUDA_INCLUDE)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\KeyFinderLib;$(SolutionDir)\CudaMath;$(SolutionDir)\secp256k1lib;$(SolutionDir)\cudaUtil;$(SolutionDir)\Logger;$(SolutionDir)\util;$(SolutionDir)\AddressUtil;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -86,18 +78,16 @@
     <CudaCompile>
       <TargetMachinePlatform>64</TargetMachinePlatform>
       <GenerateRelocatableDeviceCode>true</GenerateRelocatableDeviceCode>
-      <CodeGeneration>%(CodeGeneration)</CodeGeneration>
     </CudaCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <AdditionalIncludeDirectories>$(SolutionDir)\secp256k1lib;$(SolutionDir)\KeyFinderLib;$(SolutionDir)\Logger;$(SolutionDir)\Util;$(SolutionDir)\CudaMath;$(SolutionDir)\cudaUtil;$(SolutionDir)\AddressUtil;$(CUDA_INCLUDE)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\KeyFinderLib;$(SolutionDir)\CudaMath;$(SolutionDir)\secp256k1lib;$(SolutionDir)\cudaUtil;$(SolutionDir)\Logger;$(SolutionDir)\util;$(SolutionDir)\AddressUtil;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -109,11 +99,10 @@
     <CudaCompile>
       <TargetMachinePlatform>64</TargetMachinePlatform>
       <GenerateRelocatableDeviceCode>true</GenerateRelocatableDeviceCode>
-      <CodeGeneration>%(CodeGeneration)</CodeGeneration>
     </CudaCompile>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 10.1.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.4.targets" />
   </ImportGroup>
 </Project>

cudaMath/cudaMath.vcxproj

@@ -10,28 +10,34 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ptx.cuh" />
+    <ClInclude Include="ripemd160.cuh" />
+    <ClInclude Include="secp256k1.cuh" />
+    <ClInclude Include="sha256.cuh" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{E1BDB205-8994-4E49-8B35-172A84E7118C}</ProjectGuid>
+    <ProjectGuid>{782E95EF-E7CB-475E-A67B-1BE144C0D413}</ProjectGuid>
     <RootNamespace>cudaMath</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 10.1.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.4.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -77,14 +83,8 @@
       <TargetMachinePlatform>64</TargetMachinePlatform>
     </CudaCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="ptx.cuh" />
-    <ClInclude Include="ripemd160.cuh" />
-    <ClInclude Include="secp256k1.cuh" />
-    <ClInclude Include="sha256.cuh" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 10.1.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 11.4.targets" />
   </ImportGroup>
 </Project>