M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Рефакторинг конструкторов объектов тестирования.

Browse Source
This commit is contained in:
02090095
2024-10-01 17:33:08 +03:00
parent b89283fc91
commit d18eb3327e
44 changed files with 1048 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
View File

@@ -1,7 +1,9 @@
package TestingSystem.DVM.DVMTasks;
import Common.Utils.Utils;
import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import TestingSystem.DVM.DVMSettings.DVMSettings;
import com.google.gson.annotations.Expose;
import java.util.List;
@@ -10,14 +12,6 @@ public class DVMCompilationTask extends DVMTask {
@Expose
public List<DVMRunTask> runTasks = new Vector<>();
//-
public DVMCompilationTask(DVMConfiguration configuration,
Group group,
Test test,
String flags_in
) {
super(configuration, group, test, flags_in);
maxtime = configuration.c_maxtime;
}
public DVMCompilationTask() {
}
@@ -30,4 +24,51 @@ public class DVMCompilationTask extends DVMTask {
res.add(arg.toString().replace("\n", "|")); //4
return res;
}
//--
public static String checkFlags(String flags_in) {
if (!flags_in.contains("-shared-dvm")) {
if (flags_in.isEmpty())
return "-shared-dvm";
else return flags_in + " -shared-dvm";
} else
return flags_in;
}
public static String checkEnvironments(String environmentsSet_in) {
if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
if (environmentsSet_in.isEmpty())
return "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
else
return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils.DQuotes("1");
} else
return environmentsSet_in;
}
//--
public DVMCompilationTask(DVMConfiguration configuration, DVMSettings dvmSettings, Group group, Test test, int kernels_in){
super (configuration, group, test,checkFlags(dvmSettings.flags));
Vector<String> matrixes = dvmSettings.getMatrixes(test.max_dim);
String checkedEnvironments = checkEnvironments(dvmSettings.environments);
if (dvmSettings.flags.trim().equalsIgnoreCase("-s")) {
runTasks.add(new DVMRunTask(
configuration,
dvmSettings,
group,
test,
"",
flags,
checkedEnvironments,
kernels_in
));
} else
for (String matrix : matrixes) {
runTasks.add(new DVMRunTask(
configuration,
dvmSettings,
group,
test,
matrix,
flags,
checkedEnvironments,
kernels_in));
}
}
}

12
src/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -8,6 +8,7 @@ import TestingSystem.Common.Group.Group;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import TestingSystem.DVM.DVMSettings.DVMSettings;
import com.google.gson.annotations.Expose;
import java.io.File;
@@ -40,11 +41,10 @@ public class DVMRunTask extends DVMTask {
public TaskState compilation_state = TaskState.Waiting;
@Expose
public double compilation_time = 0.0;
public DVMRunTask(DVMConfiguration configuration,
public DVMRunTask(DVMConfiguration configuration, DVMSettings settings,
Group group, Test test,
String matrix_in, String flags_in,
String environments_in,
String par_in,
int kernels_in
) {
super(configuration, group, test, flags_in);
@@ -53,12 +53,12 @@ public class DVMRunTask extends DVMTask {
compilation_maxtime = configuration.c_maxtime;
compilation_state = TaskState.Waiting;
//инфа о запуске
cube = configuration.cube;
min_dim = configuration.max_dim_proc_count;
max_dim = configuration.max_dim_proc_count;
cube = settings.cube;
min_dim = settings.max_dim_proc_count;
max_dim = settings.max_dim_proc_count;
maxtime = configuration.maxtime;
environments = environments_in;
usr_par = par_in;
usr_par = settings.getParamsText();
args = test.args;
//---------
matrix = matrix_in;