buffer op and parallel framework is now on full complete
This commit is contained in:
@@ -38,95 +38,109 @@ namespace StgSharp.Collections
|
|||||||
{
|
{
|
||||||
|
|
||||||
private readonly T[] _values;
|
private readonly T[] _values;
|
||||||
|
|
||||||
|
// _index points to the next free slot (top empty position). Therefore Count == _index.
|
||||||
private int _index;
|
private int _index;
|
||||||
|
|
||||||
public CapacityFixedStack(int size)
|
public CapacityFixedStack(int size)
|
||||||
{
|
{
|
||||||
|
ArgumentOutOfRangeException.ThrowIfNegative(size);
|
||||||
_values = new T[size];
|
_values = new T[size];
|
||||||
_index = -1;
|
_index = 0; // empty stack
|
||||||
}
|
}
|
||||||
|
|
||||||
public T? First => Volatile.Read(ref _index) > 0 ? _values[0] : default;
|
public T? First => Volatile.Read(ref _index) > 0 ? _values[0] : default;
|
||||||
|
|
||||||
public bool IsEmpty => _index == -1;
|
public bool IsEmpty => Volatile.Read(ref _index) == 0;
|
||||||
|
|
||||||
public int Count => _index + 1;
|
public int Count => Volatile.Read(ref _index);
|
||||||
|
|
||||||
public int Capacity => _values.Length;
|
public int Capacity => _values.Length;
|
||||||
|
|
||||||
public ReadOnlySpan<T> AsSpan()
|
public ReadOnlySpan<T> AsSpan() => _values.AsSpan(0, _index);
|
||||||
{
|
|
||||||
return _values.AsSpan(0, _index + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Clear()
|
public void Clear()
|
||||||
{
|
{
|
||||||
Array.Clear(_values, 0, _values.Length);
|
if (_index > 0)
|
||||||
_index = -1;
|
{
|
||||||
|
Array.Clear(_values, 0, _index);
|
||||||
|
_index = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public IEnumerator<T> GetEnumerator()
|
public IEnumerator<T> GetEnumerator()
|
||||||
{
|
{
|
||||||
for (int i = _index; i >= 0; i--) {
|
for (int i = _index - 1; i >= 0; i--) {
|
||||||
yield return _values[i];
|
yield return _values[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public T Peek()
|
public T Peek()
|
||||||
{
|
{
|
||||||
return _index >= 0 ? _values[_index] : throw new InvalidOperationException("Stack is empty.");
|
if (_index == 0) {
|
||||||
|
throw new InvalidOperationException("Stack is empty.");
|
||||||
|
}
|
||||||
|
return _values[_index - 1];
|
||||||
}
|
}
|
||||||
|
|
||||||
public T Pop()
|
public T Pop()
|
||||||
{
|
{
|
||||||
if (_index >= 0)
|
if (_index == 0) {
|
||||||
{
|
|
||||||
T item = _values[_index];
|
|
||||||
_index--;
|
|
||||||
return item;
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException("Stack is empty.");
|
throw new InvalidOperationException("Stack is empty.");
|
||||||
}
|
}
|
||||||
|
_index--;
|
||||||
|
T item = _values[_index];
|
||||||
|
_values[_index] = default!; // Clear reference for GC
|
||||||
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
public T[] PopRange(int count)
|
public T[] PopRange(int count)
|
||||||
{
|
{
|
||||||
int i = int.Min(count, _index);
|
if (count <= 0 || _index == 0) {
|
||||||
_index -= i;
|
return Array.Empty<T>();
|
||||||
return _values[0..i];
|
}
|
||||||
|
int n = Math.Min(count, _index);
|
||||||
|
int start = _index - n;
|
||||||
|
T[] ret = new T[n];
|
||||||
|
Array.Copy(_values, start, ret, 0, n);
|
||||||
|
Array.Clear(_values, start, n);
|
||||||
|
_index -= n;
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Push(T item)
|
public void Push(T item)
|
||||||
{
|
{
|
||||||
_values[++_index] = _index < _values.Length ? item : throw new InvalidOperationException("Stack is full.");
|
if (_index >= _values.Length) {
|
||||||
|
throw new InvalidOperationException("Stack is full.");
|
||||||
|
}
|
||||||
|
_values[_index] = item;
|
||||||
|
_index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PushRange(ReadOnlySpan<T> span)
|
public void PushRange(ReadOnlySpan<T> span)
|
||||||
{
|
{
|
||||||
if (_index + span.Length >= _values.Length) {
|
if (span.Length == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (_index + span.Length > _values.Length) {
|
||||||
throw new InvalidOperationException("Not enough space in the stack to push the entire span.");
|
throw new InvalidOperationException("Not enough space in the stack to push the entire span.");
|
||||||
}
|
}
|
||||||
|
span.CopyTo(_values.AsSpan(_index, span.Length));
|
||||||
Span<T> sp = _values.AsSpan(_index + 1, span.Length);
|
|
||||||
span.CopyTo(sp);
|
|
||||||
_index += span.Length;
|
_index += span.Length;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool TryPop(out T value)
|
public bool TryPop(out T value)
|
||||||
{
|
{
|
||||||
if (_index >= 0)
|
if (_index == 0)
|
||||||
{
|
|
||||||
T item = _values[_index];
|
|
||||||
_index--;
|
|
||||||
value = item;
|
|
||||||
return true;
|
|
||||||
} else
|
|
||||||
{
|
{
|
||||||
value = default!;
|
value = default!;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
_index--;
|
||||||
|
value = _values[_index];
|
||||||
|
_values[_index] = default!;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
@@ -148,7 +162,7 @@ namespace StgSharp.Collections
|
|||||||
public static CapacityFixedStack<T> Create<T>(ReadOnlySpan<T> values)
|
public static CapacityFixedStack<T> Create<T>(ReadOnlySpan<T> values)
|
||||||
{
|
{
|
||||||
CapacityFixedStack<T> stack = new(values.Length);
|
CapacityFixedStack<T> stack = new(values.Length);
|
||||||
stack.PushRange(values);
|
stack.PushRange(values); // Push in order
|
||||||
return stack;
|
return stack;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -92,6 +92,11 @@ namespace StgSharp.Mathematics.Numeric
|
|||||||
return ref kernel[c, r];
|
return ref kernel[c, r];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
~GCMatrix()
|
||||||
|
{
|
||||||
|
NativeMemory.AlignedFree(_buffer);
|
||||||
|
}
|
||||||
|
|
||||||
#region enumeration
|
#region enumeration
|
||||||
|
|
||||||
public override unsafe MatrixSegmentEnumeration<T> ColumnEnumeration
|
public override unsafe MatrixSegmentEnumeration<T> ColumnEnumeration
|
||||||
|
|||||||
@@ -67,7 +67,8 @@ namespace StgSharp.Mathematics.Numeric
|
|||||||
int primCount = package->PrimCount;
|
int primCount = package->PrimCount;
|
||||||
int secCount = package->SecCount;
|
int secCount = package->SecCount;
|
||||||
long count = (long)primCount * secCount;
|
long count = (long)primCount * secCount;
|
||||||
Console.WriteLine($"amount of kernels is {count}");
|
|
||||||
|
// Console.WriteLine($"amount of kernels is {count}");
|
||||||
|
|
||||||
long recommendCount = count / 1024;
|
long recommendCount = count / 1024;
|
||||||
MatrixParallelThread[] pool = LeadParallel((int)recommendCount);
|
MatrixParallelThread[] pool = LeadParallel((int)recommendCount);
|
||||||
@@ -103,9 +104,9 @@ namespace StgSharp.Mathematics.Numeric
|
|||||||
lengthRef = length;
|
lengthRef = length;
|
||||||
wrap.WrapTask.Enqueue((nint) current);
|
wrap.WrapTask.Enqueue((nint) current);
|
||||||
|
|
||||||
Console.WriteLine($"Offset is {offset}");
|
// Console.WriteLine($"Offset is {offset}");
|
||||||
Console.WriteLine($"Scheduling {length} kernels into {wrap.WrapTaskCapacity} threads");
|
// Console.WriteLine($"Scheduling {length} kernels into {wrap.WrapTaskCapacity} threads");
|
||||||
Console.WriteLine();
|
// Console.WriteLine();
|
||||||
current = MatrixParallelFactory.FromExistPackage(current);
|
current = MatrixParallelFactory.FromExistPackage(current);
|
||||||
offset += length;
|
offset += length;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -253,11 +253,11 @@ namespace StgSharp.Mathematics.Numeric
|
|||||||
// Console.WriteLine("worker end");
|
// Console.WriteLine("worker end");
|
||||||
break;
|
break;
|
||||||
case RoleType.Scheduler://scheduler
|
case RoleType.Scheduler://scheduler
|
||||||
Console.WriteLine("scheduler start");
|
// Console.WriteLine("scheduler start");
|
||||||
BindedWrap.PublishTaskToWorkers();
|
BindedWrap.PublishTaskToWorkers();
|
||||||
BindedWrap.SetAllWorker();
|
BindedWrap.SetAllWorker();
|
||||||
|
|
||||||
Console.WriteLine("scheduler done");
|
// Console.WriteLine("scheduler done");
|
||||||
ExecuteTaskPackage(Tasks);
|
ExecuteTaskPackage(Tasks);
|
||||||
BindedWrap.ReportThreadAccomplished();
|
BindedWrap.ReportThreadAccomplished();
|
||||||
BindedWrap.WaitAllWorker();
|
BindedWrap.WaitAllWorker();
|
||||||
@@ -416,7 +416,15 @@ namespace StgSharp.Mathematics.Numeric
|
|||||||
|
|
||||||
internal Queue<IntPtr> Tasks { get; } = [];
|
internal Queue<IntPtr> Tasks { get; } = [];
|
||||||
|
|
||||||
public RoleType Role { get; internal set; }
|
public RoleType Role
|
||||||
|
{
|
||||||
|
get;
|
||||||
|
internal set
|
||||||
|
{
|
||||||
|
// Console.WriteLine($"Thread {_managedThread.ManagedThreadId} set to {value}, from thread {Environment.CurrentManagedThreadId}");
|
||||||
|
field = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public enum RoleType : int
|
public enum RoleType : int
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -141,9 +141,11 @@ namespace StgSharp.Mathematics.Numeric
|
|||||||
|
|
||||||
long offset = 0;
|
long offset = 0;
|
||||||
MatrixParallelTaskPackage* current = package;
|
MatrixParallelTaskPackage* current = package;
|
||||||
|
/*
|
||||||
string msg = $"""
|
string msg = $"""
|
||||||
Total: count={count}, length={Threads.Length}{Environment.NewLine}
|
Total: count={count}, length={Threads.Length}{Environment.NewLine}
|
||||||
""";
|
""";
|
||||||
|
/**/
|
||||||
foreach (MatrixParallelThread thread in pool)
|
foreach (MatrixParallelThread thread in pool)
|
||||||
{
|
{
|
||||||
long wrapTaskLength = actual;
|
long wrapTaskLength = actual;
|
||||||
@@ -155,14 +157,16 @@ namespace StgSharp.Mathematics.Numeric
|
|||||||
ref long lengthRef = ref Unsafe.As<int, long>(ref current->PrimCount);
|
ref long lengthRef = ref Unsafe.As<int, long>(ref current->PrimCount);
|
||||||
lengthRef = length;
|
lengthRef = length;
|
||||||
thread.Tasks.Enqueue((nint)current);
|
thread.Tasks.Enqueue((nint)current);
|
||||||
|
/*
|
||||||
msg += $"""
|
msg += $"""
|
||||||
Slice to thread: total offset={offsetRef} local offset={offset}, length={lengthRef}{Environment.NewLine}
|
Slice to thread: total offset={offsetRef} local offset={offset}, length={lengthRef}{Environment.NewLine}
|
||||||
""";
|
""";
|
||||||
|
/**/
|
||||||
current = MatrixParallelFactory.FromExistPackage(current);
|
current = MatrixParallelFactory.FromExistPackage(current);
|
||||||
offset = length;
|
offset = length;
|
||||||
}
|
}
|
||||||
Console.WriteLine(msg);
|
|
||||||
|
// Console.WriteLine(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PublishKernelTaskToWorkers(MatrixParallelTaskPackage* package)
|
private void PublishKernelTaskToWorkers(MatrixParallelTaskPackage* package)
|
||||||
|
|||||||
@@ -71,15 +71,20 @@ namespace StgSharp
|
|||||||
|
|
||||||
Matrix<float> m = Matrix.FromHlsf<float>(2000, 2000, hlsf);
|
Matrix<float> m = Matrix.FromHlsf<float>(2000, 2000, hlsf);
|
||||||
m.Fill(1.0f);
|
m.Fill(1.0f);
|
||||||
for (int i = 0; i < 20; i++)
|
|
||||||
{
|
Console.WriteLine();
|
||||||
for (int j = 0; j < 20; j++) {
|
|
||||||
Console.Write($"{m[i, j]:0.0E+00} \t");
|
|
||||||
}
|
|
||||||
Console.WriteLine();
|
Console.WriteLine();
|
||||||
}
|
|
||||||
Console.WriteLine();
|
Console.WriteLine();
|
||||||
Matrix<float> n = m.Add(m);
|
Matrix<float> n = m.Add(m);
|
||||||
|
for (int i = 0; i < 5; i++)
|
||||||
|
{
|
||||||
|
for (int j = 0; j < 2; j++)
|
||||||
|
{
|
||||||
|
n = n.Add(m);
|
||||||
|
Console.WriteLine($"{i} {j}");
|
||||||
|
}
|
||||||
|
GC.Collect();
|
||||||
|
}
|
||||||
for (int i = 0; i < 20; i++)
|
for (int i = 0; i < 20; i++)
|
||||||
{
|
{
|
||||||
for (int j = 0; j < 20; j++) {
|
for (int j = 0; j < 20; j++) {
|
||||||
|
|||||||
Reference in New Issue
Block a user