Merge pull request #39 from kitstar/master

Port the Minverva to Windows Platform
dmlc · Jun 30, 2015 · f0b4631 · f0b4631
2 parents 4177ebd + d96ac6e
commit f0b4631
Show file tree

Hide file tree

Showing 24 changed files with 1,344 additions and 7 deletions.
diff --git a/VS_BUILD/Minerva/CudaPerform/CudaPerform.vcxproj b/VS_BUILD/Minerva/CudaPerform/CudaPerform.vcxproj
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1EB536F7-C754-4111-B48D-61813D4CC0AD}</ProjectGuid>
+    <RootNamespace>CudaPerform</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 7.0.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\Minerva;$(SolutionDir)\..\..\..\Include</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\Minerva;$(SolutionDir)\..\..\third_party\Include</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>cudart.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)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
+copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>cudart.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)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
+copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
+    </PostBuildEvent>
+    <CudaCompile>
+      <TargetMachinePlatform>64</TargetMachinePlatform>
+      <Include>$(SolutionDir)\..\..\Minerva;$(SolutionDir)\..\..\..\Include</Include>
+      <Defines>HAS_CUDA</Defines>
+    </CudaCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>cudart.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)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
+copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>cudart.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)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
+copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
+    </PostBuildEvent>
+    <CudaCompile>
+      <TargetMachinePlatform>64</TargetMachinePlatform>
+      <Defines>HAS_CUDA</Defines>
+    </CudaCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CudaCompile Include="..\..\..\minerva\op\impl\cuda\cuda_perform.cu" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\minerva\op\impl\cuda\cuda_kernel.h" />
+    <ClInclude Include="..\..\..\minerva\op\impl\cuda\cuda_perform.h" />
+    <ClInclude Include="..\..\..\minerva\op\impl\cuda\cuda_perform_system_include.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Minerva.vcxproj">
+      <Project>{c1f9972b-32d4-4788-9a2b-7c5fee61f037}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 7.0.targets" />
+  </ImportGroup>
+</Project>
diff --git a/VS_BUILD/Minerva/CudaPerform/CudaPerform.vcxproj.user b/VS_BUILD/Minerva/CudaPerform/CudaPerform.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
diff --git a/VS_BUILD/Minerva/Minerva.sln b/VS_BUILD/Minerva/Minerva.sln
@@ -0,0 +1,68 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Minerva", "Minerva.vcxproj", "{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mnist_cnn", "..\mnist_cnn\mnist_cnn.vcxproj", "{89E42FBE-1044-4814-A6F1-A2B90967DCB0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mnist_mlp", "..\mnist_mlp\mnist_mlp.vcxproj", "{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CudaPerform", "CudaPerform\CudaPerform.vcxproj", "{1EB536F7-C754-4111-B48D-61813D4CC0AD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mnist_cnn_2gpu", "mnist_cnn_2gpu\mnist_cnn_2gpu.vcxproj", "{B275322E-55E1-4899-920F-AB50D9C56EB5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}.Debug|Win32.Build.0 = Debug|Win32
+		{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}.Debug|x64.ActiveCfg = Debug|x64
+		{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}.Debug|x64.Build.0 = Debug|x64
+		{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}.Release|Win32.ActiveCfg = Release|Win32
+		{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}.Release|Win32.Build.0 = Release|Win32
+		{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}.Release|x64.ActiveCfg = Release|x64
+		{C1F9972B-32D4-4788-9A2B-7C5FEE61F037}.Release|x64.Build.0 = Release|x64
+		{89E42FBE-1044-4814-A6F1-A2B90967DCB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{89E42FBE-1044-4814-A6F1-A2B90967DCB0}.Debug|Win32.Build.0 = Debug|Win32
+		{89E42FBE-1044-4814-A6F1-A2B90967DCB0}.Debug|x64.ActiveCfg = Debug|x64
+		{89E42FBE-1044-4814-A6F1-A2B90967DCB0}.Debug|x64.Build.0 = Debug|x64
+		{89E42FBE-1044-4814-A6F1-A2B90967DCB0}.Release|Win32.ActiveCfg = Release|Win32
+		{89E42FBE-1044-4814-A6F1-A2B90967DCB0}.Release|Win32.Build.0 = Release|Win32
+		{89E42FBE-1044-4814-A6F1-A2B90967DCB0}.Release|x64.ActiveCfg = Release|x64
+		{89E42FBE-1044-4814-A6F1-A2B90967DCB0}.Release|x64.Build.0 = Release|x64
+		{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}.Debug|Win32.Build.0 = Debug|Win32
+		{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}.Debug|x64.ActiveCfg = Debug|x64
+		{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}.Debug|x64.Build.0 = Debug|x64
+		{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}.Release|Win32.ActiveCfg = Release|Win32
+		{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}.Release|Win32.Build.0 = Release|Win32
+		{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}.Release|x64.ActiveCfg = Release|x64
+		{3A7E7AB4-C3E4-4DD8-B0E2-A51F50ECA4BE}.Release|x64.Build.0 = Release|x64
+		{1EB536F7-C754-4111-B48D-61813D4CC0AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1EB536F7-C754-4111-B48D-61813D4CC0AD}.Debug|Win32.Build.0 = Debug|Win32
+		{1EB536F7-C754-4111-B48D-61813D4CC0AD}.Debug|x64.ActiveCfg = Debug|x64
+		{1EB536F7-C754-4111-B48D-61813D4CC0AD}.Debug|x64.Build.0 = Debug|x64
+		{1EB536F7-C754-4111-B48D-61813D4CC0AD}.Release|Win32.ActiveCfg = Release|Win32
+		{1EB536F7-C754-4111-B48D-61813D4CC0AD}.Release|Win32.Build.0 = Release|Win32
+		{1EB536F7-C754-4111-B48D-61813D4CC0AD}.Release|x64.ActiveCfg = Release|x64
+		{1EB536F7-C754-4111-B48D-61813D4CC0AD}.Release|x64.Build.0 = Release|x64
+		{B275322E-55E1-4899-920F-AB50D9C56EB5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B275322E-55E1-4899-920F-AB50D9C56EB5}.Debug|Win32.Build.0 = Debug|Win32
+		{B275322E-55E1-4899-920F-AB50D9C56EB5}.Debug|x64.ActiveCfg = Debug|x64
+		{B275322E-55E1-4899-920F-AB50D9C56EB5}.Debug|x64.Build.0 = Debug|x64
+		{B275322E-55E1-4899-920F-AB50D9C56EB5}.Release|Win32.ActiveCfg = Release|Win32
+		{B275322E-55E1-4899-920F-AB50D9C56EB5}.Release|Win32.Build.0 = Release|Win32
+		{B275322E-55E1-4899-920F-AB50D9C56EB5}.Release|x64.ActiveCfg = Release|x64
+		{B275322E-55E1-4899-920F-AB50D9C56EB5}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal