Compile fixes & Toolkit detection

pomianowski · pomianowski · commit 0a57d0114866 · 2019-12-23T20:47:16.000+01:00
diff --git a/Cudafy.sln b/Cudafy.sln
@@ -93,8 +93,8 @@ Global
 		{DD4D4125-CB55-4DBD-B9EA-7E0709921DBF}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD4D4125-CB55-4DBD-B9EA-7E0709921DBF}.LinuxDebug|x64.ActiveCfg = LinuxDebug|x64
 		{DD4D4125-CB55-4DBD-B9EA-7E0709921DBF}.LinuxDebug|x64.Build.0 = LinuxDebug|x64
-		{DD4D4125-CB55-4DBD-B9EA-7E0709921DBF}.Release|x64.ActiveCfg = Release|x64
-		{DD4D4125-CB55-4DBD-B9EA-7E0709921DBF}.Release|x64.Build.0 = Release|x64
+		{DD4D4125-CB55-4DBD-B9EA-7E0709921DBF}.Release|x64.ActiveCfg = Release|Any CPU
+		{DD4D4125-CB55-4DBD-B9EA-7E0709921DBF}.Release|x64.Build.0 = Release|Any CPU
 		{C9ED8E2D-B7EF-4FC7-B357-1880F4571373}.Debug|x64.ActiveCfg = Debug|x64
 		{C9ED8E2D-B7EF-4FC7-B357-1880F4571373}.Debug|x64.Build.0 = Debug|x64
 		{C9ED8E2D-B7EF-4FC7-B357-1880F4571373}.LinuxDebug|x64.ActiveCfg = LinuxDebug|x64
diff --git a/Cudafy/Compilers/NvccExe.cs b/Cudafy/Compilers/NvccExe.cs
@@ -13,8 +13,7 @@ internal static class NvccExe
         static string getToolkitBaseDir()
         {
             //Find Computing Toolkit in the default path
-            string prFil = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
-            prFil = Path.Combine(prFil, @"NVIDIA GPU Computing Toolkit\CUDA");
+            string prFil = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"NVIDIA GPU Computing Toolkit\CdUDA");
 
             if (Directory.Exists(prFil))
             {
@@ -23,6 +22,12 @@ static string getToolkitBaseDir()
                     for (int i = ctDirs.Length; i > 0; i--)
                         return Path.Combine(prFil, ctDirs[i - 1]);
             }
+            else
+            {
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine("nVidia GPU Toolkit error: Could not find 'NVIDIA GPU Computing Toolkit' in default path. Modify the Cudafy/Compilers/NvccExe.cs file to change the path.");
+                Console.ResetColor();
+            }
 
             throw new CudafyCompileException("nVidia GPU Toolkit error: Computing Toolkit was not found");
         }

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@ internal static class NvccExe`
`13`	`13`	`static string getToolkitBaseDir()`
`14`	`14`	`{`
`15`	`15`	`//Find Computing Toolkit in the default path`
`16`		`- string prFil = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);`
`17`		`- prFil = Path.Combine(prFil, @"NVIDIA GPU Computing Toolkit\CUDA");`
	`16`	`+ string prFil = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"NVIDIA GPU Computing Toolkit\CdUDA");`
`18`	`17`
`19`	`18`	`if (Directory.Exists(prFil))`
`20`	`19`	`{`
`@@ -23,6 +22,12 @@ static string getToolkitBaseDir()`
`23`	`22`	`for (int i = ctDirs.Length; i > 0; i--)`
`24`	`23`	`return Path.Combine(prFil, ctDirs[i - 1]);`
`25`	`24`	`}`
	`25`	`+ else`
	`26`	`+ {`
	`27`	`+ Console.ForegroundColor = ConsoleColor.Red;`
	`28`	`+ Console.WriteLine("nVidia GPU Toolkit error: Could not find 'NVIDIA GPU Computing Toolkit' in default path. Modify the Cudafy/Compilers/NvccExe.cs file to change the path.");`
	`29`	`+ Console.ResetColor();`
	`30`	`+ }`
`26`	`31`
`27`	`32`	`throw new CudafyCompileException("nVidia GPU Toolkit error: Computing Toolkit was not found");`
`28`	`33`	`}`