Compare commits
4 Commits
b30f2b8eea
...
planner
| Author | SHA1 | Date | |
|---|---|---|---|
|
a8b15d0eeb | ||
|
|
0e9404982f | ||
| 59060075e8 | |||
| d64f11e856 |
12
.idea/workspace.xml
generated
12
.idea/workspace.xml
generated
@@ -7,17 +7,13 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/CompilationTask_json.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMCompilationPackage_json.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMPackage_json.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/DVMRunPackage_json.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/Task_json.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/json/RunTask_json.java" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
||||
@@ -33,9 +33,9 @@
|
||||
"CompleteRunEnvironments": true,
|
||||
"CreateEthalonTasks": true,
|
||||
"ErasePackageWorkspace": false,
|
||||
"lastMachineId": 13,
|
||||
"lastUserId": 24,
|
||||
"lastCompilerId": 52,
|
||||
"lastMachineId": 1,
|
||||
"lastUserId": 17,
|
||||
"lastCompilerId": 15,
|
||||
"RegisterOn": false,
|
||||
"SpacesOn": false,
|
||||
"EmptyLinesOn": false,
|
||||
|
||||
@@ -4,7 +4,7 @@ import Common.Utils.Vector_;
|
||||
import java.util.Vector;
|
||||
public class Constants {
|
||||
public static final int version = 1266;
|
||||
public static final int planner_version = 24;
|
||||
public static final int planner_version = 26;
|
||||
public static final int testingMaxKernels = 64;
|
||||
//--
|
||||
public static final String ApplicationFileName = "VisualSapfor.jar";
|
||||
@@ -105,6 +105,7 @@ public class Constants {
|
||||
"starter.cpp",
|
||||
"launcher.cpp",
|
||||
//--
|
||||
"json.hpp",
|
||||
"Array.h",
|
||||
"CompilationSupervisor.h",
|
||||
"CompilationTask.h",
|
||||
|
||||
@@ -19,13 +19,4 @@ public class DVMCompilationTask extends DVMTask {
|
||||
maxtime = configuration.c_maxtime;
|
||||
}
|
||||
//--
|
||||
@Override
|
||||
public Vector<String> pack(Object arg) {
|
||||
Vector<String> res = new Vector<>();
|
||||
res.add(String.valueOf(id)); //1
|
||||
res.add(String.valueOf(maxtime)); //2
|
||||
res.add(String.valueOf(test_id)); //3
|
||||
res.add(arg.toString().replace("\n", "|")); //4
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,19 +90,6 @@ public class DVMRunTask extends DVMTask {
|
||||
args = rt.args;
|
||||
}
|
||||
//-
|
||||
@Override
|
||||
public Vector<String> pack(Object arg) {
|
||||
Vector<String> res = new Vector<>();
|
||||
res.add(String.valueOf(id)); //1
|
||||
res.add(String.valueOf(maxtime)); //2
|
||||
res.add(String.valueOf(dvmcompilationtask_id)); //3
|
||||
res.add(matrix); //4
|
||||
res.add(environments); //5
|
||||
res.add(usr_par.replace("\n", "|")); //6
|
||||
res.add(args); //7
|
||||
res.add(String.valueOf(kernels)); //8
|
||||
return res;
|
||||
}
|
||||
public String getEnvironments() {
|
||||
return environments.replace("\n", ";");
|
||||
}
|
||||
|
||||
@@ -83,9 +83,6 @@ public class DVMTask extends iDBObject {
|
||||
"results",
|
||||
String.valueOf(id)).toFile();
|
||||
}
|
||||
public Vector<String> pack(Object arg) {
|
||||
return null;
|
||||
}
|
||||
public String getResultFile(File resultFile) {
|
||||
String res = "";
|
||||
if (dvm_package_id == CommonConstants.Nan) res = "задача ещё не выполнялась";
|
||||
|
||||
@@ -79,25 +79,16 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||
DVMCompilationPackage_json compilationPackage_json = new DVMCompilationPackage_json();
|
||||
DVMRunPackage_json runPackage_json = new DVMRunPackage_json();
|
||||
//положить туда запакованные тексты задач.
|
||||
Vector<String> compilationLines_OLD = new Vector<>(); //старые. выкинуть.
|
||||
Vector<String> runLines_OLD = new Vector<>(); //старые, выкинуть.
|
||||
for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
|
||||
String makefileText = generateMakefile(tests.get(compilationTask.test_id), compilationTask.language, testingPackage.drv, compilationTask.flags);
|
||||
compilationLines_OLD.addAll(compilationTask.pack(makefileText)); //old
|
||||
//--
|
||||
compilationPackage_json.tasks.add(new CompilationTask_json(compilationTask, makefileText));
|
||||
//--
|
||||
for (DVMRunTask runTask : compilationTask.runTasks) {
|
||||
runLines_OLD.addAll(runTask.pack(null)); //оld
|
||||
//--
|
||||
runPackage_json.tasks.add(new RunTask_json(runTask));
|
||||
}
|
||||
}
|
||||
//упразднить
|
||||
RemoteFile compilationFile_old = new RemoteFile(packageRemoteWorkspace, "compilationTasks");
|
||||
RemoteFile runPackage_old = new RemoteFile(packageRemoteWorkspace, "runTasks");
|
||||
user.connection.writeToFile(String.join("\n", compilationLines_OLD) + "\n", compilationFile_old);
|
||||
user.connection.writeToFile(String.join("\n", runLines_OLD) + "\n", runPackage_old);
|
||||
//--
|
||||
RemoteFile compilationFile_json = new RemoteFile(packageRemoteWorkspace, "compilationTasks.json");
|
||||
RemoteFile runFile_json = new RemoteFile(packageRemoteWorkspace, "runTasks.json");
|
||||
|
||||
@@ -3,7 +3,7 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
|
||||
import com.google.gson.annotations.Expose;
|
||||
public class RunTask_json extends Task_json {
|
||||
@Expose
|
||||
public int kernels;
|
||||
public int cores;
|
||||
@Expose
|
||||
public int compilation_task_id;
|
||||
@Expose
|
||||
@@ -16,7 +16,7 @@ public class RunTask_json extends Task_json {
|
||||
public String usr_par; //- usr_par.replace("\n", "|") todo в планировщике убрать шифровку.
|
||||
public RunTask_json(DVMRunTask task){
|
||||
super(task);
|
||||
kernels = task.kernels;
|
||||
cores = task.kernels;
|
||||
compilation_task_id = task.dvmcompilationtask_id;
|
||||
matrix = task.matrix;
|
||||
args = task.args;
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
environments = Utils::getValue<string>(data, "environments");
|
||||
usr_par = Utils::getValue<string>(data, "usr_par");
|
||||
args = Utils::getValue<string>(data, "args");
|
||||
kernels = Utils::getValue<int>(data, "kernels");
|
||||
kernels = Utils::getValue<int>(data, "cores");
|
||||
//todo setStartCommand
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
25
|
||||
27
|
||||
|
||||
Reference in New Issue
Block a user