Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Pybuffer #1195

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 8 commits into from
Aug 7, 2020
Merged

Pybuffer #1195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac997a9
Add Python buffer api support
thesn10 Oct 27, 2019
def2cc2
Update finalizer
thesn10 May 23, 2020
8237e87
Update finalizer 2
thesn10 May 29, 2020
edd849f
bring back pyversionnumber but leave it internal
koubaa Aug 1, 2020
7b30cfa
remove 3.5 checks
koubaa Aug 1, 2020
1e82ee8
use sys version info with C API
koubaa Aug 1, 2020
d201197
Use System.Version
koubaa Aug 2, 2020
0ed417c
compare full version
koubaa Aug 7, 2020
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
Prev Previous commit
Next Next commit
Use System.Version
  • Loading branch information
@koubaa
koubaa committed Aug 2, 2020
commit d2011972a267cc10d3f42c61da9a83e81ce3799b
8 changes: 4 additions & 4 deletions src/runtime/pybuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private static char OrderStyleToChar(BufferOrderStyle order, bool eitherOneValid
/// </summary>
public static long SizeFromFormat(string format)
{
if (Runtime.pyversionnumber < 39)
if (Runtime.PyVersion.Minor < 9)
throw new NotSupportedException("SizeFromFormat requires at least Python 3.9");
return (long)Runtime.PyBuffer_SizeFromFormat(format);
}
Expand All @@ -111,7 +111,7 @@ public IntPtr GetPointer(long[] indices)
{
if (disposedValue)
throw new ObjectDisposedException(nameof(PyBuffer));
if (Runtime.pyversionnumber < 37)
if (Runtime.PyVersion.Minor < 7)
throw new NotSupportedException("GetPointer requires at least Python 3.7");
return Runtime.PyBuffer_GetPointer(ref _view, indices.Select(x => (IntPtr)x).ToArray());
}
Expand All @@ -123,7 +123,7 @@ public void FromContiguous(IntPtr buf, long len, BufferOrderStyle fort)
{
if (disposedValue)
throw new ObjectDisposedException(nameof(PyBuffer));
if (Runtime.pyversionnumber < 37)
if (Runtime.PyVersion.Minor < 7)
throw new NotSupportedException("FromContiguous requires at least Python 3.7");

if (Runtime.PyBuffer_FromContiguous(ref _view, buf, (IntPtr)len, OrderStyleToChar(fort, false)) < 0)
Expand All @@ -139,7 +139,7 @@ public void ToContiguous(IntPtr buf, BufferOrderStyle order)
{
if (disposedValue)
throw new ObjectDisposedException(nameof(PyBuffer));
if (Runtime.pyversionnumber < 36)
if (Runtime.PyVersion.Minor < 6)
throw new NotSupportedException("ToContiguous requires at least Python 3.6");

if (Runtime.PyBuffer_ToContiguous(buf, ref _view, _view.len, OrderStyleToChar(order, true)) < 0)
Expand Down
5 changes: 3 additions & 2 deletions src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,15 @@ public class Runtime

private static PyReferenceCollection _pyRefs = new PyReferenceCollection();

internal static int pyversionnumber
internal static Version PyVersion
{
get
{
var versionTuple = new PyTuple(PySys_GetObject("version_info"));
var major = versionTuple[0].As<int>();
var minor = versionTuple[1].As<int>();
return major * 10 + minor;
var micro = versionTuple[2].As<int>();
return new Version(major, minor, micro);
}
}

Expand Down