ふかうら王 CUDA 12.3対応。TensorRT,最新版、 cuDNN8.8に対応。zlib削除。

nodchip · Apr 12, 2024 · b3e84e0 · b3e84e0
1 parent 22994a4
commit b3e84e0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 30 deletions.
diff --git a/source/YaneuraOu.vcxproj b/source/YaneuraOu.vcxproj
@@ -366,7 +366,7 @@
  <Import Project="props\YaneuraOu-common.props" />
  <Import Project="props\YaneuraOuSolution-debug-x64.props" />
  <Import Project="props\YaneuraOuCpu-x64-avx2.props" />
- <Import Project="$(CUDA_PATH_V11_7)\extras\visual_studio_integration\MSBuildExtensions\CUDA 11.7.props" />
+ <Import Project="$(CUDA_PATH_V12_3)\extras\visual_studio_integration\MSBuildExtensions\CUDA 12.3.props" />
  <Import Project="props\YaneuraOuEdition-Deep-TensorRT.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Deep-ORT-CPU|x64'" Label="PropertySheets">
@@ -395,7 +395,7 @@
  <Import Project="props\YaneuraOu-common.props" />
  <Import Project="props\YaneuraOuSolution-release-x64.props" />
  <Import Project="props\YaneuraOuCpu-x64-avx2.props" />
- <Import Project="$(CUDA_PATH_V11_7)\extras\visual_studio_integration\MSBuildExtensions\CUDA 11.7.props" />
+ <Import Project="$(CUDA_PATH_V12_3)\extras\visual_studio_integration\MSBuildExtensions\CUDA 12.3.props" />
  <Import Project="props\YaneuraOuEdition-Deep-TensorRT.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-NNUE-LEARN|x64'" Label="PropertySheets">
@@ -764,9 +764,9 @@
  <None Include="..\script\engine_invoker5.py" />
  <CustomBuild Include="eval\deep\unpack.cu">
  <FileType>Document</FileType>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release-Deep-TensorRT|x64'">"$(CUDA_PATH_V11_7)\bin\nvcc.exe" --use-local-env -ccbin "$(VC_ExecutablePath_x64)" -std=c++17 -x cu --keep-dir ..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget) -maxrregcount=0 --machine 64 --compile -cudart static -DNDEBUG -D_CONSOLE -D_UNICODE -DUNICODE -DYANEURAOU_ENGINE_DEEP -DTENSOR_RT -Xcompiler "/EHsc /W3 /nologo /O2 /Fd..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\vc143.pdb /FS /MT" -o "..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\%(Filename)%(Extension).obj" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release-Deep-TensorRT|x64'">"$(CUDA_PATH_V12_3)\bin\nvcc.exe" --use-local-env -ccbin "$(VC_ExecutablePath_x64)" -std=c++17 -x cu --keep-dir ..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget) -maxrregcount=0 --machine 64 --compile -cudart static -DNDEBUG -D_CONSOLE -D_UNICODE -DUNICODE -DYANEURAOU_ENGINE_DEEP -DTENSOR_RT -Xcompiler "/EHsc /W3 /nologo /O2 /Fd..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\vc143.pdb /FS /MT" -o "..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\%(Filename)%(Extension).obj" "%(FullPath)"</Command>
  <Outputs Condition="'$(Configuration)|$(Platform)'=='Release-Deep-TensorRT|x64'">..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\%(Filename)%(Extension).obj</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug-Deep-TensorRT|x64'">"$(CUDA_PATH_V11_7)\bin\nvcc.exe" --use-local-env -ccbin "$(VC_ExecutablePath_x64)" -std=c++17 -x cu -G --keep-dir ..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget) -maxrregcount=0 --machine 64 --compile -cudart static -g -D_DEBUG -D_CONSOLE -D_UNICODE -DUNICODE -DYANEURAOU_ENGINE_DEEP -DTENSOR_RT -Xcompiler "/EHsc /W3 /nologo /Od /Fd..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\vc143.pdb /FS /Zi /RTC1 /MTd" -o "..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\%(Filename)%(Extension).obj" "%(FullPath)"</Command>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug-Deep-TensorRT|x64'">"$(CUDA_PATH_V12_3)\bin\nvcc.exe" --use-local-env -ccbin "$(VC_ExecutablePath_x64)" -std=c++17 -x cu -G --keep-dir ..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget) -maxrregcount=0 --machine 64 --compile -cudart static -g -D_DEBUG -D_CONSOLE -D_UNICODE -DUNICODE -DYANEURAOU_ENGINE_DEEP -DTENSOR_RT -Xcompiler "/EHsc /W3 /nologo /Od /Fd..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\vc143.pdb /FS /Zi /RTC1 /MTd" -o "..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\%(Filename)%(Extension).obj" "%(FullPath)"</Command>
  <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug-Deep-TensorRT|x64'">..\$(Platform)\$(Configuration)\obj\$(YaneuraOuDbgPrefix)$(YaneuraOuCpuTarget)\%(Filename)%(Extension).obj</Outputs>
  </CustomBuild>
  <None Include="Makefile" />

