Updated source to latest base: d8356a1

Upgrade openvino to Version: 2024.1.0.15008
SplitmediaLabsLimited · May 14, 2024 · 0749b30 · 0749b30
1 parent 82d5e7b
commit 0749b30
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/bin/whisper.cuda.vcxproj b/bin/whisper.cuda.vcxproj
@@ -278,7 +278,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\ggml-cuda\acc.cuh" />
-    <ClInclude Include="..\ggml-cuda\alibi.cuh" />
     <ClInclude Include="..\ggml-cuda\arange.cuh" />
     <ClInclude Include="..\ggml-cuda\argsort.cuh" />
     <ClInclude Include="..\ggml-cuda\binbcast.cuh" />
@@ -290,6 +289,7 @@
     <ClInclude Include="..\ggml-cuda\dequantize.cuh" />
     <ClInclude Include="..\ggml-cuda\diagmask.cuh" />
     <ClInclude Include="..\ggml-cuda\dmmv.cuh" />
+    <ClInclude Include="..\ggml-cuda\fattn.cuh" />
     <ClInclude Include="..\ggml-cuda\getrows.cuh" />
     <ClInclude Include="..\ggml-cuda\im2col.cuh" />
     <ClInclude Include="..\ggml-cuda\mmq.cuh" />
@@ -310,7 +310,6 @@
   <ItemGroup>
     <CudaCompile Include="..\ggml-cuda.cu" />
     <CudaCompile Include="..\ggml-cuda\acc.cu" />
-    <CudaCompile Include="..\ggml-cuda\alibi.cu" />
     <CudaCompile Include="..\ggml-cuda\arange.cu" />
     <CudaCompile Include="..\ggml-cuda\argsort.cu" />
     <CudaCompile Include="..\ggml-cuda\binbcast.cu" />
@@ -320,6 +319,7 @@
     <CudaCompile Include="..\ggml-cuda\cpy.cu" />
     <CudaCompile Include="..\ggml-cuda\diagmask.cu" />
     <CudaCompile Include="..\ggml-cuda\dmmv.cu" />
+    <CudaCompile Include="..\ggml-cuda\fattn.cu" />
     <CudaCompile Include="..\ggml-cuda\getrows.cu" />
     <CudaCompile Include="..\ggml-cuda\im2col.cu" />
     <CudaCompile Include="..\ggml-cuda\mmq.cu" />

diff --git a/bin/whisper.cuda.vcxproj.filters b/bin/whisper.cuda.vcxproj.filters
@@ -4,9 +4,6 @@
     <CudaCompile Include="..\ggml-cuda\acc.cu">
       <Filter>ggml-cuda</Filter>
     </CudaCompile>
-    <CudaCompile Include="..\ggml-cuda\alibi.cu">
-      <Filter>ggml-cuda</Filter>
-    </CudaCompile>
     <CudaCompile Include="..\ggml-cuda\arange.cu">
       <Filter>ggml-cuda</Filter>
     </CudaCompile>
@@ -82,6 +79,9 @@
     <CudaCompile Include="..\ggml-cuda\upscale.cu">
       <Filter>ggml-cuda</Filter>
     </CudaCompile>
+    <CudaCompile Include="..\ggml-cuda\fattn.cu">
+      <Filter>ggml-cuda</Filter>
+    </CudaCompile>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\external\whisper.clblast.cpp" />
@@ -94,9 +94,6 @@
     <ClInclude Include="..\ggml-cuda\acc.cuh">
       <Filter>ggml-cuda</Filter>
     </ClInclude>
-    <ClInclude Include="..\ggml-cuda\alibi.cuh">
-      <Filter>ggml-cuda</Filter>
-    </ClInclude>
     <ClInclude Include="..\ggml-cuda\arange.cuh">
       <Filter>ggml-cuda</Filter>
     </ClInclude>
@@ -178,6 +175,9 @@
     <ClInclude Include="..\ggml-cuda\upscale.cuh">
       <Filter>ggml-cuda</Filter>
     </ClInclude>
+    <ClInclude Include="..\ggml-cuda\fattn.cuh">
+      <Filter>ggml-cuda</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\external\whisper-cuda.def" />

