youmuliu/stgsharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove branch conflict

Browse Source
This commit is contained in:
Nitload
2025-12-21 23:20:56 +08:00
parent cffe44772e
commit ca5fc9a3f5
13 changed files with 17 additions and 1058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
StgSharp.Mathematics/Numeric/MatrixParallelThread.cs
-53
View File
@@ -1,12 +1,4 @@
<<<<<<< HEAD
<<<<<<< HEAD
//-----------------------------------------------------------------------
=======
//-----------------------------------------------------------------------
>>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
=======
//-----------------------------------------------------------------------
>>>>>>> stgsharp-dev/giga
// -----------------------------------------------------------------------
// file="MatrixParallelThread"
// Project: StgSharp
@@ -120,41 +112,6 @@ namespace StgSharp.Mathematics.Numeric
break;
}
break;
<<<<<<< HEAD
case MatrixOperationStyle.KERNEL_OP:
switch (p->ComputeMode.ParameterStyle)
{
case MatrixOperationParam.RIGHT_ANS_PARAM:
<<<<<<< HEAD
MatrixComputeModel.KernelComputeUnary(p);
break;
case MatrixOperationParam.RIGHT_ANS_SCALAR_PARAM:
MatrixComputeModel.KernelComputeUnaryScalar(p);
break;
case MatrixOperationParam.LEFT_RIGHT_ANS_PARAM:
MatrixComputeModel.KernelComputeBinary(p);
break;
case MatrixOperationParam.LEFT_RIGHT_ANS_SCALAR_PARAM:
MatrixComputeModel.KernelComputeBinaryScalar(p);
=======
MatrixComputeModel.Compute_Unary(p);
break;
case MatrixOperationParam.RIGHT_ANS_SCALAR_PARAM:
MatrixComputeModel.Compute_UnaryScalar(p);
break;
case MatrixOperationParam.LEFT_RIGHT_ANS_PARAM:
MatrixComputeModel.Compute_Binary(p);
break;
case MatrixOperationParam.LEFT_RIGHT_ANS_SCALAR_PARAM:
MatrixComputeModel.Compute_BinaryScalar(p);
>>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
break;
default:
break;
}
break;
=======
>>>>>>> stgsharp-dev/giga
default:
break;
}
@@ -426,19 +383,9 @@ namespace StgSharp.Mathematics.Numeric
private static extern IntPtr GetCurrentThread();
[DllImport("kernel32.dll")]
<<<<<<< HEAD
<<<<<<< HEAD
private static extern nuint SetThreadAffinityMask(
IntPtr hThread,
nuint dwThreadAffinityMask);
=======
private static extern nuint SetThreadAffinityMask(IntPtr hThread, nuint dwThreadAffinityMask);
>>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
=======
private static extern nuint SetThreadAffinityMask(
IntPtr hThread,
nuint dwThreadAffinityMask);
>>>>>>> stgsharp-dev/giga
[LibraryImport("kernel32.dll")]
[return: MarshalAs(UnmanagedType.Bool)]