Skip to content

Commit 292d363

Browse files
committed
Fix native library path conditions
1 parent e47378c commit 292d363

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/MLXSharp/MLXSharp.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@
1818
<PropertyGroup>
1919
<_RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)/../..'))</_RepoRoot>
2020
<MLXSharpNativeLibsDir Condition="'$(MLXSharpNativeLibsDir)' == ''">$([System.IO.Path]::Combine('$(_RepoRoot)','libs','native-libs'))</MLXSharpNativeLibsDir>
21-
<MLXSharpMacNativeBinary Condition="'$(MLXSharpMacNativeBinary)' == '' and Exists('$([System.IO.Path]::Combine('$(MLXSharpNativeLibsDir)','osx-arm64','libmlxsharp.dylib'))')">$([System.IO.Path]::Combine('$(MLXSharpNativeLibsDir)','osx-arm64','libmlxsharp.dylib'))</MLXSharpMacNativeBinary>
21+
<_MLXSharpMacNativeFromLibs>$([System.IO.Path]::Combine($(MLXSharpNativeLibsDir), 'osx-arm64', 'libmlxsharp.dylib'))</_MLXSharpMacNativeFromLibs>
22+
<_MLXSharpMacMetallibFromLibs>$([System.IO.Path]::Combine($(MLXSharpNativeLibsDir), 'osx-arm64', 'mlx.metallib'))</_MLXSharpMacMetallibFromLibs>
23+
<_MLXSharpLinuxNativeFromLibs>$([System.IO.Path]::Combine($(MLXSharpNativeLibsDir), 'linux-x64', 'libmlxsharp.so'))</_MLXSharpLinuxNativeFromLibs>
24+
<MLXSharpMacNativeBinary Condition="'$(MLXSharpMacNativeBinary)' == '' and Exists('$(_MLXSharpMacNativeFromLibs)')">$(_MLXSharpMacNativeFromLibs)</MLXSharpMacNativeBinary>
2225
<MLXSharpMacNativeBinary Condition="'$(MLXSharpMacNativeBinary)' == ''">$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','..','..','native','build','libmlxsharp.dylib'))</MLXSharpMacNativeBinary>
2326
<MLXSharpMacNativeDestination>$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','runtimes','osx-arm64','native','libmlxsharp.dylib'))</MLXSharpMacNativeDestination>
2427
<MLXSharpSkipMacNativeValidation Condition="'$(MLXSharpSkipMacNativeValidation)' == ''">false</MLXSharpSkipMacNativeValidation>
2528
<MLXSharpMacNativeDestinationDir>$([System.IO.Path]::GetDirectoryName('$(MLXSharpMacNativeDestination)'))</MLXSharpMacNativeDestinationDir>
29+
<MLXSharpMacMetallibBinary Condition="'$(MLXSharpMacMetallibBinary)' == '' and Exists('$(_MLXSharpMacMetallibFromLibs)')">$(_MLXSharpMacMetallibFromLibs)</MLXSharpMacMetallibBinary>
2630
<MLXSharpMacMetallibBinary Condition="'$(MLXSharpMacMetallibBinary)' == ''">$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','..','..','native','build','macos','extern','mlx','mlx','backend','metal','kernels','mlx.metallib'))</MLXSharpMacMetallibBinary>
2731
<MLXSharpMacMetallibDestination Condition="'$(MLXSharpMacMetallibDestination)' == ''">$([System.IO.Path]::Combine('$(MLXSharpMacNativeDestinationDir)','mlx.metallib'))</MLXSharpMacMetallibDestination>
2832

29-
<MLXSharpLinuxNativeBinary Condition="'$(MLXSharpLinuxNativeBinary)' == '' and Exists('$([System.IO.Path]::Combine('$(MLXSharpNativeLibsDir)','linux-x64','libmlxsharp.so'))')">$([System.IO.Path]::Combine('$(MLXSharpNativeLibsDir)','linux-x64','libmlxsharp.so'))</MLXSharpLinuxNativeBinary>
33+
<MLXSharpLinuxNativeBinary Condition="'$(MLXSharpLinuxNativeBinary)' == '' and Exists('$(_MLXSharpLinuxNativeFromLibs)')">$(_MLXSharpLinuxNativeFromLibs)</MLXSharpLinuxNativeBinary>
3034
<MLXSharpLinuxNativeBinary Condition="'$(MLXSharpLinuxNativeBinary)' == ''">$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','..','..','native','build','linux','libmlxsharp.so'))</MLXSharpLinuxNativeBinary>
3135
<MLXSharpLinuxNativeDestination>$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','runtimes','linux-x64','native','libmlxsharp.so'))</MLXSharpLinuxNativeDestination>
3236
<MLXSharpSkipLinuxNativeValidation Condition="'$(MLXSharpSkipLinuxNativeValidation)' == ''">false</MLXSharpSkipLinuxNativeValidation>

0 commit comments

Comments
 (0)