Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Branch 298e6166818ec0e5a448889642de93eda8894a86 #105

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Branch 298e6166818ec0e5a448889642de93eda8894a86 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0f2d298
fix GPU to 20 match 710M
youkpan Mar 8, 2016
43dc05e
for hayoou.com deep learning.
youkpan Mar 8, 2016
17e6b0e
add
youkpan Mar 8, 2016
f95fd1e
fix cifar10 db model to leveldb ,work ok
youkpan Mar 8, 2016
5746a81
add summar data import
youkpan Mar 9, 2016
0f3e287
fix bugs
youkpan Mar 9, 2016
e792afd
fix input string to GBK word map
youkpan Mar 10, 2016
298e616
fix lenet param
youkpan Mar 10, 2016
a510746
fix title class
youkpan Mar 13, 2016
9a9b1ab
add go
youkpan Mar 14, 2016
ba09568
fix bugs
youkpan Mar 15, 2016
da32a03
fix label bugs
youkpan Mar 15, 2016
b8b4927
fix bugs seems OK
youkpan Mar 15, 2016
19710ce
add GO
youkpan Mar 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
围棋 release 测试
https://github.com/youkpan/caffe-windows-1/releases

Forked from https://www.github.com/BVLC/caffe master branch in 2016/02/04 . Next update time may be around 2016/05/01 .

for hayoou.com deep learning.
Changed for gen mnist bat ,and remove USE_CUDNN define.

**Good News:** Microsoft has created a repository of caffe windows version in https://github.com/Microsoft/caffe . Their solution may be more flexible and maintainable. I suggest all of you to try it.

