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

промежуточный. отправка пакета нового класса.

Browse Source
This commit is contained in:
02090095
2023-12-13 02:26:20 +03:00
parent 91c494e9f8
commit 749c0397e6
12 changed files with 80 additions and 4104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.idea/workspace.xml generated
View File

@@ -7,18 +7,18 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.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/Common/Database/iDBObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/iDBObject.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackageDatabase.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/dvmpackage_1702385390/package_json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/dvmpackage_1702385477/package_json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

3703
Packages/dvmpackage_1702385390/package_json
View File

File diff suppressed because it is too large Load Diff

382
Packages/dvmpackage_1702385477/package_json
View File

@@ -1,382 +0,0 @@
{
"compilationTasks": [
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 614,
"test_description": "parallel1_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 614,
"test_description": "parallel1_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
},
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1 1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 615,
"test_description": "parallel2_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 615,
"test_description": "parallel2_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
},
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1 1 1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 616,
"test_description": "parallel3_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 616,
"test_description": "parallel3_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
},
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1 1 1 1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 617,
"test_description": "parallel4_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 617,
"test_description": "parallel4_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
},
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 618,
"test_description": "paralplus12_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 618,
"test_description": "paralplus12_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
},
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 619,
"test_description": "paralplus14_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 619,
"test_description": "paralplus14_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
},
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1 1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 620,
"test_description": "paralplus23_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 620,
"test_description": "paralplus23_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
},
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1 1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 621,
"test_description": "paralplus24_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 621,
"test_description": "paralplus24_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
},
{
"runTasks": [
{
"dvmcompilationtask_id": -1,
"matrix": "1 1 1",
"args": "",
"CleanTime": 0.0,
"progress": 0,
"language": "fortran",
"cube": 1,
"min_dim": 1,
"max_dim": 1,
"environments": "DVMH_NUM_THREADS\u003d\"1\" DVMH_NUM_CUDAS\u003d\"0\" DVMH_NO_DIRECT_COPY\u003d\"1\"",
"usr_par": "Is_DVM_STAT\u003d1",
"compilation_maxtime": 40,
"compilation_state": "Waiting",
"compilation_time": 0.0,
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 622,
"test_description": "paralplus34_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
],
"group_id": 81,
"group_description": "PARALLEL",
"test_id": 622,
"test_description": "paralplus34_f",
"flags": "-noH -shared-dvm",
"kernels": 1,
"state": "Inactive",
"maxtime": 40,
"test_type": "Correctness",
"Time": 0.0,
"id": 0
}
]
}

3
src/Common/UI/Menus_2023/DVMPackagesBar/DVMPackagesBar.java
View File

@@ -4,7 +4,8 @@ import Visual_DVM_2021.Passes.PassCode_2021;
public class DVMPackagesBar extends DataMenuBar {
public DVMPackagesBar() {
super("пакеты задач DVM", PassCode_2021.AddDVMPackage,
PassCode_2021.AddTasksToDVMPackage
PassCode_2021.AddTasksToDVMPackage,
PassCode_2021.StartDVMPackage
// PassCode_2021.ExportTasksPackageToExcel,PassCode_2021.AbortTaskPackage, PassCode_2021.DeleteTasksPackage
);
}

3
src/Repository/Server/ServerCode.java
View File

@@ -83,6 +83,7 @@ public enum ServerCode {
PublishObject,
PublishObjects,
UpdateTestTasks,
ActualizeSAPFORPackages, ActualizeDVMPackages
ActualizeSAPFORPackages,
ActualizeDVMPackages
// PublishTestProject
}

13
src/TestingSystem/Common/TestingServer.java
View File

@@ -21,6 +21,7 @@ import TestingSystem.Common.Group.Group;
import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.DVM.Tasks.TestTask;
@@ -528,6 +529,13 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
} else if (object instanceof SapforTasksPackage) {
SapforTasksPackage sapforTasksPackage = (SapforTasksPackage) object;
sapforTasksPackage.id = db.IncKey(SettingName.SAPFORPackageId);
}else if (object instanceof DVMPackage){
DVMPackage dvmPackage = (DVMPackage) object;
//--
dvmPackage.state = TasksPackageState.Queued;
Utils.CheckAndCleanDirectory(dvmPackage.getLocalWorkspace());
//--
dvmPackage.saveJson();
}
}
@Override
@@ -655,7 +663,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
if (tasksPackage.state.equals(TasksPackageState.Done)) {
for (TestRunTask task : account_db.testRunTasks.Data.values()) {
if (task.taskspackage_id == tasksPackage.id) {
System.out.println(task.id+":"+task.state);
System.out.println(task.id + ":" + task.state);
tasks.add(task);
}
}
@@ -682,7 +690,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
if (tasksPackage.state.equals(TasksPackageState.Done)) {
for (SapforTask task : account_db.sapforTasks.Data.values()) {
if (task.sapfortaskspackage_id == tasksPackage.id) {
System.out.println(task.id+":"+task.state);
System.out.println(task.id + ":" + task.state);
tasks.add(task);
}
}
@@ -694,4 +702,5 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
response.object = res;
//--
}
//--
}