diff --git a/bin/whisper.openvino.vcxproj b/bin/whisper.openvino.vcxproj
@@ -75,7 +75,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\;..\ThirdParty\openvino_2023\runtime\include;..\ThirdParty\openvino_2023\runtime\include\ie;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\;..\ThirdParty\openvino_2024\runtime\include;..\ThirdParty\openvino_2024\runtime\include\ie;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -108,7 +108,7 @@
       <AdditionalOptions>%(AdditionalOptions) /machine:x64</AdditionalOptions>
     </Lib>
     <Link>
-      <AdditionalDependencies>whisper.lib;..\ThirdParty\openvino_2023\runtime\lib\intel64\Debug\openvinod.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>whisper.lib;..\ThirdParty\openvino_2024\runtime\lib\intel64\Debug\openvinod.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>..\external\whisper-openvino-encoder.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(OutDir)..\..\..\Lib\$(Configuration)\$(PlatformTarget)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
@@ -118,7 +118,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\;..\ThirdParty\openvino_2023\runtime\include;..\ThirdParty\openvino_2023\runtime\include\ie;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\;..\ThirdParty\openvino_2024\runtime\include;..\ThirdParty\openvino_2024\runtime\include\ie;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>%(AdditionalOptions) /utf-8 /utf-8</AdditionalOptions>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
@@ -153,12 +153,12 @@
     <Link>
       <ModuleDefinitionFile>..\external\whisper-openvino-encoder.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(OutDir)..\..\..\Lib\$(Configuration)\$(PlatformTarget)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>whisper.lib;..\ThirdParty\openvino_2023\runtime\lib\intel64\Release\openvino.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>whisper.lib;..\ThirdParty\openvino_2024\runtime\lib\intel64\Release\openvino.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\;..\ThirdParty\openvino_2023\runtime\include;..\ThirdParty\openvino_2023\runtime\include\ie;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\;..\ThirdParty\openvino_2024\runtime\include;..\ThirdParty\openvino_2024\runtime\include\ie;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
@@ -193,12 +193,12 @@
     <Link>
       <ModuleDefinitionFile>..\external\whisper-openvino-encoder.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(OutDir)..\..\..\Lib\$(Configuration)\$(PlatformTarget)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>whisper.lib;..\ThirdParty\openvino_2023\runtime\lib\intel64\Release\openvino.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>whisper.lib;..\ThirdParty\openvino_2024\runtime\lib\intel64\Release\openvino.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\;..\ThirdParty\openvino_2023\runtime\include;..\ThirdParty\openvino_2023\runtime\include\ie;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\;..\ThirdParty\openvino_2024\runtime\include;..\ThirdParty\openvino_2024\runtime\include\ie;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -232,7 +232,7 @@
     <Link>
       <ModuleDefinitionFile>..\external\whisper-openvino-encoder.def</ModuleDefinitionFile>
       <AdditionalLibraryDirectories>$(OutDir)..\..\..\Lib\$(Configuration)\$(PlatformTarget)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>whisper.lib;..\ThirdParty\openvino_2023\runtime\lib\intel64\Release\openvino.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>whisper.lib;..\ThirdParty\openvino_2024\runtime\lib\intel64\Release\openvino.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/external/Version.rc b/external/Version.rc
@@ -21,7 +21,7 @@
 #define VER_LEGALCOPYRIGHT_YEARS	2024
 #define VER_PRODUCTMAJORVERSION		1
 #define VER_PRODUCTMINORVERSION		0
-#define VER_PRODUCTREVISION			2404
+#define VER_PRODUCTREVISION			2405
 #define VER_PRODUCTBUILD			1401
 ///////////////////////////////////////////////////////
 #define VER_INTERNALNAME_STR VER_ORIGINALFILENAME_STR

diff --git a/external/whisper.dll.cpp b/external/whisper.dll.cpp
@@ -19,7 +19,7 @@ struct whisper_dll_context_t {
 	// model path
 	char	model_path[512];
 	// output text buffer
-	struct {
+	struct { 
 		void * p;
 		size_t size;
 	} text_buf;