remove branch conflict

2025-12-21 23:20:56 +08:00
parent cffe44772e
commit ca5fc9a3f5
13 changed files with 17 additions and 1058 deletions
@@ -1,16 +1,4 @@
-<<<<<<< HEAD
 //-----------------------------------------------------------------------
-=======
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
-//-----------------------------------------------------------------------
-=======
-//-----------------------------------------------------------------------
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-//-----------------------------------------------------------------------
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
->>>>>>> stgsharp-dev/giga
 // -----------------------------------------------------------------------
 // file="MatrixCompute"
 // Project: StgSharp
@@ -37,57 +25,24 @@
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
-<<<<<<< HEAD
-using System;
-using System.Collections.Generic;
-using System.Linq;
-=======
 using StgSharp.Collections;
 using StgSharp.HighPerformance;
 using StgSharp.Internal;
 using System;
 using System.Collections.Generic;
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
 using System.ComponentModel.DataAnnotations.Schema;
-=======
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-using System.ComponentModel.DataAnnotations.Schema;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
 using System.Linq;
 using System.Numerics;
 using System.Security.AccessControl;
->>>>>>> stgsharp-dev/giga
 using System.Text;
 using System.Threading.Tasks;

 namespace StgSharp.Mathematics.Numeric
 {
-<<<<<<< HEAD
-    public static partial class MatrixCompute { }
-=======
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
    public static partial class MatrixCompute
    {

        public static unsafe void Add(Matrix<float> left, Matrix<float> right, Matrix<float> ans)
-=======
-    public static class MatrixCompute
-    {
-
-        public static unsafe Matrix<float> Add(
-                                           Matrix<float> left,
-                                           Matrix<float> right,
-                                           Matrix<float> ans)
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-    public static partial class MatrixCompute
-    {
-
-        public static unsafe void Add(Matrix<float> left, Matrix<float> right, Matrix<float> ans)
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
        {
            if (left.ColumnLength != right.ColumnLength ||
                left.RowLength != right.RowLength ||
@@ -102,16 +57,7 @@ namespace StgSharp.Mathematics.Numeric
                MatrixKernel<float>* rightPtr = right.Buffer;
                MatrixKernel<float>* ansPtr = ans.Buffer;
                NativeIntrinsic.Intrinsic.f32_buffer_add(leftPtr, rightPtr, ansPtr, count);
-
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
                return;
-=======
-                return ans;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-                return;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
            } else if (count <= 1024)
            {
                MatrixParallelThread[] pool = MatrixParallel.LeadParallel(1);
@@ -122,49 +68,21 @@ namespace StgSharp.Mathematics.Numeric
                NativeIntrinsic.Intrinsic.f32_buffer_add(leftPtr, rightPtr, ansPtr, count);

                MatrixParallel.ReturnParallelResources(ref pool);
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
                return;
-=======
-                return ans;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-                return;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
            }
            MatrixParallelTaskPackage* package = MatrixParallelFactory.CreateBaseTask<float>();
            package->Left = (nint)left.Buffer;
            package->Right = (nint)right.Buffer;
            package->Answer = (nint)ans.Buffer;
            package->ElementSize = sizeof(float);
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
-            package->PrimCount = ans.KernelColumnLength;
-            package->SecCount = ans.KernelRowLength;
-=======
-            package->PrimCount = left.KernelColumnLength;
-            package->SecCount = left.KernelRowLength;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-            package->ComputeMode = new MatrixOpMode(MatrixOperationStyle.BUFFER_OP, MatrixOperationParam.LEFT_RIGHT_ANS_PARAM);
-========
            package->PrimCount = ans.KernelColumnLength;
            package->SecCount = ans.KernelRowLength;
            package->ComputeMode = new MatrixOpMode(MatrixIndexStyle.BUFFER_INDEX, MatrixOperationParam.LEFT_RIGHT_ANS_PARAM);
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
            package->ComputeHandle = (IntPtr)NativeIntrinsic.Intrinsic.f32_buffer_add;
            MatrixParallelHandle taskGroup = MatrixParallel.ScheduleTask(package);

            MatrixParallel.LaunchParallel(taskGroup, SleepMode.DeepSleep);
            taskGroup.Dispose();
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
-            return;
-=======
-            return ans;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-            return;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
        }

        public static unsafe void Fill(Matrix<float> ans, float value)
@@ -197,89 +115,7 @@ namespace StgSharp.Mathematics.Numeric
            taskGroup.Dispose();
        }

-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
        public static unsafe void Mul(Matrix<float> left, Matrix<float> right, Matrix<float> ans)
-        {
-            // For matrix multiplication (left: MxK) * (right: KxN) => ans: MxN
-            // ColumnLength = number of columns (N), RowLength = number of rows (M)
-            if (left.ColumnLength != right.RowLength ||
-                ans.ColumnLength != right.ColumnLength ||
-                ans.RowLength != left.RowLength)
-            {
-                throw new IndexOutOfRangeException("Matrix dimensions must agree.");
-            }
-            long count = (long)left.KernelColumnLength * left.KernelRowLength;
-            if (count <= 1024)
-            {
-                MatrixParallelThread[] pool = null;
-                if (count > 256) {
-                    pool = MatrixParallel.LeadParallel(1);
-                }
-                MatrixPanel<float>* leftPanel = MatrixPanel.Create<float>();
-                MatrixPanel<float>* rightPanel = MatrixPanel.Create<float>();
-                MatrixPanel<float>* ansPanel = MatrixPanel.Create<float>();
-                int size = MatrixPanel.KernelSideCount<float>();
-                for (int i = 0; i < left.RowLength; i += size)
-                {
-                    for (int j = 0; j < right.ColumnLength; j += size)
-                    {
-                        NativeIntrinsic.Intrinsic.f32_clear_panel((MatrixPanel*)ansPanel);
-                        for (int k = 0; k < left.ColumnLength; k += size)
-                        {
-                            NativeIntrinsic.Intrinsic
-                                           .f32_build_panel((MatrixKernel*)left.Buffer,
-                                                            (MatrixPanel*)leftPanel,
-                                                            left.ColumnLength, left.RowLength, i,
-                                                            k);
-                            NativeIntrinsic.Intrinsic
-                                           .f32_build_panel((MatrixKernel*)right.Buffer,
-                                                            (MatrixPanel*)rightPanel,
-                                                            right.ColumnLength, right.RowLength, k,
-                                                            j);
-                            NativeIntrinsic.Intrinsic
-                                           .f32_panel_fma((MatrixPanel*)leftPanel,
-                                                            (MatrixPanel*)rightPanel,
-                                                            (MatrixPanel*)ansPanel);
-                        }
-                        NativeIntrinsic.Intrinsic
-                                       .f32_store_panel((MatrixKernel*)ans.Buffer,
-                                                        (MatrixPanel*)ansPanel, ans.ColumnLength,
-                                                        ans.RowLength, i, j);
-                    }
-                }
-                MatrixPanel.Destroy(leftPanel);
-                MatrixPanel.Destroy(rightPanel);
-                MatrixPanel.Destroy(ansPanel);
-                if (count > 256) {
-                    MatrixParallel.ReturnParallelResources(ref pool!);
-                }
-                return;
-            }
-            MatrixParallelTaskPackage* package = MatrixParallelFactory.CreateBaseTask<float>();
-            package->Right = (nint)left.Buffer;
-            package->Result = (nint)ans.Buffer;
-            package->ElementSize = sizeof(float);
-            package->PrimCount = left.KernelColumnLength;
-            package->SecCount = left.KernelRowLength;
-            package->ComputeMode = new MatrixOpMode(MatrixOperationStyle.BUFFER_OP, MatrixOperationParam.RIGHT_ANS_SCALAR_PARAM);
-            package->ComputeHandle = (IntPtr)NativeIntrinsic.Intrinsic.f32_buffer_scalar_mul;
-            MatrixParallelHandle taskGroup = MatrixParallel.ScheduleTask(package);
-
-            MatrixParallel.LaunchParallel(taskGroup, SleepMode.DeepSleep);
-            taskGroup.Dispose();
-            return;
-        }
-
-        public static unsafe void Mul(Matrix<float> left, float right, Matrix<float> ans)
-=======
-        public static unsafe Matrix<float> Mul(
-                                           Matrix<float> left,
-                                           Matrix<float> right,
-                                           Matrix<float> ans)
-========
-        public static unsafe void Mul(Matrix<float> left, Matrix<float> right, Matrix<float> ans)
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
        {
            // For matrix multiplication (left: MxK) * (right: KxN) => ans: MxN
            // ColumnLength = number of columns (N), RowLength = number of rows (M)
@@ -357,12 +193,7 @@ namespace StgSharp.Mathematics.Numeric
            return;
        }

-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-        public static unsafe Matrix<float> Mul(Matrix<float> left, float right, Matrix<float> ans)
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
        public static unsafe void Mul(Matrix<float> left, float right, Matrix<float> ans)
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
        {
            if (left.ColumnLength != ans.ColumnLength || left.RowLength != ans.RowLength) {
                throw new IndexOutOfRangeException("Matrix dimensions must agree.");
@@ -375,16 +206,7 @@ namespace StgSharp.Mathematics.Numeric
                MatrixKernel<float>* leftPtr = left.Buffer;
                MatrixKernel<float>* ansPtr = ans.Buffer;
                NativeIntrinsic.Intrinsic.f32_buffer_scalar_mul(leftPtr, ansPtr, scalar, count);
-
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
                return;
-=======
-                return ans;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-                return;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
            } else if (count <= 1024)
            {
                MatrixParallelThread[] pool = MatrixParallel.LeadParallel(1);
@@ -394,15 +216,7 @@ namespace StgSharp.Mathematics.Numeric
                NativeIntrinsic.Intrinsic.f32_buffer_scalar_mul(leftPtr, ansPtr, scalar, count);

                MatrixParallel.ReturnParallelResources(ref pool);
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
                return;
-=======
-                return ans;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-                return;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
            }
            MatrixParallelTaskPackage* package = MatrixParallelFactory.CreateBaseTask<float>();
            package->Right = (nint)left.Buffer;
@@ -418,27 +232,10 @@ namespace StgSharp.Mathematics.Numeric
            MatrixParallel.LaunchParallel(taskGroup, SleepMode.DeepSleep);
            taskGroup.Dispose();
            MatrixParallelFactory.Release(scalar);
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
            return;
        }

        public static unsafe void Sub(Matrix<float> left, Matrix<float> right, Matrix<float> ans)
-=======
-            return ans;
-        }
-
-        public static unsafe Matrix<float> Sub(
-                                           Matrix<float> left,
-                                           Matrix<float> right,
-                                           Matrix<float> ans)
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-            return;
-        }
-
-        public static unsafe void Sub(Matrix<float> left, Matrix<float> right, Matrix<float> ans)
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
        {
            if (left.ColumnLength != right.ColumnLength ||
                left.RowLength != right.RowLength ||
@@ -453,16 +250,7 @@ namespace StgSharp.Mathematics.Numeric
                MatrixKernel<float>* rightPtr = right.Buffer;
                MatrixKernel<float>* ansPtr = ans.Buffer;
                NativeIntrinsic.Intrinsic.f32_buffer_sub(leftPtr, rightPtr, ansPtr, count);
-
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
                return;
-=======
-                return ans;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-                return;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
            } else if (count <= 1024)
            {
                MatrixParallelThread[] pool = MatrixParallel.LeadParallel(1);
@@ -473,15 +261,7 @@ namespace StgSharp.Mathematics.Numeric
                NativeIntrinsic.Intrinsic.f32_buffer_sub(leftPtr, rightPtr, ansPtr, count);

                MatrixParallel.ReturnParallelResources(ref pool);
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
                return;
-=======
-                return ans;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-                return;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
            }
            MatrixParallelTaskPackage* package = MatrixParallelFactory.CreateBaseTask<float>();
            package->Left = (nint)left.Buffer;
@@ -496,17 +276,7 @@ namespace StgSharp.Mathematics.Numeric

            MatrixParallel.LaunchParallel(taskGroup, SleepMode.DeepSleep);
            taskGroup.Dispose();
-<<<<<<<< HEAD:StgSharp.Mathematics/Numeric/MatrixCompute.Basic.cs
-<<<<<<< HEAD
-            return;
-=======
-            return ans;
->>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
-========
-            return;
->>>>>>>> stgsharp-dev/giga:StgSharp.Mathematics/Numeric/MatrixCompute.cs
        }

    }
->>>>>>> stgsharp-dev/giga
 }