From 033d33dce03cb318876c5c5f5e2c7fdecaaddfcf Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 8 Dec 2023 19:03:54 +0300
Subject: [PATCH] fix

---
 .idea/workspace.xml                            |  2 +-
 .../Passes/All/ExportTasksPackageToExcel.java  | 18 +++++++++++++++++-
 src/Visual_DVM_2021/Passes/All/StartTests.java |  5 +++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4e6ff255..a52dee8b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,7 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
index 5b96bd4d..721851ba 100644
--- a/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
+++ b/src/Visual_DVM_2021/Passes/All/ExportTasksPackageToExcel.java
@@ -25,7 +25,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
     File res;
     VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор папки для сохранения таблицы Excel");
     //---
-    final int max_columns = 13;
+    final int max_columns = 16;
     Vector<CellStyle> styles;
     //--
     //--
@@ -138,6 +138,16 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
         style.setBorderRight(border);
         style.setBorderTop(border);
     }
+    protected String getNumThreads(TestRunTask task) {
+        String environmentsSet = task.environments;
+        return "?";
+    }
+    protected String getNumCudas(TestRunTask task) {
+        return "?";
+    }
+    protected String getTotalThreads(TestRunTask task) {
+        return "?";
+    }
     @Override
     protected void body() throws Exception {
         File file = Utils.getTempFileName("table");
@@ -197,6 +207,9 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
                 "Сборка",
                 "Запуск",
                 "Матрица",
+                "NUM_THREADS",
+                "NUM_CUDAS",
+                "TOTAL_THREADS",
                 "Окружение",
                 "usr.par",
                 "Время компиляции (с)",
@@ -215,6 +228,9 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
                     task.compilation_state,
                     task.state,
                     task.matrix,
+                    getNumThreads(task),
+                    getNumCudas(task),
+                    getTotalThreads(task),
                     task.environments,
                     task.usr_par,
                     task.compilation_time,
diff --git a/src/Visual_DVM_2021/Passes/All/StartTests.java b/src/Visual_DVM_2021/Passes/All/StartTests.java
index 5c45023a..c3f1b8a8 100644
--- a/src/Visual_DVM_2021/Passes/All/StartTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartTests.java
@@ -105,6 +105,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
             Vector<String> matrixes = configuration.getMatrixes(test.max_dim);
             Vector<String> environments = configuration.getEnvironments();
             for (String environmentSet : environments) {
+                String checkedEnvironments = checkEnvironments(environmentSet);
                 if (flags.trim().equalsIgnoreCase("-s")) {
                     testCompilationTask.runTasks.add(new TestRunTask(
                             configuration,
@@ -112,7 +113,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
                             test,
                             "",
                             checked_flags,
-                            environmentSet,
+                            checkedEnvironments,
                             configuration.getParamsText()
                     ));
                 } else
@@ -123,7 +124,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
                                 test,
                                 matrix,
                                 checked_flags,
-                                environmentSet,
+                                checkedEnvironments,
                                 configuration.getParamsText()));
                     }
             }