I have made a list of some frequently asked questions in [FAQ.md](FAQ.md). If you get confused during configuring, please firstly look up for your question in the [FAQ.md](FAQ.md). This FAQ list is still under construction, I will keep adding questions into it.
Expand Down
Binary file added buildVS2013/.vs/MainBuilder/v14/.suo
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions buildVS2013/MSVC/MainBuilder.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<AdditionalDependencies>leveldbd.lib;libopenblas.lib;cublas.lib;cublas_device.lib;curand.lib;cudart.lib;cuda.lib;libprotobufd.lib;libglog.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>
<CudaCompile>
<CodeGeneration>compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;</CodeGeneration>
<CodeGeneration>compute_20,sm_20;</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -166,7 +166,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>../../3rdparty/include;../../src;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_VARIADIC_MAX=10;WIN32;NDEBUG;_CONSOLE;USE_CUDNN;USE_OPENCV;USE_LEVELDB;USE_LMDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_VARIADIC_MAX=10;WIN32;NDEBUG;_CONSOLE;USE_OPENCV;USE_LEVELDB;USE_LMDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
Expand Down Expand Up @@ -194,7 +194,8 @@
</CudaCompile>
<CudaCompile>
<TargetMachinePlatform>64</TargetMachinePlatform>
<CodeGeneration>compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;</CodeGeneration>
<CodeGeneration>compute_20,sm_20;</CodeGeneration>
<GPUDebugInfo>false</GPUDebugInfo>
</CudaCompile>
<PreBuildEvent>
<Command>
Expand Down
34 changes: 33 additions & 1 deletion buildVS2013/MainBuilder.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "caffe", "MSVC\MainBuilder.vcxproj", "{3FF425A9-4745-4889-B568-4BBCA2016D22}"
ProjectSection(ProjectDependencies) = postProject
Expand Down Expand Up @@ -32,6 +32,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compute_image_mean", "compu
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert_mnist_data", "convert_mnist_data\convert_mnist_data.vcxproj", "{3A7FC59A-DA9C-4806-998B-66207DD91F7D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_cifar10", "create_cifar10\create_cifar10.vcxproj", "{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convert_GO_data", "convert_GO_data\convert_GO_data.vcxproj", "{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -142,6 +146,34 @@ Global
{3A7FC59A-DA9C-4806-998B-66207DD91F7D}.Release|Win32.Build.0 = Release|Win32
{3A7FC59A-DA9C-4806-998B-66207DD91F7D}.Release|x64.ActiveCfg = Release|x64
{3A7FC59A-DA9C-4806-998B-66207DD91F7D}.Release|x64.Build.0 = Release|x64
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Debug|Any CPU.ActiveCfg = Debug|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Debug|Win32.ActiveCfg = Debug|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Debug|Win32.Build.0 = Debug|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Debug|x64.ActiveCfg = Debug|x64
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Debug|x64.Build.0 = Debug|x64
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Release|Any CPU.ActiveCfg = Release|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Release|Mixed Platforms.Build.0 = Release|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Release|Win32.ActiveCfg = Release|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Release|Win32.Build.0 = Release|Win32
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Release|x64.ActiveCfg = Release|x64
{B750B2B8-6250-4C10-A7CB-9CBD871ED84B}.Release|x64.Build.0 = Release|x64
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Debug|Any CPU.ActiveCfg = Debug|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Debug|Win32.ActiveCfg = Debug|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Debug|Win32.Build.0 = Debug|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Debug|x64.ActiveCfg = Debug|x64
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Debug|x64.Build.0 = Debug|x64
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Release|Any CPU.ActiveCfg = Release|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Release|Mixed Platforms.Build.0 = Release|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Release|Win32.ActiveCfg = Release|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Release|Win32.Build.0 = Release|Win32
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Release|x64.ActiveCfg = Release|x64
{869C0FF0-D015-4CAD-910A-0FB3FB4F5310}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file modified buildVS2013/MainBuilder.v12.suo
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions buildVS2013/caffelib/caffelib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@
<AdditionalDependencies>leveldbd.lib;libopenblas.lib;cublas.lib;cublas_device.lib;curand.lib;cudart.lib;cuda.lib;libprotobufd.lib;libglog.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>
<CudaCompile>
<CodeGeneration>compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;</CodeGeneration>
<CodeGeneration>compute_20,sm_20;</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>../../3rdparty/include;../../3rdparty/include/cuda;../../src;../../src/include;D:\ThirdPartyLibrary\caffe\include;D:\ThirdPartyLibrary\caffe\src;D:\ThirdPartyLibrary\boost_1_57_0;D:\CUDA\Toolkit\include;D:\ThirdPartyLibrary\glog-0.3.3\src\windows;D:\ThirdPartyLibrary\gflags-2.1.1\buildx64\include;C:\Program Files (x86)\Intel\Composer XE 2015\mkl\include;C:\Program Files (x86)\Intel\Composer XE 2015\compiler\include;D:\ThirdPartyLibrary\hdf5\include;D:\ThirdPartyLibrary\leveldb\include;D:\ThirdPartyLibrary\snappy-windows\include;D:\deeplearning\caffeold\3rdparty\include;D:\ThirdPartyLibrary\opencv248\opencv\build\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../3rdparty/include;../../3rdparty/include/cuda;../../src;../../src/include;D:\ThirdPartyLibrary\caffe\include;D:\ThirdPartyLibrary\caffe\src;D:\ThirdPartyLibrary\boost_1_57_0;D:\CUDA\Toolkit\include;D:\ThirdPartyLibrary\glog-0.3.3\src\windows;D:\ThirdPartyLibrary\gflags-2.1.1\buildx64\include;C:\Program Files (x86)\Intel\Composer XE 2015\mkl\include;C:\Program Files (x86)\Intel\Composer XE 2015\compiler\include;D:\ThirdPartyLibrary\hdf5\include;D:\ThirdPartyLibrary\leveldb\include;D:\ThirdPartyLibrary\snappy-windows\include;D:\deeplearning\caffeold\3rdparty\include;D:\ThirdPartyLibrary\opencv248\opencv\build\include;F:\caffe-windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
Expand All @@ -156,7 +156,7 @@
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>D:/ThirdPartyLibrary/boost_1_57_0/lib64-msvc-11.0;D:/ThirdPartyLibrary/boost_1_57_0/lib64-msvc-11.0/$(Configuration);D:/CUDA/Toolkit/lib/x64;D:/CUDA/Toolkit/lib/x64/$(Configuration);D:\deeplearning\caffeold\3rdparty\lib;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir)</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;D:\CUDA\ToolKit\lib\x64\cudart.lib;D:\CUDA\ToolKit\lib\x64\cublas.lib;D:\CUDA\ToolKit\lib\x64\curand.lib;D:\ThirdPartyLibrary\protobuf-2.5.0\vsprojects\x64\Release\libprotobuf.lib;D:\ThirdPartyLibrary\boost_1_57_0\lib64-msvc-11.0\boost_system-vc110-mt-1_57.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_tools.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_hl_fortran.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_fortran.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_hl_f90cstub.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_f90cstub.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_cpp.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_hl_cpp.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_hl.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5.lib;D:\ThirdPartyLibrary\hdf5\lib\zlib.lib;D:\ThirdPartyLibrary\hdf5\lib\szip.lib;opencv_highgui249.lib;opencv_imgproc249.lib;opencv_core249.lib;shlwapi.lib;leveldb.lib;libgsl-0.lib;libgslcblas-0.lib;cublas.lib;cublas_device.lib;curand.lib;cudart.lib;cuda.lib;libprotobuf.lib;libglog.lib;gflags.lib;lmdb.lib;D:\CUDA\cudnn-6.5-win-R1\cudnn64_65.lib;C:\Program Files (x86)\Intel\Composer XE 2015\mkl\lib\intel64\mkl_rt.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.5\lib\x64\cudart.lib;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.5\lib\x64\x64\cublas.lib;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v7.5\lib\x64\lib\x64\curand.lib;F:\caffe 依赖\protobuf-2.5.0\vsprojects\x64\Release\libprotobuf.lib;D:\ThirdPartyLibrary\boost_1_57_0\lib64-msvc-11.0\boost_system-vc110-mt-1_57.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_tools.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_hl_fortran.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_fortran.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_hl_f90cstub.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_f90cstub.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_cpp.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_hl_cpp.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5_hl.lib;D:\ThirdPartyLibrary\hdf5\lib\hdf5.lib;D:\ThirdPartyLibrary\hdf5\lib\zlib.lib;D:\ThirdPartyLibrary\hdf5\lib\szip.lib;opencv_highgui249.lib;opencv_imgproc249.lib;opencv_core249.lib;shlwapi.lib;leveldb.lib;libgsl-0.lib;libgslcblas-0.lib;cublas.lib;cublas_device.lib;curand.lib;cudart.lib;cuda.lib;libprotobuf.lib;libglog.lib;gflags.lib;lmdb.lib;D:\CUDA\cudnn-6.5-win-R1\cudnn64_65.lib;C:\Program Files (x86)\Intel\Composer XE 2015\mkl\lib\intel64\mkl_rt.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -166,7 +166,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>../../3rdparty/include;../../src;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_VARIADIC_MAX=10;WIN32;NDEBUG;_CONSOLE;USE_CUDNN;USE_OPENCV;USE_LEVELDB;USE_LMDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_VARIADIC_MAX=10;WIN32;NDEBUG;_CONSOLE;USE_OPENCV;USE_LEVELDB;USE_LMDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
Expand Down Expand Up @@ -195,7 +195,7 @@
</CudaCompile>
<CudaCompile>
<TargetMachinePlatform>64</TargetMachinePlatform>
<CodeGeneration>compute_30,sm_30;</CodeGeneration>
<CodeGeneration>compute_20,sm_20;</CodeGeneration>
</CudaCompile>
<PreBuildEvent>
<Command>
Expand Down
9 changes: 2 additions & 7 deletions buildVS2013/compute_image_mean/compute_image_mean.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>../../3rdparty/include;../../src;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_VARIADIC_MAX=10;WIN32;NDEBUG;_CONSOLE;USE_CUDNN;USE_OPENCV;USE_LEVELDB;USE_LMDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_VARIADIC_MAX=10;WIN32;NDEBUG;_CONSOLE;USE_OPENCV;USE_LEVELDB;USE_LMDB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
Expand Down Expand Up @@ -194,7 +194,7 @@
</CudaCompile>
<CudaCompile>
<TargetMachinePlatform>64</TargetMachinePlatform>
<CodeGeneration>compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;</CodeGeneration>
<CodeGeneration>compute_20,sm_20;compute_30,sm_30;</CodeGeneration>
</CudaCompile>
<PreBuildEvent>
<Command>
Expand All @@ -207,11 +207,6 @@
<ItemGroup>
<ProjectReference Include="..\caffelib\caffelib.vcxproj">
<Project>{63a79297-9cc4-4081-adac-7f40ce965c95}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
Loading