Skip to content

Fixing native lookup #7282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 11, 2024
Merged

Fixing native lookup #7282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3892e1b
enable m1 tests and fixing native lookup
michaelgsharp Oct 30, 2024
3b00a13
Mac testing
michaelgsharp Oct 30, 2024
10aa46d
mac test
michaelgsharp Oct 30, 2024
1452b06
macos test
michaelgsharp Oct 30, 2024
b3f57f1
mac testing
michaelgsharp Oct 31, 2024
d0b9b0c
reverting mac changes
michaelgsharp Nov 1, 2024
ac4e066
testing mac temp fix
michaelgsharp Nov 1, 2024
791cad0
fixed cmake
michaelgsharp Nov 1, 2024
d9c112a
print DYLD libraries
michaelgsharp Nov 1, 2024
43a535d
osx lightgbm test
michaelgsharp Nov 1, 2024
0e12aef
lightgbm dyld log
michaelgsharp Nov 1, 2024
96d6456
excluding osx x64 from some tests
michaelgsharp Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<HelixPreCommands Condition="$(IsPosixShell)">$(HelixPreCommands);export PATH=$HELIX_CORRELATION_PAYLOAD/$(DotNetCliDestination):$PATH</HelixPreCommands>
<HelixPreCommands Condition="!$(IsPosixShell)">$(HelixPreCommands);set PATH=%HELIX_CORRELATION_PAYLOAD%\$(DotNetCliDestination)%3B%PATH%</HelixPreCommands>

<HelixPreCommands Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">$(HelixPreCommands);export LD_LIBRARY_PATH=/opt/homebrew/opt/mono-libgdiplus/lib;ls /usr/lib;ls $HELIX_WORKITEM_ROOT</HelixPreCommands>
<HelixPreCommands Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('osx'))">$(HelixPreCommands);export LD_LIBRARY_PATH=/opt/homebrew/opt/mono-libgdiplus/lib;ls /usr/lib;ls $HELIX_WORKITEM_ROOT;export KMP_DUPLICATE_LIB_OK=TRUE;export DYLD_PRINT_LIBRARIES=1;otool -L $HELIX_WORKITEM_ROOT/runtimes/osx-x64/native/lib_lightgbm.dylib</HelixPreCommands>

<HelixPreCommands Condition="$(HelixTargetQueues.ToLowerInvariant().Contains('armarch'))">$(HelixPreCommands);sudo apt update;sudo apt-get install libomp-dev libomp5 -y</HelixPreCommands>

Expand All @@ -128,7 +128,7 @@
Command="install_name_tool -change &quot;/usr/local/opt/libomp/lib/libomp.dylib&quot; &quot;@loader_path/libomp.dylib&quot; $(BUILD_SOURCESDIRECTORY)/artifacts/bin/%(ProjectsWithTargetFramework.Filename)/$(BuildConfig)/%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)/libSymSgdNative.dylib" />

<Exec Condition="Exists('$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)\runtimes\osx-x64\native\lib_lightgbm.dylib') AND $(HelixTargetQueues.ToLowerInvariant().Contains('osx'))"
Command="install_name_tool -change &quot;/usr/local/opt/libomp/lib/libomp.dylib&quot; &quot;@loader_path/libomp.dylib&quot; $(BUILD_SOURCESDIRECTORY)/artifacts/bin/%(ProjectsWithTargetFramework.Filename)/$(BuildConfig)/%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)/runtimes/osx-x64/native/lib_lightgbm.dylib" />
Command="install_name_tool -change &quot;/usr/local/opt/libomp/lib/libomp.dylib&quot; &quot;@rpath/libomp.dylib&quot; $(BUILD_SOURCESDIRECTORY)/artifacts/bin/%(ProjectsWithTargetFramework.Filename)/$(BuildConfig)/%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)/runtimes/osx-x64/native/lib_lightgbm.dylib" />

<Exec Condition="Exists('$(BUILD_SOURCESDIRECTORY)\artifacts\bin\%(ProjectsWithTargetFramework.Filename)\$(BuildConfig)\%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)\runtimes\osx-x64\native\libonnxruntime.dylib') AND $(HelixTargetQueues.ToLowerInvariant().Contains('osx'))"
Command="install_name_tool -change &quot;/usr/local/opt/libomp/lib/libomp.dylib&quot; &quot;@loader_path/libomp.dylib&quot; $(BUILD_SOURCESDIRECTORY)/artifacts/bin/%(ProjectsWithTargetFramework.Filename)/$(BuildConfig)/%(ProjectsWithTargetFramework.TargetFrameworks)$(PublishFolder)/runtimes/osx-x64/native/libonnxruntime.dylib" />
Expand Down
3 changes: 3 additions & 0 deletions test/Microsoft.ML.TestFrameworkCommon/Attributes/NativeDependencyFactAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ public NativeDependencyFactAttribute(string library) : base($"This test requires
/// <inheritdoc />
protected override bool IsEnvironmentSupported()
{
// Starting to drop native support for X64 OSX since intel no longer makes them.
if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.OSX) && System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.X64)
return false;
return NativeLibrary.NativeLibraryExists(_library);
}
}
Expand Down
3 changes: 3 additions & 0 deletions test/Microsoft.ML.TestFrameworkCommon/Attributes/NativeDependencyTheoryAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ public NativeDependencyTheoryAttribute(string library) : base($"This test requir
/// <inheritdoc />
protected override bool IsEnvironmentSupported()
{
// Starting to drop native support for X64 OSX since intel no longer makes them.
if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.OSX) && System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.X64)
return false;
return NativeLibrary.NativeLibraryExists(_library);
}
}
Expand Down
14 changes: 12 additions & 2 deletions test/Microsoft.ML.TestFrameworkCommon/Utility/NativeLibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static bool NativeLibraryExists(string name)
string extension = default;
string prefix = "lib";

if (Environment.OSVersion.Platform == PlatformID.MacOSX)
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
extension = ".dylib";
else if (Environment.OSVersion.Platform == PlatformID.Unix)
extension = ".so";
Expand All @@ -43,7 +43,17 @@ public static bool NativeLibraryExists(string name)
}
catch
{
return false;
// If that didn't load, dispose of the first attempt and try appending lib_ in front
try
{
nativeLibrary?.Dispose();
nativeLibrary = new NativeLibrary(prefix + "_" + name + extension);
return true;
}
catch
{
return false;
}
}
}
finally
Expand Down
4 changes: 4 additions & 0 deletions test/Microsoft.ML.TestFrameworkCommon/Utility/PathResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ private bool TryLocateNativeAssetFromDeps(string name, out string appLocalNative

List<string> allRIDs = new List<string>();
allRIDs.Add(currentRID);
if (currentRID.Contains("arm64"))
{
allRIDs.Add("osx-arm64");
}
if (!AddFallbacks(allRIDs, currentRID, defaultContext.RuntimeGraph))
{
#pragma warning disable MSML_ParameterLocalVarName // Parameter or local variable name not standard
Expand Down
Loading