This commit is contained in:
2023-12-08 19:03:54 +03:00
parent f86e4d8109
commit 033d33dce0
3 changed files with 21 additions and 4 deletions

2
.idea/workspace.xml generated
View File

@@ -8,7 +8,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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$/.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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -25,7 +25,7 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
File res; File res;
VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор папки для сохранения таблицы Excel"); VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор папки для сохранения таблицы Excel");
//--- //---
final int max_columns = 13; final int max_columns = 16;
Vector<CellStyle> styles; Vector<CellStyle> styles;
//-- //--
//-- //--
@@ -138,6 +138,16 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
style.setBorderRight(border); style.setBorderRight(border);
style.setBorderTop(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 @Override
protected void body() throws Exception { protected void body() throws Exception {
File file = Utils.getTempFileName("table"); File file = Utils.getTempFileName("table");
@@ -197,6 +207,9 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
"Сборка", "Сборка",
"Запуск", "Запуск",
"Матрица", "Матрица",
"NUM_THREADS",
"NUM_CUDAS",
"TOTAL_THREADS",
"Окружение", "Окружение",
"usr.par", "usr.par",
"Время компиляции (с)", "Время компиляции (с)",
@@ -215,6 +228,9 @@ public class ExportTasksPackageToExcel extends Pass_2021<TasksPackage> {
task.compilation_state, task.compilation_state,
task.state, task.state,
task.matrix, task.matrix,
getNumThreads(task),
getNumCudas(task),
getTotalThreads(task),
task.environments, task.environments,
task.usr_par, task.usr_par,
task.compilation_time, task.compilation_time,

View File

@@ -105,6 +105,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
Vector<String> matrixes = configuration.getMatrixes(test.max_dim); Vector<String> matrixes = configuration.getMatrixes(test.max_dim);
Vector<String> environments = configuration.getEnvironments(); Vector<String> environments = configuration.getEnvironments();
for (String environmentSet : environments) { for (String environmentSet : environments) {
String checkedEnvironments = checkEnvironments(environmentSet);
if (flags.trim().equalsIgnoreCase("-s")) { if (flags.trim().equalsIgnoreCase("-s")) {
testCompilationTask.runTasks.add(new TestRunTask( testCompilationTask.runTasks.add(new TestRunTask(
configuration, configuration,
@@ -112,7 +113,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
test, test,
"", "",
checked_flags, checked_flags,
environmentSet, checkedEnvironments,
configuration.getParamsText() configuration.getParamsText()
)); ));
} else } else
@@ -123,7 +124,7 @@ public class StartTests extends PublishServerAccountObject<TasksPackage> {
test, test,
matrix, matrix,
checked_flags, checked_flags,
environmentSet, checkedEnvironments,
configuration.getParamsText())); configuration.getParamsText()));
} }
} }