diff --git a/source/props/YaneuraOuEdition-Deep-ORT-TRT.props b/source/props/YaneuraOuEdition-Deep-ORT-TRT.props
@@ -29,39 +29,35 @@
  </BuildMacro>
  </ItemGroup>
  <ItemGroup>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_adv_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_adv_infer64_8.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_adv_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_adv_infer64_8.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_cnn_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_cnn_infer64_8.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_cnn_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_cnn_infer64_8.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_ops_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_ops_infer64_8.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_ops_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_ops_infer64_8.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn64_8.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn64_8.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\zlib123dllx64\dll_x64\zlibwapi.dll')" Include="C:\ProgramData\YaneuraOu\zlib123dllx64\dll_x64\zlibwapi.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer_builder_resource.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer_builder_resource.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer_builder_resource.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer_builder_resource.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer_plugin.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer_plugin.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer_plugin.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer_plugin.dll">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- <Visible>false</Visible>
- </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvonnxparser.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvonnxparser.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvonnxparser.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvonnxparser.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>

diff --git a/source/props/YaneuraOuEdition-Deep-TensorRT.props b/source/props/YaneuraOuEdition-Deep-TensorRT.props
@@ -9,8 +9,8 @@
  <OutDir>$(OutBaseDir)$(YaneuraOuDir)\</OutDir>
  <TargetName>$(ProjectName)-$(YaneuraOuTarget)</TargetName>
  <_PropertySheetDisplayName>YaneuraOuEdition-Deep-TensorRT</_PropertySheetDisplayName>
- <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7\include</IncludePath>
- <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.7\lib\x64</LibraryPath>
+ <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.3\include</IncludePath>
+ <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.3\lib\x64</LibraryPath>
  </PropertyGroup>
  <ItemDefinitionGroup>
  <ClCompile>
@@ -29,39 +29,35 @@
  </BuildMacro>
  </ItemGroup>
  <ItemGroup>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_adv_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_adv_infer64_8.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_adv_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_adv_infer64_8.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_cnn_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_cnn_infer64_8.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_cnn_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_cnn_infer64_8.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_ops_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn_ops_infer64_8.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_ops_infer64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn_ops_infer64_8.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.4.0.27_cuda11.6-archive\bin\cudnn64_8.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn64_8.dll')" Include="C:\ProgramData\YaneuraOu\cudnn-windows-x86_64-8.9.7.29_cuda12-archive\bin\cudnn64_8.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\zlib123dllx64\dll_x64\zlibwapi.dll')" Include="C:\ProgramData\YaneuraOu\zlib123dllx64\dll_x64\zlibwapi.dll">
+ <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer_builder_resource.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer_builder_resource.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Condition="Exists('C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer_builder_resource.dll')" Include="C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer_builder_resource.dll">
+ <Content Include="C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Include="C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer.dll">
+ <Content Include="C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvinfer_plugin.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>
- <Content Include="C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvinfer_plugin.dll">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- <Visible>false</Visible>
- </Content>
- <Content Include="C:\ProgramData\YaneuraOu\TensorRT-8.2.5.1\lib\nvonnxparser.dll">
+ <Content Include="C:\ProgramData\YaneuraOu\TensorRT-8.6.1.6\lib\nvonnxparser.dll">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  <Visible>false</Visible>
  </Content>