From 5f8c302a699db8b04fe89f6064ed423b82d9219a Mon Sep 17 00:00:00 2001
From: Sandro Hanea <40202887+sandrohanea@users.noreply.github.com>
Date: Mon, 14 Oct 2024 11:35:07 +0200
Subject: [PATCH] Fixed vulkan and coreml targets (#218)

---
 .gitignore                                      |  2 +-
 .../Whisper.net.Runtime.CoreML.targets          | 10 +++++++++-
 .../Whisper.net.Runtime.Vulkan.targets          | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 runtimes/Whisper.net.Runtime.Vulkan/Whisper.net.Runtime.Vulkan.targets

diff --git a/.gitignore b/.gitignore
index 92e09e29..b04e97a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -363,7 +363,7 @@ MigrationBackup/
 !/runtimes/Whisper.net.Runtime.Cuda.*/Whisper.net.Runtime.Cuda.*.targets
 
 /runtimes/Whisper.net.Runtime.Vulkan/*
-!/Whisper.net.Runtime.Vulkan/Whisper.net.Runtime.Vulkan.targets
+!/runtimes/Whisper.net.Runtime.Vulkan/Whisper.net.Runtime.Vulkan.targets
 
 /runtimes/Whisper.net.Runtime.CoreML/*
 !/runtimes/Whisper.net.Runtime.CoreML/Whisper.net.Runtime.CoreML.targets
diff --git a/runtimes/Whisper.net.Runtime.CoreML/Whisper.net.Runtime.CoreML.targets b/runtimes/Whisper.net.Runtime.CoreML/Whisper.net.Runtime.CoreML.targets
index dc248a7d..933b7555 100644
--- a/runtimes/Whisper.net.Runtime.CoreML/Whisper.net.Runtime.CoreML.targets
+++ b/runtimes/Whisper.net.Runtime.CoreML/Whisper.net.Runtime.CoreML.targets
@@ -103,14 +103,22 @@
       <TargetPath>libwhisper.coreml.dylib</TargetPath>
     </None>
   </ItemGroup>
-  <ItemGroup>
+  <!-- Metal Maui asset for maccatalyst, ios, tvos and their simulators -->
+  <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('tvos-')) or $(RuntimeIdentifier.StartsWith('tvossimulator-')) or (('$(Platform)' == 'iPhone') OR ('$(RuntimeIdentifier)' == 'ios') OR $(RuntimeIdentifier.StartsWith('ios-')) OR $(RuntimeIdentifier.StartsWith('ios.'))) or $(TargetFramework.Contains('-maccatalyst')) == true or (('$(Platform)' == 'iPhoneSimulator') OR $(RuntimeIdentifier.StartsWith('iossimulator')))">
+    <MauiAsset Include="$(MSBuildThisFileDirectory)\ggml-metal.metal" LogicalName="ggml-metal.metal" />
+  </ItemGroup>
+
+  <!-- Metal Copy For MacOS -->
+  <ItemGroup Condition="$(TargetFramework.Contains('-')) == false">
     <None Visible="false" Include="$(MSBuildThisFileDirectory)\ggml-metal.metal">
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>ggml-metal.metal</TargetPath>
+      <PublishFolderType>RootDirectory</PublishFolderType>
     </None>
   </ItemGroup>
+
   <ItemGroup Condition="$(TargetFramework.Contains('-')) == false ">
     <None Visible="false" Include="$(MSBuildThisFileDirectory)macos-x64\libwhisper.dylib">
       <Pack>true</Pack>
diff --git a/runtimes/Whisper.net.Runtime.Vulkan/Whisper.net.Runtime.Vulkan.targets b/runtimes/Whisper.net.Runtime.Vulkan/Whisper.net.Runtime.Vulkan.targets
new file mode 100644
index 00000000..7622d018
--- /dev/null
+++ b/runtimes/Whisper.net.Runtime.Vulkan/Whisper.net.Runtime.Vulkan.targets
@@ -0,0 +1,17 @@
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup
+      Condition="$(TargetFramework.Contains('-windows')) == true or $(TargetFramework.Contains('-')) == false">
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)win-x64\whisper.dll">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>runtimes/vulkan/win-x64/whisper.dll</TargetPath>
+    </None>
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)win-x64\ggml.dll">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>runtimes/vulkan/win-x64/ggml.dll</TargetPath>
+    </None>
+  </ItemGroup>
+</Project>