saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-16 21:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove NETSTANDARD1.1 moniker and NETSTD1.1 specific code (#16018)

Browse source 
### Description

Remove NETSTANDARD1.1 moniker and NETSTD1.1 specific code. We no longer
target this platform.

### Motivation and Context
NETSTANDARD1.1 target constraints the development and the modern
libraries we would like to use in the code while it is apparently no
longer required by customers.
This commit is contained in:
Dmitri Smirnov 2023-05-22 17:33:46 -07:00 committed by GitHub
parent d35361bf9d
commit 684e900e96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
View file

@ -21,7 +21,7 @@
-->
<PropertyGroup>
<SelectedTargets>PreNet6</SelectedTargets>
<BaseTargets>netstandard1.1;netstandard2.0;netcoreapp3.1;net6.0</BaseTargets>
<BaseTargets>netstandard2.0;netcoreapp3.1;net6.0</BaseTargets>
</PropertyGroup>
<!-- only set the Xamarin mobile targets if we're building an ORT package,
@ -305,7 +305,7 @@
Visible="false"
/>
<None Include="targets\netstandard\$(PackageId).targets"
PackagePath="build\netstandard1.1\$(PackageId).targets;build\netstandard2.0\$(PackageId).targets"
PackagePath="build\netstandard2.0\$(PackageId).targets"
Pack="true"
Visible="false"
/>

26
csharp/src/Microsoft.ML.OnnxRuntime/NativeOnnxValueHelper.shared.cs
View file

@ -49,16 +49,6 @@ namespace Microsoft.ML.OnnxRuntime
// We throw here, because we are expecting the caller to properly calculate and allocate the right size buffer
unsafe
{
#if NETSTANDARD1_1
var utf8Bytes = (s.Length != 0) ? Encoding.UTF8.GetBytes(s) : ArrayUtilities.GetEmpty<byte>();
if (totalBytesToWrite != utf8Bytes.Length)
{
throw new OnnxRuntimeException(ErrorCode.RuntimeException,
$"Failed to convert to UTF8. Expected bytes: {totalBytesToWrite}, converted to UTF-8: {utf8Bytes.Length}");
}
Span<byte> destination = new Span<byte>((ptr).ToPointer(), utf8Bytes.Length);
utf8Bytes.AsSpan(0, utf8Bytes.Length).CopyTo(destination);
#else
fixed (char* c = s) // create char pointer to start of managed string.
{
var nativeBytes = (byte*)ptr; // get managed byte* from native intptr
@ -69,7 +59,6 @@ namespace Microsoft.ML.OnnxRuntime
$"Failed to convert to UTF8. Expected bytes: {totalBytesToWrite}, written: {bytesWritten}");
}
}
#endif
}
}
@ -93,15 +82,8 @@ namespace Microsoft.ML.OnnxRuntime
{
return string.Empty;
}
#if NETSTANDARD1_1
var src = new Span<byte>((nativeUtf8).ToPointer(), len);
byte[] buffer = new byte[len];
src.CopyTo(buffer);
return Encoding.UTF8.GetString(buffer, 0, buffer.Length);
#else
var nativeBytes = (byte*)nativeUtf8;
return Encoding.UTF8.GetString(nativeBytes, len);
#endif
}
}
finally
@ -146,16 +128,8 @@ namespace Microsoft.ML.OnnxRuntime
var dest = new Span<byte>((utf8).ToPointer(), len + 1);
src.CopyTo(dest);
dest[len] = 0;
#if NETSTANDARD1_1
// For .NET Standard 1.1, we need to copy the bytes to a managed buffer
// before conversion
byte[] buffer = new byte[len];
src.CopyTo(buffer);
str = Encoding.UTF8.GetString(buffer, 0, len);
#else
var nativeBytes = (byte*)nativeUtf8;
str = Encoding.UTF8.GetString(nativeBytes, len);
#endif
}
catch (Exception)
{