From f1b06b6d5d86534984e2de5a09aba6b0a70e4115 Mon Sep 17 00:00:00 2001 From: Beatriz Navidad Vilches <61422851+Beanavil@users.noreply.github.com> Date: Wed, 22 May 2024 15:45:56 +0200 Subject: [PATCH] Develop Stream 2024-05-06 VS fixes (#116) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove ProjectExcludedFromBuild * HIP 5.5 fixes VS * Resolve "Revert "Remove ProjectExcludedFromBuild "" * Resolve "Fix opengl_interop in solution files" * Add hip_opengl_interop_vs2019.exe as a skipped example in the CI * Fix deleted lines in VSCode files after rebasing * Compile HIP module as object library * Resolve "NVCC VS 2019 Release runtime failure" VS * Enabled monte_carlo_pi on Windows * Resolve "Fix GUID in Prefix sum example" * Hotfix: define OutDir for HIP SDK 5.7 toolset --------- Co-authored-by: Robin Voetter Co-authored-by: Mátyás Aradi Co-authored-by: Máté Ferenc Nagy-Egri Co-authored-by: Lőrinc Serfőző --- .../bitonic_sort/bitonic_sort_vs2017.sln | 2 +- .../bitonic_sort/bitonic_sort_vs2019.sln | 2 +- .../bitonic_sort/bitonic_sort_vs2019.vcxproj | 2 +- .../bitonic_sort/bitonic_sort_vs2022.sln | 2 +- .../convolution/convolution_vs2017.sln | 2 +- .../convolution/convolution_vs2019.sln | 2 +- .../convolution/convolution_vs2022.sln | 2 +- .../floyd_warshall/floyd_warshall_vs2019.sln | 2 +- .../monte_carlo_pi/monte_carlo_pi_vs2017.sln | 24 +++ .../monte_carlo_pi_vs2017.vcxproj | 141 ++++++++++++++++++ .../monte_carlo_pi_vs2017.vcxproj.filters | 30 ++++ .../monte_carlo_pi/monte_carlo_pi_vs2019.sln | 24 +++ .../monte_carlo_pi_vs2019.vcxproj | 141 ++++++++++++++++++ .../monte_carlo_pi_vs2019.vcxproj.filters | 30 ++++ .../monte_carlo_pi/monte_carlo_pi_vs2022.sln | 24 +++ .../monte_carlo_pi_vs2022.vcxproj | 141 ++++++++++++++++++ .../monte_carlo_pi_vs2022.vcxproj.filters | 30 ++++ Applications/prefix_sum/prefix_sum_vs2017.sln | 12 +- .../prefix_sum/prefix_sum_vs2017.vcxproj | 2 +- Applications/prefix_sum/prefix_sum_vs2019.sln | 12 +- .../prefix_sum/prefix_sum_vs2019.vcxproj | 2 +- Applications/prefix_sum/prefix_sum_vs2022.sln | 10 +- HIP-Basic/CMakeLists.txt | 2 +- HIP-Basic/module_api/CMakeLists.txt | 41 +++-- .../module_api/module_api_vs2017.vcxproj | 14 +- .../module_api/module_api_vs2019.vcxproj | 14 +- .../module_api/module_api_vs2022.vcxproj | 14 +- .../opengl_interop_vs2017.vcxproj | 4 - .../opengl_interop_vs2019.vcxproj | 4 - .../opengl_interop_vs2022.vcxproj | 4 - .../vulkan_interop_vs2017.vcxproj | 6 +- .../vulkan_interop_vs2019.vcxproj | 6 +- .../vulkan_interop_vs2022.vcxproj | 6 +- .../simple_distributions_cpp_vs2017.vcxproj | 2 - .../simple_distributions_cpp_vs2019.vcxproj | 2 - .../simple_distributions_cpp_vs2022.vcxproj | 2 - ROCm-Examples-Portable-VS2017.sln | 12 +- ROCm-Examples-Portable-VS2019.sln | 12 +- ROCm-Examples-VS2017.sln | 19 ++- ROCm-Examples-VS2019.sln | 20 ++- ROCm-Examples-VS2022.sln | 8 + 41 files changed, 719 insertions(+), 112 deletions(-) create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2017.sln create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2017.vcxproj create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2017.vcxproj.filters create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2019.sln create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2019.vcxproj create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2019.vcxproj.filters create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2022.sln create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2022.vcxproj create mode 100644 Applications/monte_carlo_pi/monte_carlo_pi_vs2022.vcxproj.filters diff --git a/Applications/bitonic_sort/bitonic_sort_vs2017.sln b/Applications/bitonic_sort/bitonic_sort_vs2017.sln index bf9b47cd4..a1a852a13 100644 --- a/Applications/bitonic_sort/bitonic_sort_vs2017.sln +++ b/Applications/bitonic_sort/bitonic_sort_vs2017.sln @@ -19,6 +19,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6C3AE930-86C0-4E39-A249-BBFA047DBE8C} + SolutionGuid = {8F0AD786-4E5F-4FFE-915E-2EF732113AE3} EndGlobalSection EndGlobal diff --git a/Applications/bitonic_sort/bitonic_sort_vs2019.sln b/Applications/bitonic_sort/bitonic_sort_vs2019.sln index 26d3582c7..501d8d8f2 100644 --- a/Applications/bitonic_sort/bitonic_sort_vs2019.sln +++ b/Applications/bitonic_sort/bitonic_sort_vs2019.sln @@ -19,6 +19,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D7C4B290-7C93-4D26-85D9-364F6A448EE0} + SolutionGuid = {A3602BC9-F12F-4FC1-8B52-0D99B5BDB96B} EndGlobalSection EndGlobal diff --git a/Applications/bitonic_sort/bitonic_sort_vs2019.vcxproj b/Applications/bitonic_sort/bitonic_sort_vs2019.vcxproj index ab6d75793..814094105 100644 --- a/Applications/bitonic_sort/bitonic_sort_vs2019.vcxproj +++ b/Applications/bitonic_sort/bitonic_sort_vs2019.vcxproj @@ -128,4 +128,4 @@ - + \ No newline at end of file diff --git a/Applications/bitonic_sort/bitonic_sort_vs2022.sln b/Applications/bitonic_sort/bitonic_sort_vs2022.sln index b3cbe9d00..e32689b68 100644 --- a/Applications/bitonic_sort/bitonic_sort_vs2022.sln +++ b/Applications/bitonic_sort/bitonic_sort_vs2022.sln @@ -19,6 +19,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {538AA3F0-203D-4A51-8C00-F65282A55F3B} + SolutionGuid = {43370968-8153-4DF6-BCDD-D904E737B6D2} EndGlobalSection EndGlobal diff --git a/Applications/convolution/convolution_vs2017.sln b/Applications/convolution/convolution_vs2017.sln index bc9ab60b3..9906d1065 100644 --- a/Applications/convolution/convolution_vs2017.sln +++ b/Applications/convolution/convolution_vs2017.sln @@ -19,6 +19,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6C3AE930-86C0-4E39-A249-BBFA047DBE8C} + SolutionGuid = {F8911A50-730C-406C-9B55-E0A22E60B369} EndGlobalSection EndGlobal diff --git a/Applications/convolution/convolution_vs2019.sln b/Applications/convolution/convolution_vs2019.sln index 1c2df7c3c..872e3fcb1 100644 --- a/Applications/convolution/convolution_vs2019.sln +++ b/Applications/convolution/convolution_vs2019.sln @@ -19,6 +19,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D7C4B290-7C93-4D26-85D9-364F6A448EE0} + SolutionGuid = {82F2D4CF-3235-4322-A25C-73941115D87E} EndGlobalSection EndGlobal diff --git a/Applications/convolution/convolution_vs2022.sln b/Applications/convolution/convolution_vs2022.sln index c5667ff7c..a3afb881c 100644 --- a/Applications/convolution/convolution_vs2022.sln +++ b/Applications/convolution/convolution_vs2022.sln @@ -19,6 +19,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {538AA3F0-203D-4A51-8C00-F65282A55F3B} + SolutionGuid = {2DB89F10-D8E2-455B-BB72-DE6B741245EB} EndGlobalSection EndGlobal diff --git a/Applications/floyd_warshall/floyd_warshall_vs2019.sln b/Applications/floyd_warshall/floyd_warshall_vs2019.sln index 9aa8b4ee4..e9036a640 100644 --- a/Applications/floyd_warshall/floyd_warshall_vs2019.sln +++ b/Applications/floyd_warshall/floyd_warshall_vs2019.sln @@ -19,6 +19,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D7C4B290-7C93-4D26-85D9-364F6A448EE0} + SolutionGuid = {79379617-EDC0-45FA-8AB9-6EA0429EE9EB} EndGlobalSection EndGlobal diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.sln b/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.sln new file mode 100644 index 000000000..f1c766bc0 --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.sln @@ -0,0 +1,24 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.33026.149 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monte_carlo_pi_vs2017", "monte_carlo_pi_vs2017.vcxproj", "{2ACD5660-DAA6-490B-8C5D-F0B178A80D16}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16}.Debug|x64.ActiveCfg = Debug|x64 + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16}.Debug|x64.Build.0 = Debug|x64 + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16}.Release|x64.ActiveCfg = Release|x64 + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6C3AE930-86C0-4E39-A249-BBFA047DBE8C} + EndGlobalSection +EndGlobal diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.vcxproj b/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.vcxproj new file mode 100644 index 000000000..762783801 --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.vcxproj @@ -0,0 +1,141 @@ + + + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {2acd5660-daa6-490b-8c5d-f0b178a80d16} + Win32Proj + monte_carlo_pi_vs2017 + $(LatestTargetPlatformVersion) + + + + + + + + + + + PreserveNewest + + + + + Application + true + HIP_clang + Unicode + + + Application + false + HIP_clang + true + Unicode + + + + + + + + + + + + + + + + + true + applications_$(ProjectName) + + + false + applications_$(ProjectName) + + + gfx1030;gfx1100;gfx1101;gfx1102 + + + gfx1030;gfx1100;gfx1101;gfx1102 + + + + Level2 + __clang__;__HIP__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + hiprand.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level2 + __CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + + + + + Level2 + true + true + __clang__;__HIP__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + hiprand.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level2 + true + true + __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + + + + + + + + \ No newline at end of file diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.vcxproj.filters b/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.vcxproj.filters new file mode 100644 index 000000000..3f71fbeb2 --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2017.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {b5aaf2a0-e113-4635-9276-8adc8d850f2f} + cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx;hip;cu + + + {e61ef480-daa2-41c2-ad9a-9d14d45235bc} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd;cuh + + + {dbb06ec5-2301-4be8-8bba-5508eb3d0615} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.sln b/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.sln new file mode 100644 index 000000000..394a43261 --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.sln @@ -0,0 +1,24 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.32630.194 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monte_carlo_pi_vs2019", "monte_carlo_pi_vs2019.vcxproj", "{6E278B7D-E928-4151-8613-08E91FC6D4D5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6E278B7D-E928-4151-8613-08E91FC6D4D5}.Debug|x64.ActiveCfg = Debug|x64 + {6E278B7D-E928-4151-8613-08E91FC6D4D5}.Debug|x64.Build.0 = Debug|x64 + {6E278B7D-E928-4151-8613-08E91FC6D4D5}.Release|x64.ActiveCfg = Release|x64 + {6E278B7D-E928-4151-8613-08E91FC6D4D5}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D7C4B290-7C93-4D26-85D9-364F6A448EE0} + EndGlobalSection +EndGlobal diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.vcxproj b/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.vcxproj new file mode 100644 index 000000000..42f3e21ff --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.vcxproj @@ -0,0 +1,141 @@ + + + + + Debug + x64 + + + Release + x64 + + + + 16.0 + {6e278b7d-e928-4151-8613-08e91fc6d4d5} + Win32Proj + monte_carlo_pi_vs2019 + $(LatestTargetPlatformVersion) + + + + + + + + + + + PreserveNewest + + + + + Application + true + HIP_clang + Unicode + + + Application + false + HIP_clang + true + Unicode + + + + + + + + + + + + + + + + + true + applications_$(ProjectName) + + + false + applications_$(ProjectName) + + + gfx1030;gfx1100;gfx1101;gfx1102 + + + gfx1030;gfx1100;gfx1101;gfx1102 + + + + Level2 + __clang__;__HIP__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + hiprand.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level2 + __CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + + + + + Level2 + true + true + __clang__;__HIP__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + hiprand.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level2 + true + true + __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + + + + + + + + \ No newline at end of file diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.vcxproj.filters b/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.vcxproj.filters new file mode 100644 index 000000000..c213a62e1 --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2019.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {b619fc32-7a0a-4886-8a90-01f189475eb3} + cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx;hip;cu + + + {3701eed9-6356-455b-ada7-275436406914} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd;cuh + + + {04062a42-da1a-473b-be62-2706c2d4595c} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.sln b/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.sln new file mode 100644 index 000000000..33793d4a6 --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.sln @@ -0,0 +1,24 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33213.308 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monte_carlo_pi_vs2022", "monte_carlo_pi_vs2022.vcxproj", "{107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}.Debug|x64.ActiveCfg = Debug|x64 + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}.Debug|x64.Build.0 = Debug|x64 + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}.Release|x64.ActiveCfg = Release|x64 + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {538AA3F0-203D-4A51-8C00-F65282A55F3B} + EndGlobalSection +EndGlobal diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.vcxproj b/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.vcxproj new file mode 100644 index 000000000..c4407f2ce --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.vcxproj @@ -0,0 +1,141 @@ + + + + + Debug + x64 + + + Release + x64 + + + + 17.0 + {107ac26f-a20d-4b25-81de-afcdcdecbffc} + Win32Proj + monte_carlo_pi_vs2022 + $(LatestTargetPlatformVersion) + + + + + + + + + + + PreserveNewest + + + + + Application + true + HIP_clang + Unicode + + + Application + false + HIP_clang + true + Unicode + + + + + + + + + + + + + + + + + true + applications_$(ProjectName) + + + false + applications_$(ProjectName) + + + gfx1030;gfx1100;gfx1101;gfx1102 + + + gfx1030;gfx1100;gfx1101;gfx1102 + + + + Level2 + __clang__;__HIP__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + hiprand.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + + + Level2 + __CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + + + + + Level2 + true + true + __clang__;__HIP__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + hiprand.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + + + + Level2 + true + true + __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + stdcpp17 + $(MSBuildProjectDirectory)\..\..\Common;%(AdditionalIncludeDirectories) + true + + + Console + true + true + true + + + + + + + + \ No newline at end of file diff --git a/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.vcxproj.filters b/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.vcxproj.filters new file mode 100644 index 000000000..813477bbf --- /dev/null +++ b/Applications/monte_carlo_pi/monte_carlo_pi_vs2022.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {a75be987-98e7-45d0-a6e6-be0473e427ed} + cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx;hip;cu + + + {7d7c6bd7-8d68-4f7c-9bcc-7be684e5b358} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd;cuh + + + {e3d04bcf-f244-4aee-a5a8-1533b7ae3f86} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Applications/prefix_sum/prefix_sum_vs2017.sln b/Applications/prefix_sum/prefix_sum_vs2017.sln index def6981f7..660be4e85 100644 --- a/Applications/prefix_sum/prefix_sum_vs2017.sln +++ b/Applications/prefix_sum/prefix_sum_vs2017.sln @@ -2,7 +2,7 @@ # Visual Studio Version 15 VisualStudioVersion = 15.0.33026.149 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2017", "prefix_sum_vs2017.vcxproj", "{015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2017", "prefix_sum_vs2017.vcxproj", "{8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -10,15 +10,15 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.ActiveCfg = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.Build.0 = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.ActiveCfg = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.Build.0 = Release|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Debug|x64.ActiveCfg = Debug|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Debug|x64.Build.0 = Debug|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Release|x64.ActiveCfg = Release|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2D7976DA-0CA5-4D6A-ADFE-D99F79CC68C6} + SolutionGuid = {C516BB15-F9F2-4B0D-AFC3-A2E9806B9C05} EndGlobalSection EndGlobal diff --git a/Applications/prefix_sum/prefix_sum_vs2017.vcxproj b/Applications/prefix_sum/prefix_sum_vs2017.vcxproj index cdb607af3..48fc39c8a 100644 --- a/Applications/prefix_sum/prefix_sum_vs2017.vcxproj +++ b/Applications/prefix_sum/prefix_sum_vs2017.vcxproj @@ -13,7 +13,7 @@ 6.1 15.0 - {015df085-feb3-4c7a-acee-7cffb3c9aff0} + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6} Win32Proj prefix_sum_vs2017 $(LatestTargetPlatformVersion) diff --git a/Applications/prefix_sum/prefix_sum_vs2019.sln b/Applications/prefix_sum/prefix_sum_vs2019.sln index 46ae96070..d3abdaaf4 100644 --- a/Applications/prefix_sum/prefix_sum_vs2019.sln +++ b/Applications/prefix_sum/prefix_sum_vs2019.sln @@ -2,7 +2,7 @@ # Visual Studio Version 16 VisualStudioVersion = 16.0.33214.272 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2019", "prefix_sum_vs2019.vcxproj", "{015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2019", "prefix_sum_vs2019.vcxproj", "{5EB0F7EE-9024-4199-918B-3E79F12AFDE9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -10,15 +10,15 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.ActiveCfg = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.Build.0 = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.ActiveCfg = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.Build.0 = Release|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Debug|x64.ActiveCfg = Debug|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Debug|x64.Build.0 = Debug|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Release|x64.ActiveCfg = Release|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2D7976DA-0CA5-4D6A-ADFE-D99F79CC68C6} + SolutionGuid = {C42AE61A-F74C-4A8D-AD9E-8CD1109E991F} EndGlobalSection EndGlobal diff --git a/Applications/prefix_sum/prefix_sum_vs2019.vcxproj b/Applications/prefix_sum/prefix_sum_vs2019.vcxproj index 617cafcf3..2252b83ab 100644 --- a/Applications/prefix_sum/prefix_sum_vs2019.vcxproj +++ b/Applications/prefix_sum/prefix_sum_vs2019.vcxproj @@ -13,7 +13,7 @@ 6.1 16.0 - {015df085-feb3-4c7a-acee-7cffb3c9aff0} + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9} Win32Proj prefix_sum_vs2019 $(LatestTargetPlatformVersion) diff --git a/Applications/prefix_sum/prefix_sum_vs2022.sln b/Applications/prefix_sum/prefix_sum_vs2022.sln index c792acc5b..1102a5d6c 100644 --- a/Applications/prefix_sum/prefix_sum_vs2022.sln +++ b/Applications/prefix_sum/prefix_sum_vs2022.sln @@ -2,7 +2,7 @@ # Visual Studio Version 17 VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2022", "prefix_sum_vs2022.vcxproj", "{015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2022", "prefix_sum_vs2022.vcxproj", "{BE12D9BE-704A-4697-9D3D-5351A6E30189}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -10,10 +10,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.ActiveCfg = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.Build.0 = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.ActiveCfg = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.Build.0 = Release|x64 + {BE12D9BE-704A-4697-9D3D-5351A6E30189}.Debug|x64.ActiveCfg = Debug|x64 + {BE12D9BE-704A-4697-9D3D-5351A6E30189}.Debug|x64.Build.0 = Debug|x64 + {BE12D9BE-704A-4697-9D3D-5351A6E30189}.Release|x64.ActiveCfg = Release|x64 + {BE12D9BE-704A-4697-9D3D-5351A6E30189}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/HIP-Basic/CMakeLists.txt b/HIP-Basic/CMakeLists.txt index 7641af105..860c1102a 100644 --- a/HIP-Basic/CMakeLists.txt +++ b/HIP-Basic/CMakeLists.txt @@ -74,7 +74,7 @@ if(NOT "${GPU_RUNTIME}" STREQUAL "CUDA") add_subdirectory(module_api) endif() -if(WIN32 AND NOT "${GPU_RUNTIME}" STREQUAL "CUDA") +if(NOT WIN32) add_subdirectory(cooperative_groups) endif() diff --git a/HIP-Basic/module_api/CMakeLists.txt b/HIP-Basic/module_api/CMakeLists.txt index 1cfdfd639..35d9daffb 100644 --- a/HIP-Basic/module_api/CMakeLists.txt +++ b/HIP-Basic/module_api/CMakeLists.txt @@ -46,31 +46,30 @@ endif() list(APPEND CMAKE_PREFIX_PATH "${ROCM_ROOT}") -set(offload_archs ${CMAKE_HIP_ARCHITECTURES}) -list(TRANSFORM offload_archs PREPEND "--offload-arch=") +add_executable(${example_name} main.hip) -set(module ${CMAKE_CURRENT_BINARY_DIR}/module.co) -set(module_sources ${CMAKE_CURRENT_SOURCE_DIR}/module.hip) -if(CMAKE_BUILD_TYPE EQUAL "Debug") - set(module_flags ${CMAKE_HIP_FLAGS} ${CMAKE_HIP_FLAGS_DEBUG}) -elseif(CMAKE_BUILD_TYPE EQUAL "Release") - set(module_flags ${CMAKE_HIP_FLAGS} ${CMAKE_HIP_FLAGS_RELEASE}) -elseif(CMAKE_BUILD_TYPE EQUAL "MinSizeRel") - set(module_flags ${CMAKE_HIP_FLAGS} ${CMAKE_HIP_FLAGS_MINSIZEREL}) -elseif(CMAKE_BUILD_TYPE EQUAL "RelWithDebInfo") - set(module_flags ${CMAKE_HIP_FLAGS} ${CMAKE_HIP_FLAGS_RELWITHDEBINFO}) -endif() +# This is a mild hack. CMake (like most build systems) don't play well with targeting multiple +# architectures in the same build. This example builds an executable for the host system and a +# device code object for potentially multiple device architectures. Code objects need not and +# _should not_ be linked using the host linker. We're creating an OBJECT library, because in +# CMake terms, OBJECT libraries don't involve a linking step, but in reality, we'll also add +# the `--cuda-device-only` compile option, which changes the target triplet of the compiler +# from host to device code. +add_library(${example_name}_module OBJECT module.hip) -add_custom_command( - OUTPUT ${module} - COMMAND ${CMAKE_HIP_COMPILER} ${module_flags} ${module_sources} ${offload_archs} --cuda-device-only -o ${module} - DEPENDS ${module_sources} - COMMENT "Compiling HIP code object module.co" -) +# Ideally we'd need a non-existent CheckHIPCompilerFlag module before assuming this flag works. +target_compile_options(${example_name}_module PRIVATE --cuda-device-only) -add_custom_target(module ALL DEPENDS ${module}) +# Copy the code object next to the executable +add_custom_command( + TARGET ${example_name} + POST_BUILD + COMMAND "${CMAKE_COMMAND}" + ARGS -E copy $ $/module.co + COMMAND_EXPAND_LISTS + COMMENT "Copying HIP code object for ${example_name}") -add_executable(${example_name} main.hip) +add_dependencies(${example_name} ${example_name}_module) # Make example runnable using ctest add_test(${example_name} ${example_name}) diff --git a/HIP-Basic/module_api/module_api_vs2017.vcxproj b/HIP-Basic/module_api/module_api_vs2017.vcxproj index a5e731115..af96e3af0 100644 --- a/HIP-Basic/module_api/module_api_vs2017.vcxproj +++ b/HIP-Basic/module_api/module_api_vs2017.vcxproj @@ -18,14 +18,24 @@ module_api_vs2017 $(LatestTargetPlatformVersion) + + + true + false + $(IntermediateOutputPath)$(PlatformToolset)\ + $(Configuration)\$(PlatformToolset)\ + $(SolutionDir)$(Configuration)\$(PlatformToolset)\ + $(IntDir)$(PlatformToolset)\ + WindowsLocalDebugger + Document - "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -o "$(OutDir)module.co" %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 + "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -std=c++17 -o $(OutDir)module.co %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 Compiling HIP Code Object module.co $(OutDir)module.co - "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -o "$(OutDir)module.co" %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 + "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -std=c++17 -o $(OutDir)module.co %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 Compiling HIP Code Object module.co $(OutDir)module.co $(BinDir)module.co diff --git a/HIP-Basic/module_api/module_api_vs2019.vcxproj b/HIP-Basic/module_api/module_api_vs2019.vcxproj index c3ab66acf..fbe413e37 100644 --- a/HIP-Basic/module_api/module_api_vs2019.vcxproj +++ b/HIP-Basic/module_api/module_api_vs2019.vcxproj @@ -18,14 +18,24 @@ module_api_vs2019 $(LatestTargetPlatformVersion) + + + true + false + $(IntermediateOutputPath)$(PlatformToolset)\ + $(Configuration)\$(PlatformToolset)\ + $(SolutionDir)$(Configuration)\$(PlatformToolset)\ + $(IntDir)$(PlatformToolset)\ + WindowsLocalDebugger + Document - "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -o "$(OutDir)module.co" %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 + "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -std=c++17 -o $(OutDir)module.co %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 Compiling HIP Code Object module.co $(OutDir)module.co - "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -o "$(OutDir)module.co" %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 + "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -std=c++17 -o $(OutDir)module.co %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 Compiling HIP Code Object module.co $(OutDir)module.co $(BinDir)module.co diff --git a/HIP-Basic/module_api/module_api_vs2022.vcxproj b/HIP-Basic/module_api/module_api_vs2022.vcxproj index 857411937..1cf80dc13 100644 --- a/HIP-Basic/module_api/module_api_vs2022.vcxproj +++ b/HIP-Basic/module_api/module_api_vs2022.vcxproj @@ -18,14 +18,24 @@ module_api_vs2022 $(LatestTargetPlatformVersion) + + + true + false + $(IntermediateOutputPath)$(PlatformToolset)\ + $(Configuration)\$(PlatformToolset)\ + $(SolutionDir)$(Configuration)\$(PlatformToolset)\ + $(IntDir)$(PlatformToolset)\ + WindowsLocalDebugger + Document - "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -o "$(OutDir)module.co" %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 + "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -std=c++17 -o $(OutDir)module.co %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 Compiling HIP Code Object module.co $(OutDir)module.co - "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -o "$(OutDir)module.co" %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 + "$(ClangToolPath)$(ClangToolExe)" --cuda-device-only -std=c++17 -o $(OutDir)module.co %(Identity) --offload-arch=gfx1030 --offload-arch=gfx1100 --offload-arch=gfx1101 --offload-arch=gfx1102 Compiling HIP Code Object module.co $(OutDir)module.co $(BinDir)module.co diff --git a/HIP-Basic/opengl_interop/opengl_interop_vs2017.vcxproj b/HIP-Basic/opengl_interop/opengl_interop_vs2017.vcxproj index ca254e001..9967a69d1 100644 --- a/HIP-Basic/opengl_interop/opengl_interop_vs2017.vcxproj +++ b/HIP-Basic/opengl_interop/opengl_interop_vs2017.vcxproj @@ -107,8 +107,6 @@ __clang__;__HIP__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(MSBuildProjectDirectory)\..\..\External;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -126,8 +124,6 @@ __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(MSBuildProjectDirectory)\..\..\External;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console diff --git a/HIP-Basic/opengl_interop/opengl_interop_vs2019.vcxproj b/HIP-Basic/opengl_interop/opengl_interop_vs2019.vcxproj index 882dbdc63..88afdfb75 100644 --- a/HIP-Basic/opengl_interop/opengl_interop_vs2019.vcxproj +++ b/HIP-Basic/opengl_interop/opengl_interop_vs2019.vcxproj @@ -92,8 +92,6 @@ __CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(MSBuildProjectDirectory)\..\..\External;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -126,8 +124,6 @@ __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(MSBuildProjectDirectory)\..\..\External;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console diff --git a/HIP-Basic/opengl_interop/opengl_interop_vs2022.vcxproj b/HIP-Basic/opengl_interop/opengl_interop_vs2022.vcxproj index 9c61f21a0..395de9c48 100644 --- a/HIP-Basic/opengl_interop/opengl_interop_vs2022.vcxproj +++ b/HIP-Basic/opengl_interop/opengl_interop_vs2022.vcxproj @@ -92,8 +92,6 @@ __CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(MSBuildProjectDirectory)\..\..\External;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -126,8 +124,6 @@ __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(MSBuildProjectDirectory)\..\..\External;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console diff --git a/HIP-Basic/vulkan_interop/vulkan_interop_vs2017.vcxproj b/HIP-Basic/vulkan_interop/vulkan_interop_vs2017.vcxproj index 62382afc5..6916c0255 100644 --- a/HIP-Basic/vulkan_interop/vulkan_interop_vs2017.vcxproj +++ b/HIP-Basic/vulkan_interop/vulkan_interop_vs2017.vcxproj @@ -118,8 +118,6 @@ __CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -152,8 +150,6 @@ __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -169,4 +165,4 @@ - + \ No newline at end of file diff --git a/HIP-Basic/vulkan_interop/vulkan_interop_vs2019.vcxproj b/HIP-Basic/vulkan_interop/vulkan_interop_vs2019.vcxproj index bc8a9e2a7..770df6493 100644 --- a/HIP-Basic/vulkan_interop/vulkan_interop_vs2019.vcxproj +++ b/HIP-Basic/vulkan_interop/vulkan_interop_vs2019.vcxproj @@ -120,8 +120,6 @@ __CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -154,8 +152,6 @@ __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -171,4 +167,4 @@ - + \ No newline at end of file diff --git a/HIP-Basic/vulkan_interop/vulkan_interop_vs2022.vcxproj b/HIP-Basic/vulkan_interop/vulkan_interop_vs2022.vcxproj index d004c9e21..b3adf2224 100644 --- a/HIP-Basic/vulkan_interop/vulkan_interop_vs2022.vcxproj +++ b/HIP-Basic/vulkan_interop/vulkan_interop_vs2022.vcxproj @@ -120,8 +120,6 @@ __CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -154,8 +152,6 @@ __CUDACC__;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(IntDir);$(GLFW_DIR)\include\;$(MSBuildProjectDirectory)\..\..\Common;$(VULKAN_SDK)\Include;%(AdditionalIncludeDirectories) stdcpp17 - - --diag-suppress 108 --diag-suppress 174 --diag-suppress 1835 Console @@ -171,4 +167,4 @@ - + \ No newline at end of file diff --git a/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2017.vcxproj b/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2017.vcxproj index 347051809..650118002 100644 --- a/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2017.vcxproj +++ b/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2017.vcxproj @@ -80,7 +80,6 @@ $(MSBuildProjectDirectory)\..\..\..\Common;%(AdditionalIncludeDirectories) stdcpp17 true - -Wno-#warnings Console @@ -96,7 +95,6 @@ $(MSBuildProjectDirectory)\..\..\..\Common;%(AdditionalIncludeDirectories) stdcpp17 true - -Wno-#warnings Console diff --git a/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2019.vcxproj b/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2019.vcxproj index 46d39b713..3c96346d1 100644 --- a/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2019.vcxproj +++ b/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2019.vcxproj @@ -80,7 +80,6 @@ $(MSBuildProjectDirectory)\..\..\..\Common;%(AdditionalIncludeDirectories) stdcpp17 true - -Wno-#warnings Console @@ -96,7 +95,6 @@ $(MSBuildProjectDirectory)\..\..\..\Common;%(AdditionalIncludeDirectories) stdcpp17 true - -Wno-#warnings Console diff --git a/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2022.vcxproj b/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2022.vcxproj index 6e15b9a9e..a6af92406 100644 --- a/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2022.vcxproj +++ b/Libraries/rocRAND/simple_distributions_cpp/simple_distributions_cpp_vs2022.vcxproj @@ -80,7 +80,6 @@ $(MSBuildProjectDirectory)\..\..\..\Common;%(AdditionalIncludeDirectories) stdcpp17 true - -Wno-#warnings Console @@ -96,7 +95,6 @@ $(MSBuildProjectDirectory)\..\..\..\Common;%(AdditionalIncludeDirectories) stdcpp17 true - -Wno-#warnings Console diff --git a/ROCm-Examples-Portable-VS2017.sln b/ROCm-Examples-Portable-VS2017.sln index 4256097cb..bb58e695f 100644 --- a/ROCm-Examples-Portable-VS2017.sln +++ b/ROCm-Examples-Portable-VS2017.sln @@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello_world_vs2017", "HIP-B EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "histogram_vs2017", "Applications\histogram\histogram_vs2017.vcxproj", "{D3531843-4D0D-445D-BD8D-2352038D8221}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2017", "Applications\prefix_sum\prefix_sum_vs2017.vcxproj", "{015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2017", "Applications\prefix_sum\prefix_sum_vs2017.vcxproj", "{8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convolution_vs2017", "Applications\convolution\convolution_vs2017.vcxproj", "{4232B140-4C47-4961-8A8A-F67D14DC9349}" EndProject @@ -166,10 +166,10 @@ Global {D3531843-4D0D-445D-BD8D-2352038D8221}.Debug|x64.Build.0 = Debug|x64 {D3531843-4D0D-445D-BD8D-2352038D8221}.Release|x64.ActiveCfg = Release|x64 {D3531843-4D0D-445D-BD8D-2352038D8221}.Release|x64.Build.0 = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.ActiveCfg = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.Build.0 = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.ActiveCfg = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.Build.0 = Release|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Debug|x64.ActiveCfg = Debug|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Debug|x64.Build.0 = Debug|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Release|x64.ActiveCfg = Release|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Release|x64.Build.0 = Release|x64 {4232B140-4C47-4961-8A8A-F67D14DC9349}.Debug|x64.ActiveCfg = Debug|x64 {4232B140-4C47-4961-8A8A-F67D14DC9349}.Debug|x64.Build.0 = Debug|x64 {4232B140-4C47-4961-8A8A-F67D14DC9349}.Release|x64.ActiveCfg = Release|x64 @@ -208,7 +208,7 @@ Global {AA9E497A-FEDE-45A4-A6CE-A8E3DDDDEB82} = {8DF2222B-5CDB-44DE-AC5D-D24C6C0B0B49} {BD725C86-E381-4BDD-B3FC-06A42221BEBB} = {8DF2222B-5CDB-44DE-AC5D-D24C6C0B0B49} {D3531843-4D0D-445D-BD8D-2352038D8221} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} {4232B140-4C47-4961-8A8A-F67D14DC9349} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} {265F7154-A362-45FA-B300-DB74E14BA010} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} EndGlobalSection diff --git a/ROCm-Examples-Portable-VS2019.sln b/ROCm-Examples-Portable-VS2019.sln index fc4965604..900621d33 100644 --- a/ROCm-Examples-Portable-VS2019.sln +++ b/ROCm-Examples-Portable-VS2019.sln @@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texture_management_vs2019", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "histogram_vs2019", "Applications\histogram\histogram_vs2019.vcxproj", "{D3531843-4D0D-445D-BD8D-2352038D8221}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2019", "Applications\prefix_sum\prefix_sum_vs2019.vcxproj", "{015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2019", "Applications\prefix_sum\prefix_sum_vs2019.vcxproj", "{5EB0F7EE-9024-4199-918B-3E79F12AFDE9}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convolution_vs2019", "Applications\convolution\convolution_vs2019.vcxproj", "{A557F6A4-C0FD-4D65-B1BD-A201FABAEF7F}" EndProject @@ -166,10 +166,10 @@ Global {D3531843-4D0D-445D-BD8D-2352038D8221}.Debug|x64.Build.0 = Debug|x64 {D3531843-4D0D-445D-BD8D-2352038D8221}.Release|x64.ActiveCfg = Release|x64 {D3531843-4D0D-445D-BD8D-2352038D8221}.Release|x64.Build.0 = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.ActiveCfg = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.Build.0 = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.ActiveCfg = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.Build.0 = Release|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Debug|x64.ActiveCfg = Debug|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Debug|x64.Build.0 = Debug|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Release|x64.ActiveCfg = Release|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Release|x64.Build.0 = Release|x64 {A557F6A4-C0FD-4D65-B1BD-A201FABAEF7F}.Debug|x64.ActiveCfg = Debug|x64 {A557F6A4-C0FD-4D65-B1BD-A201FABAEF7F}.Debug|x64.Build.0 = Debug|x64 {A557F6A4-C0FD-4D65-B1BD-A201FABAEF7F}.Release|x64.ActiveCfg = Release|x64 @@ -208,7 +208,7 @@ Global {5E0E9AB0-B708-481F-9226-DD92C3798341} = {6EB7144D-2707-489E-A043-D59B7BE006D1} {40E56BFB-1A0C-4618-BB49-A9AA635127C1} = {6EB7144D-2707-489E-A043-D59B7BE006D1} {D3531843-4D0D-445D-BD8D-2352038D8221} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} {A557F6A4-C0FD-4D65-B1BD-A201FABAEF7F} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} {265F7154-A362-45FA-B300-DB74E14BA010} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} EndGlobalSection diff --git a/ROCm-Examples-VS2017.sln b/ROCm-Examples-VS2017.sln index afa8766db..b4e253f31 100644 --- a/ROCm-Examples-VS2017.sln +++ b/ROCm-Examples-VS2017.sln @@ -148,7 +148,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syevj_vs2017", "Libraries\h EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sygvj_vs2017", "Libraries\hipSOLVER\sygvj\sygvj_vs2017.vcxproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2017", "Applications\prefix_sum\prefix_sum_vs2017.vcxproj", "{015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2017", "Applications\prefix_sum\prefix_sum_vs2017.vcxproj", "{8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getf2_vs2017", "Libraries\rocSOLVER\getf2\getf2_vs2017.vcxproj", "{D1C40C14-2881-43C7-8DAD-72BAAB169333}" EndProject @@ -228,6 +228,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spmv_vs2017", "Libraries\ro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spmm_vs2017", "Libraries\rocSPARSE\level_3\spmm\spmm_vs2017.vcxproj", "{DA4B2E3F-E114-49B2-91F6-02061F6AEF1A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monte_carlo_pi_vs2017", "Applications\monte_carlo_pi\monte_carlo_pi_vs2017.vcxproj", "{2ACD5660-DAA6-490B-8C5D-F0B178A80D16}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -470,10 +472,10 @@ Global {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943}.Debug|x64.Build.0 = Debug|x64 {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943}.Release|x64.ActiveCfg = Release|x64 {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943}.Release|x64.Build.0 = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.ActiveCfg = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.Build.0 = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.ActiveCfg = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.Build.0 = Release|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Debug|x64.ActiveCfg = Debug|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Debug|x64.Build.0 = Debug|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Release|x64.ActiveCfg = Release|x64 + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6}.Release|x64.Build.0 = Release|x64 {D1C40C14-2881-43C7-8DAD-72BAAB169333}.Debug|x64.ActiveCfg = Debug|x64 {D1C40C14-2881-43C7-8DAD-72BAAB169333}.Debug|x64.Build.0 = Debug|x64 {D1C40C14-2881-43C7-8DAD-72BAAB169333}.Release|x64.ActiveCfg = Release|x64 @@ -614,6 +616,10 @@ Global {DA4B2E3F-E114-49B2-91F6-02061F6AEF1A}.Debug|x64.Build.0 = Debug|x64 {DA4B2E3F-E114-49B2-91F6-02061F6AEF1A}.Release|x64.ActiveCfg = Release|x64 {DA4B2E3F-E114-49B2-91F6-02061F6AEF1A}.Release|x64.Build.0 = Release|x64 + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16}.Debug|x64.ActiveCfg = Debug|x64 + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16}.Debug|x64.Build.0 = Debug|x64 + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16}.Release|x64.ActiveCfg = Release|x64 + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -689,7 +695,7 @@ Global {88F5329E-8AEB-4CA0-BA95-59BA4DE42477} = {2700C908-113C-4429-A889-DF34D44AB29B} {7139C801-489D-464A-82DC-3ABDB706C7A2} = {2700C908-113C-4429-A889-DF34D44AB29B} {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943} = {2700C908-113C-4429-A889-DF34D44AB29B} - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} + {8A7A18FB-BA38-4C9C-8DB1-193C1052E1A6} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} {D1C40C14-2881-43C7-8DAD-72BAAB169333} = {2CD1AF85-3AEE-4002-AF14-69D50BA39DA7} {D1C40C14-2881-43C7-8DAD-72BAAB169323} = {2700C908-113C-4429-A889-DF34D44AB29B} {D3531843-4D0D-445D-BD8D-2352038D8221} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} @@ -729,6 +735,7 @@ Global {4CA37D63-1707-4F65-9F91-C49224962498} = {79082CA5-3D7F-41AC-862B-E16EE6EB25A0} {7830AAFE-B001-40B5-BBF4-99EE8AAC519A} = {4581A6EF-211D-4B00-A65E-C29F55CEE886} {DA4B2E3F-E114-49B2-91F6-02061F6AEF1A} = {79082CA5-3D7F-41AC-862B-E16EE6EB25A0} + {2ACD5660-DAA6-490B-8C5D-F0B178A80D16} = {0328C27A-BB25-46F6-89F7-4EEF7AC225D8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5C96FD63-6F26-4E6F-B6D0-7FB9E1833081} diff --git a/ROCm-Examples-VS2019.sln b/ROCm-Examples-VS2019.sln index bc4e384c3..21d7f9f43 100644 --- a/ROCm-Examples-VS2019.sln +++ b/ROCm-Examples-VS2019.sln @@ -148,7 +148,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "syevj_vs2019", "Libraries\h EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sygvj_vs2019", "Libraries\hipSOLVER\sygvj\sygvj_vs2019.vcxproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2019", "Applications\prefix_sum\prefix_sum_vs2019.vcxproj", "{015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prefix_sum_vs2019", "Applications\prefix_sum\prefix_sum_vs2019.vcxproj", "{5EB0F7EE-9024-4199-918B-3E79F12AFDE9}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getf2_vs2019", "Libraries\rocSOLVER\getf2\getf2_vs2019.vcxproj", "{D1C40C14-2881-43C7-8DAD-72BAAB169334}" EndProject @@ -228,6 +228,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spmv_vs2019", "Libraries\ro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spmm_vs2019", "Libraries\rocSPARSE\level_3\spmm\spmm_vs2019.vcxproj", "{EC8FA476-A120-469B-BB48-DA4E0B3E50AD}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monte_carlo_pi_vs2019", "Applications\monte_carlo_pi\monte_carlo_pi_vs2019.vcxproj", "{6E278B7D-E928-4151-8613-08E91FC6D4D5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -470,10 +472,10 @@ Global {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943}.Debug|x64.Build.0 = Debug|x64 {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943}.Release|x64.ActiveCfg = Release|x64 {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943}.Release|x64.Build.0 = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.ActiveCfg = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Debug|x64.Build.0 = Debug|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.ActiveCfg = Release|x64 - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0}.Release|x64.Build.0 = Release|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Debug|x64.ActiveCfg = Debug|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Debug|x64.Build.0 = Debug|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Release|x64.ActiveCfg = Release|x64 + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9}.Release|x64.Build.0 = Release|x64 {D1C40C14-2881-43C7-8DAD-72BAAB169334}.Debug|x64.ActiveCfg = Debug|x64 {D1C40C14-2881-43C7-8DAD-72BAAB169334}.Debug|x64.Build.0 = Debug|x64 {D1C40C14-2881-43C7-8DAD-72BAAB169334}.Release|x64.ActiveCfg = Release|x64 @@ -614,9 +616,14 @@ Global {EC8FA476-A120-469B-BB48-DA4E0B3E50AD}.Debug|x64.Build.0 = Debug|x64 {EC8FA476-A120-469B-BB48-DA4E0B3E50AD}.Release|x64.ActiveCfg = Release|x64 {EC8FA476-A120-469B-BB48-DA4E0B3E50AD}.Release|x64.Build.0 = Release|x64 + {6E278B7D-E928-4151-8613-08E91FC6D4D5}.Debug|x64.ActiveCfg = Debug|x64 + {6E278B7D-E928-4151-8613-08E91FC6D4D5}.Debug|x64.Build.0 = Debug|x64 + {6E278B7D-E928-4151-8613-08E91FC6D4D5}.Release|x64.ActiveCfg = Release|x64 + {6E278B7D-E928-4151-8613-08E91FC6D4D5}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE + EndGlobalSection GlobalSection(NestedProjects) = preSolution {FB6B7014-2BC9-475C-B3CC-FEE6B4C5B103} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} {481D0AFC-64BC-436C-9FF5-7C07F9F8E4BD} = {052412EF-7CEB-4E32-96F9-AADBC70945D7} @@ -688,7 +695,7 @@ Global {1209C293-D1F0-4BFC-B6D0-65A96B801135} = {2700C908-113C-4429-A889-DF34D44AB29B} {7139C801-489D-464A-82DC-3ABDB706C7A2} = {2700C908-113C-4429-A889-DF34D44AB29B} {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC943} = {2700C908-113C-4429-A889-DF34D44AB29B} - {015DF085-FEB3-4C7A-ACEE-7CFFB3C9AFF0} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} + {5EB0F7EE-9024-4199-918B-3E79F12AFDE9} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} {D1C40C14-2881-43C7-8DAD-72BAAB169334} = {B03B9E85-3FED-4902-9B24-433CF352AB6C} {D1C40C14-2881-43C7-8DAD-72BAAB169324} = {2700C908-113C-4429-A889-DF34D44AB29B} {D3531843-4D0D-445D-BD8D-2352038D8221} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} @@ -728,6 +735,7 @@ Global {9F58AD34-6173-4DD8-B224-839416D24C52} = {06DEE87C-F773-49A8-A856-8CB55BDFED6D} {0F437FDF-5F2B-4028-A816-FC1A2ACA51B1} = {F0B0FD83-2B22-47F8-92B1-7A5ED88B8B5E} {EC8FA476-A120-469B-BB48-DA4E0B3E50AD} = {06DEE87C-F773-49A8-A856-8CB55BDFED6D} + {6E278B7D-E928-4151-8613-08E91FC6D4D5} = {9254BAD9-FDFC-4645-B2C8-EEB42F1F069D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {90580497-38BF-428E-A951-6EC6CFC68193} diff --git a/ROCm-Examples-VS2022.sln b/ROCm-Examples-VS2022.sln index 8c014ef38..bb61a7a1a 100644 --- a/ROCm-Examples-VS2022.sln +++ b/ROCm-Examples-VS2022.sln @@ -228,6 +228,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spmv_vs2022", "Libraries\ro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spmm_vs2022", "Libraries\rocSPARSE\level_3\spmm\spmm_vs2022.vcxproj", "{A6919683-9E28-400A-8910-1BB207B29C4D}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monte_carlo_pi_vs2022", "Applications\monte_carlo_pi\monte_carlo_pi_vs2022.vcxproj", "{107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -614,9 +616,14 @@ Global {A6919683-9E28-400A-8910-1BB207B29C4D}.Debug|x64.Build.0 = Debug|x64 {A6919683-9E28-400A-8910-1BB207B29C4D}.Release|x64.ActiveCfg = Release|x64 {A6919683-9E28-400A-8910-1BB207B29C4D}.Release|x64.Build.0 = Release|x64 + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}.Debug|x64.ActiveCfg = Debug|x64 + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}.Debug|x64.Build.0 = Debug|x64 + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}.Release|x64.ActiveCfg = Release|x64 + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE + EndGlobalSection GlobalSection(NestedProjects) = preSolution {14411C7B-06E9-4630-93FE-DA652062EC61} = {7676633F-925E-4AEF-9F60-7A715A1EFBFE} {A6E59BE9-114B-4E93-A9D9-F57CBD6075EC} = {7676633F-925E-4AEF-9F60-7A715A1EFBFE} @@ -727,6 +734,7 @@ Global {E127E8D9-AD96-43BC-BCBB-2D3FB733D36A} = {7EDDB5A2-7601-435F-AEDB-30EBC68D19C9} {D32D396C-4B52-4AAC-AC5A-21CC99207E32} = {F91F4254-0ADD-4955-BDFE-53CB4EDBF601} {A6919683-9E28-400A-8910-1BB207B29C4D} = {7EDDB5A2-7601-435F-AEDB-30EBC68D19C9} + {107AC26F-A20D-4B25-81DE-AFCDCDECBFFC} = {C735FFA9-12E1-4BEF-87B2-8891A3006505} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D648FD37-D8CB-4EA5-8445-38BEF36F6736}