MIVisionX Windows Build (#25)

* Windows SLN for OpenVX * Loom SLN for windows * OpenCV Extension Cleanup & SLN
ROCm · Jan 20, 2019 · ddd7cbb · ddd7cbb
1 parent 01653e4
commit ddd7cbb
Show file tree

Hide file tree

Showing 79 changed files with 652 additions and 524 deletions.
diff --git a/amd_openvx/amd_openvx.sln b/amd_openvx/amd_openvx.sln
@@ -1,16 +1,15 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.271
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvx", "openvx\openvx.vcxproj", "{973F2004-2215-431F-8A2C-93ABAAFB6A24}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runvx", "runvx\runvx.vcxproj", "{E14F83E9-2295-466C-9647-7BD0D03ECE4B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runvx", "..\utilities\runvx\runvx.vcxproj", "{E14F83E9-2295-466C-9647-7BD0D03ECE4B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{973F2004-2215-431F-8A2C-93ABAAFB6A24} = {973F2004-2215-431F-8A2C-93ABAAFB6A24}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runcl", "runcl\runcl.vcxproj", "{026F975C-4F8D-4908-8A55-A5B3B643AD59}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runcl", "..\utilities\runcl\runcl.vcxproj", "{026F975C-4F8D-4908-8A55-A5B3B643AD59}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,10 +27,13 @@ Global
 		{E14F83E9-2295-466C-9647-7BD0D03ECE4B}.Release|x64.Build.0 = Release|x64
 		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Debug|x64.ActiveCfg = Debug|x64
 		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Debug|x64.Build.0 = Debug|x64
-		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Release|x64.ActiveCfg = Release|x64
-		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Release|x64.Build.0 = Release|x64
+		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Release|x64.ActiveCfg = Debug|x64
+		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Release|x64.Build.0 = Debug|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {327486F9-B6A1-44B5-B080-399A3666E61B}
+	EndGlobalSection
 EndGlobal
diff --git a/amd_openvx/openvx/ago/ago_kernel_api.cpp b/amd_openvx/openvx/ago/ago_kernel_api.cpp
@@ -19013,11 +19013,11 @@ int agoKernel_Copy_DATA_DATA(AgoNode * node, AgoKernelCommand cmd)
 		size_t num_work_items = node->paramList[0]->size / 4;
 		char code[1024];
 		sprintf(code,
-			"__kernel __attribute__((reqd_work_group_size(%ld, 1, 1)))\n"
+			"__kernel __attribute__((reqd_work_group_size(%zd, 1, 1)))\n"
 			"void %s(__global char * dst_buf, uint dst_offset, uint4 dst_stride, __global char * src_buf, uint src_offset, uint4 src_stride)\n"
 			"{\n"
 			"    uint id = get_global_id(0);\n"
-			"    if(id < %ld) ((__global float *)(dst_buf + dst_offset))[id] =  ((__global float *)(src_buf + src_offset))[id];\n"
+			"    if(id < %zd) ((__global float *)(dst_buf + dst_offset))[id] =  ((__global float *)(src_buf + src_offset))[id];\n"
 			"}\n", work_group_size, NODE_OPENCL_KERNEL_NAME, num_work_items);
 		node->opencl_code = code;
 		// use completely separate kernel

diff --git a/amd_openvx/openvx/openvx.vcxproj b/amd_openvx/openvx/openvx.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -57,14 +57,14 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>ENABLE_OPENCL=1;VX_API_ENTRY=__declspec(dllexport);_DEBUG;_WINDOWS;_USRDLL;AGODLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>include;$(AMDAPPSDKROOT)\include;ago;api</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalIncludeDirectories>include;$(OCL_ROOT)\include;ago;api</AdditionalIncludeDirectories>
+      <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>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)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(AMDAPPSDKROOT)lib\x86_64</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OCL_ROOT)\lib\x86_64</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -77,16 +77,16 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>ENABLE_OPENCL=1;VX_API_ENTRY=__declspec(dllexport);NDEBUG;_WINDOWS;_USRDLL;AGODLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>include;$(AMDAPPSDKROOT)\include;ago;api</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
+      <AdditionalIncludeDirectories>include;$(OCL_ROOT)\include;ago;api</AdditionalIncludeDirectories>
+      <TreatWarningAsError>false</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>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)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(AMDAPPSDKROOT)lib\x86_64</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OCL_ROOT)\lib\x86_64</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/amd_openvx_extensions/amd_loomsl.sln b/amd_openvx_extensions/amd_loomsl.sln
@@ -1,26 +1,25 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.271
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vx_loomsl", "vx_loomsl\vx_loomsl.vcxproj", "{C5F3ED68-728A-4610-A37F-89323A93DD82}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vx_loomsl", "amd_loomsl\vx_loomsl.vcxproj", "{C5F3ED68-728A-4610-A37F-89323A93DD82}"
 	ProjectSection(ProjectDependencies) = postProject
 		{973F2004-2215-431F-8A2C-93ABAAFB6A24} = {973F2004-2215-431F-8A2C-93ABAAFB6A24}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loom_shell", "utils\loom_shell\loom_shell.vcxproj", "{7BB60B2E-EDC4-496B-B258-0735FF02F32E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loom_shell", "..\utilities\loom_shell\loom_shell.vcxproj", "{7BB60B2E-EDC4-496B-B258-0735FF02F32E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C5F3ED68-728A-4610-A37F-89323A93DD82} = {C5F3ED68-728A-4610-A37F-89323A93DD82}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvx", "deps\amdovx-core\openvx\openvx.vcxproj", "{973F2004-2215-431F-8A2C-93ABAAFB6A24}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvx", "..\amd_openvx\openvx\openvx.vcxproj", "{973F2004-2215-431F-8A2C-93ABAAFB6A24}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runvx", "deps\amdovx-core\runvx\runvx.vcxproj", "{E14F83E9-2295-466C-9647-7BD0D03ECE4B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runvx", "..\utilities\runvx\runvx.vcxproj", "{E14F83E9-2295-466C-9647-7BD0D03ECE4B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{973F2004-2215-431F-8A2C-93ABAAFB6A24} = {973F2004-2215-431F-8A2C-93ABAAFB6A24}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runcl", "deps\amdovx-core\runcl\runcl.vcxproj", "{026F975C-4F8D-4908-8A55-A5B3B643AD59}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runcl", "..\utilities\runcl\runcl.vcxproj", "{026F975C-4F8D-4908-8A55-A5B3B643AD59}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -46,10 +45,13 @@ Global
 		{E14F83E9-2295-466C-9647-7BD0D03ECE4B}.Release|x64.Build.0 = Release|x64
 		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Debug|x64.ActiveCfg = Debug|x64
 		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Debug|x64.Build.0 = Debug|x64
-		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Release|x64.ActiveCfg = Release|x64
-		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Release|x64.Build.0 = Release|x64
+		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Release|x64.ActiveCfg = Debug|x64
+		{026F975C-4F8D-4908-8A55-A5B3B643AD59}.Release|x64.Build.0 = Debug|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4AE0943C-DD0A-49DE-92D5-F537F4F1B84F}
+	EndGlobalSection
 EndGlobal
diff --git a/amd_openvx_extensions/amd_loomsl/vx_loomsl.vcxproj b/amd_openvx_extensions/amd_loomsl/vx_loomsl.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -18,13 +18,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -44,14 +44,14 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.;kernels;..\deps\amdovx-core\openvx\include;$(AMDAPPSDKROOT)\include;$(OpenCV_DIR)\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;kernels;..\..\amd_openvx\openvx\include;$(OCL_ROOT)\include;$(OpenCV_DIR)\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(TargetDir);..\deps\amdovx-core\x64\Debug;..\deps\amdovx-core\x64\Debug;$(AMDAPPSDKROOT)lib\x86_64</AdditionalLibraryDirectories>
-      <AdditionalDependencies>openvx.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>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <AdditionalLibraryDirectories>$(TargetDir);..\amd_openvx\x64\Debug;..\amd_openvx\openvx\x64\Debug;$(OCL_ROOT)\lib\x86_64</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opencl.lib;openvx.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>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -61,15 +61,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.;kernels;..\deps\amdovx-core\openvx\include;$(AMDAPPSDKROOT)\include;$(OpenCV_DIR)\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;kernels;..\..\amd_openvx\openvx\include;$(OCL_ROOT)\include;$(OpenCV_DIR)\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(TargetDir);..\deps\amdovx-core\x64\Release;..\deps\amdovx-core\x64\Release;$(AMDAPPSDKROOT)lib\x86_64</AdditionalLibraryDirectories>
-      <AdditionalDependencies>openvx.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>
+      <AdditionalLibraryDirectories>$(TargetDir);..\amd_openvx\x64\Release;..\amd_openvx\openvx\x64\Release;$(OCL_ROOT)\lib\x86_64</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opencl.lib;openvx.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>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -112,4 +112,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/amd_openvx_extensions/amd_opencv.sln b/amd_openvx_extensions/amd_opencv.sln
@@ -0,0 +1,33 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.271
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vx_opencv", "amd_opencv\vx_opencv.vcxproj", "{24F44D6B-92FD-3080-AF31-693411708E82}"
+	ProjectSection(ProjectDependencies) = postProject
+		{973F2004-2215-431F-8A2C-93ABAAFB6A24} = {973F2004-2215-431F-8A2C-93ABAAFB6A24}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvx", "..\amd_openvx\openvx\openvx.vcxproj", "{973F2004-2215-431F-8A2C-93ABAAFB6A24}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{24F44D6B-92FD-3080-AF31-693411708E82}.Debug|x64.ActiveCfg = Debug|x64
+		{24F44D6B-92FD-3080-AF31-693411708E82}.Debug|x64.Build.0 = Debug|x64
+		{24F44D6B-92FD-3080-AF31-693411708E82}.Release|x64.ActiveCfg = Release|x64
+		{24F44D6B-92FD-3080-AF31-693411708E82}.Release|x64.Build.0 = Release|x64
+		{973F2004-2215-431F-8A2C-93ABAAFB6A24}.Debug|x64.ActiveCfg = Debug|x64
+		{973F2004-2215-431F-8A2C-93ABAAFB6A24}.Debug|x64.Build.0 = Debug|x64
+		{973F2004-2215-431F-8A2C-93ABAAFB6A24}.Release|x64.ActiveCfg = Release|x64
+		{973F2004-2215-431F-8A2C-93ABAAFB6A24}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3FB58533-A51A-34B5-ACE3-6B1BFD797DB1}
+	EndGlobalSection
+EndGlobal