3
src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
View File

@@ -4,9 +4,10 @@ import TestingSystem.DVM.DVMTasks.DVMRunTask;
import TestingSystem.DVM.TasksPackage.TasksPackageState;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
import java.util.List;
import java.util.Vector;
public class DVMPackage_json {
public class DVMPackage_json implements Serializable {
@Expose
public int max_compilation_task_id = 0;
@Expose

4
src/Visual_DVM_2021/Passes/All/AddDVMPackage.java
View File

@@ -72,8 +72,8 @@ public class AddDVMPackage extends AddObjectPass<DVMPackage> {
target.needsEmail = Global.properties.EmailOnTestingProgress ? 1 : 0;
//--
target.package_json = new DVMPackage_json();
Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
target.saveJson();
//Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
//target.saveJson();
//--
return true;
}

2
src/Visual_DVM_2021/Passes/All/AddTasksToDVMPackage.java
View File

@@ -164,7 +164,7 @@ public class AddTasksToDVMPackage extends Pass_2021<DVMPackage> {
}
json.compilationTasks.addAll(tasks);
target.tasksCount += tasks_count;
target.saveJson();
//target.saveJson();
Global.testingServer.db.Update(target);
}
@Override

44
src/Visual_DVM_2021/Passes/All/StartDVMPackage.java Normal file
View File

@@ -0,0 +1,44 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import Common.UI.UI;
import Common.Utils.Utils;
import Repository.Server.ServerCode;
import Repository.Server.ServerExchangeUnit_2021;
import TestingSystem.Common.TestingServer;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
import javafx.util.Pair;
public class StartDVMPackage extends PublishServerObject<TestingServer, DVMPackage>{
public StartDVMPackage() {
super(Global.testingServer, DVMPackage.class);
}
@Override
protected int getTimeout() {
return 0;
}
@Override
public String getIconPath() {
return "/icons/Start.png";
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Current.getAccount().CheckRegistered(Log)) {
return false;
}
if (Current.Check(Log, Current.DVMPackage)) {
target = Current.getDVMPackage();
//-
if (target.tasksCount == 0) {
Log.Writeln_("В пакете отсутствуют задачи.");
return false;
}
if (UI.Question("Будет запущено:\n"
+target.tasksCount + " задач на запуск.\n" +
"Продолжить")) {
return true;
}
}
return false;
}
}

2
src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
View File

@@ -29,6 +29,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
server.db.groups.ClearUI();
server.db.sapforConfigurations.ClearUI();
server.db.serverSapfors.ClearUI();
server.db.dvmPackages.ClearUI();
}
@Override
protected void ServerAction() throws Exception {
@@ -53,6 +54,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
server.db.groups.ShowUI();
server.db.sapforConfigurations.ShowUI();
server.db.serverSapfors.ShowUI();
server.db.dvmPackages.ShowUI();
server.db.RestoreLastSelections();
UI.getMainWindow().ShowCheckedTestsCount();
}

3
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -311,12 +311,15 @@ public enum PassCode_2021 {
//->
AddDVMPackage,
AddTasksToDVMPackage,
StartDVMPackage,
//->
TestPass;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case StartDVMPackage:
return "Запустить пакет задач DVM";
case AddTasksToDVMPackage:
return "Добавить задачи в пакет тестирования DVM";
case AddDVMPackage: