генерация задач с обновленными параметрами.
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
package _VisualDVM.TestingSystem.DVM.DVMTasks;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
|
||||
import com.google.gson.annotations.Expose;
|
||||
|
||||
import java.util.List;
|
||||
@@ -15,10 +13,18 @@ public class DVMCompilationTask extends DVMTask {
|
||||
public DVMCompilationTask() {
|
||||
}
|
||||
//--
|
||||
public DVMCompilationTask(DVMConfiguration configuration, String flags_in, Group group, Test test) {
|
||||
super(configuration, group, test, flags_in);
|
||||
maxtime = configuration.c_maxtime;
|
||||
}
|
||||
/*
|
||||
public DVMCompilationTask(DVMConfiguration configuration, DVMSettings dvmSettings, Group group, Test test, int kernels_in) {
|
||||
super(configuration, group, test, checkFlags(dvmSettings.flags));
|
||||
maxtime = configuration.c_maxtime;
|
||||
Vector<String> matrixes = dvmSettings.getMatrixes(test.max_dim);
|
||||
|
||||
|
||||
|
||||
String checkedEnvironments = checkEnvironments(dvmSettings.environments);
|
||||
if (dvmSettings.flags.trim().equalsIgnoreCase("-s")) {
|
||||
runTasks.add(new DVMRunTask(
|
||||
@@ -44,24 +50,8 @@ public class DVMCompilationTask extends DVMTask {
|
||||
kernels_in));
|
||||
}
|
||||
}
|
||||
*/
|
||||
//--
|
||||
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;
|
||||
}
|
||||
@Override
|
||||
public Vector<String> pack(Object arg) {
|
||||
Vector<String> res = new Vector<>();
|
||||
|
||||
Reference in New Issue
Block a user