merge from giga

2025-09-19 00:30:02 +08:00
parent 36f8fb1107 8007eee846
commit aded199bc6
40 changed files with 732 additions and 272 deletions
@@ -59,17 +59,26 @@ namespace StgSharp
        {
            try
            {
+<<<<<<< HEAD
                World.Init();

                TestMatrixParallel();

                // 原有的矩阵测试代码
+=======
+                MatrixParallelThreadTest.TestMatrixParallelThreadScheduling();
+                /*
+>>>>>>> 8007eee8461498a85a9515e8fd076f03cb552b64
                HybridLayerSegregatedFitAllocator hlsf = new HybridLayerSegregatedFitAllocator(64 * 400 * 400);

                Matrix<float> m = Matrix<float>.FromHlsf(400, 200, hlsf);

                int i = 0, ii = 0;
+<<<<<<< HEAD
                foreach (Segment lines in m.GetRowEnumeration())
+=======
+                foreach (MatrixSegment lines in m.GetRowEnumeration())
+>>>>>>> 8007eee8461498a85a9515e8fd076f03cb552b64
                {
                    i = 0;
                    foreach (MatrixKernel* item in lines)
@@ -80,6 +89,7 @@ namespace StgSharp
                    ii++;
                    Console.WriteLine($"============================{ii}");
                }
+                /**/
            }
            catch (Exception ex)
            {