Skip to content

Commit f653158

Browse files
author
Chris Maunder
committed
.NET on arm64 fixes
1 parent 7b76633 commit f653158

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

modules/ObjectDetectionYOLOv5Net/ObjectDetectionYOLOv5Net.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
<PackageReference Include="Microsoft.AI.DirectML" Version="1.15.2" Condition="'$(GpuType)'=='DirectML'" />
9292

9393
<PackageReference Include="SkiaSharp" Version="2.88.8" />
94-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
94+
<PackageReference Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
95+
<PackageReference Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
9596
</ItemGroup>
9697

9798
<!-- Output the settings based on what we've determined above -->

modules/ObjectDetectionYOLOv5Net/install.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@ if [ "$1" != "install" ]; then
1919
exit 1
2020
fi
2121

22+
installBinaries=false
23+
if [ "$executionEnvironment" = "Production" ]; then installBinaries=true; fi
24+
if [ "$launchedBy" = "server" ]; then installBinaries=true; fi
25+
2226
# Pull down the correct .NET image of ObjectDetectionYOLOv5Net based on this OS / GPU combo
23-
if [ "${executionEnvironment}" = "Production" ] || [ "${launchedBy}" = "server" ]; then
27+
if [ "${installBinaries}" = true ]; then
2428
imageName="ObjectDetectionYOLOv5Net-CPU-${moduleVersion}.zip"
2529
if [ "${installGPU}" = "true" ] && [ "${os}" != "macos" ]; then
2630
# Having issues with the OpenVINO version on linux

src/demos/modules/DotNetSimple/DotNetSimple.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,13 @@
4949
<ItemGroup>
5050
<!-- Common packages required on all GPU types -->
5151
<PackageReference Include="CodeProject.AI.Module.SDK" Version="1.0.1" />
52+
5253
<PackageReference Include="Yolov8.Net" Version="2.0.0" />
5354
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
5455
<PackageReference Include="SkiaSharp" Version="2.88.8" />
55-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
56+
57+
<PackageReference Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
58+
<PackageReference Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
5659

5760
<!-- Hardware Specific packages. Note that for CUDA, even if there may not be any actual
5861
CUDA hardware available, the package will still run fine. It's big, but if it does

0 commit comments

Comments
 (0)