From 873aeb05180afbedae494282ef360cacd69e2d84 Mon Sep 17 00:00:00 2001 From: Aren Babikian Date: Tue, 5 Jan 2021 04:13:26 +0100 Subject: add models20 measuement setup from VM --- .../case.study.familyTree.model/.gitignore | 1 + .../case.study.familyTree.run/bin/.gitignore | 1 + .../case.study.familyTree.run/bin/queries/.gitignore | 4 ++++ .../src-gen/queries/.gitignore | 4 ++++ .../xtend-gen/converter/.UML2TGF.xtendbin | Bin 6885 -> 6885 bytes .../case.study.pledge.run/SMTEndMeasurements.bat | 5 ----- .../case.study.pledge.run/SMTQualMeasurements.bat | 5 ----- .../officialMeasurementsSetup.bat | 18 ------------------ .../case.study.pledge.run/run.sh | 5 +++++ .../case.study.pledge.run/runFamilyTree.sh | 7 +++++++ .../case.study.pledge.run/runFamilyTree_exact.sh | 14 ++++++++++++++ .../case.study.pledge.run/runSatellite.sh | 7 +++++++ .../case.study.pledge.run/runTaxation.sh | 7 +++++++ 13 files changed, 50 insertions(+), 28 deletions(-) create mode 100644 Tests/MODELS2020-CaseStudies/case.study.familyTree.model/.gitignore delete mode 100644 Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTEndMeasurements.bat delete mode 100644 Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTQualMeasurements.bat delete mode 100644 Tests/MODELS2020-CaseStudies/case.study.pledge.run/officialMeasurementsSetup.bat create mode 100755 Tests/MODELS2020-CaseStudies/case.study.pledge.run/run.sh create mode 100755 Tests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree.sh create mode 100755 Tests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree_exact.sh create mode 100755 Tests/MODELS2020-CaseStudies/case.study.pledge.run/runSatellite.sh create mode 100755 Tests/MODELS2020-CaseStudies/case.study.pledge.run/runTaxation.sh (limited to 'Tests/MODELS2020-CaseStudies') diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/.gitignore new file mode 100644 index 00000000..ae3c1726 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.model/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore index 7050a7e3..3d70f0da 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore @@ -1 +1,2 @@ /queries/ +/run/ diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore index 3b9ccef7..19bc3cc8 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore @@ -7,3 +7,7 @@ /.MemberHasParent.java._trace /.TwoMembersHaveNoParent.java._trace /.NegativeAge.java._trace +/MemberHasParent.java +/NegativeAge.java +/ParentTooYoung.java +/TwoMembersHaveNoParent.java diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore index 3b9ccef7..19bc3cc8 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore @@ -7,3 +7,7 @@ /.MemberHasParent.java._trace /.TwoMembersHaveNoParent.java._trace /.NegativeAge.java._trace +/MemberHasParent.java +/NegativeAge.java +/ParentTooYoung.java +/TwoMembersHaveNoParent.java diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin index 5c5071cc..4a93782b 100644 Binary files a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin and b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin differ diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTEndMeasurements.bat b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTEndMeasurements.bat deleted file mode 100644 index 37adbbe1..00000000 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTEndMeasurements.bat +++ /dev/null @@ -1,5 +0,0 @@ -java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 20 -rt 350 -java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 40 -rt 350 -java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 60 -rt 350 -java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 80 -rt 350 -java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 100 -rt 350 diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTQualMeasurements.bat b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTQualMeasurements.bat deleted file mode 100644 index c76fc2d8..00000000 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTQualMeasurements.bat +++ /dev/null @@ -1,5 +0,0 @@ -java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 20 -rt 350 -java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 40 -rt 350 -java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 60 -rt 350 -java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 80 -rt 350 -java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 100 -rt 350 diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/officialMeasurementsSetup.bat b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/officialMeasurementsSetup.bat deleted file mode 100644 index e7817090..00000000 --- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/officialMeasurementsSetup.bat +++ /dev/null @@ -1,18 +0,0 @@ -java -Xms12G -jar gencache.jar -d Taxation -lb 20 -hh 1 -java -Xms12G -jar gencache.jar -d Satellite -lb 20 -REM java -Xms12G -jar gencache.jar -d FamilyTree -lb 20 - -java -Xms12G -jar gencache.jar -d Taxation -lb 40 -hh 2 -java -Xms12G -jar gencache.jar -d Satellite -lb 40 -REM java -Xms12G -jar gencache.jar -d FamilyTree -lb 40 - -java -Xms12G -jar gencache.jar -d Satellite -lb 60 -java -Xms12G -jar gencache.jar -d FamilyTree -lb 60 -java -Xms12G -jar gencache.jar -d Satellite -lb 80 -java -Xms12G -jar gencache.jar -d FamilyTree -lb 80 -java -Xms12G -jar gencache.jar -d Satellite -lb 100 -java -Xms12G -jar gencache.jar -d FamilyTree -lb 100 - -java -Xms12G -jar gencache.jar -d Taxation -lb 60 -hh 3 -java -Xms12G -jar gencache.jar -d Taxation -lb 80 -hh 4 -java -Xms12G -jar gencache.jar -d Taxation -lb 100 -hh 5 diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/run.sh b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/run.sh new file mode 100755 index 00000000..0b0c560e --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/run.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +NODE="$1" +shift +CPUS="$((NODE*3))-$((NODE*3+2))" +taskset -c "${CPUS}" env LD_LIBRARY_PATH=/home/models/VIATRA-Generator/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/lib:/home/models/VIATRA-Generator/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib java -Xmx2g -Xms2g -XX:+UseG1GC -XX:ParallelGCThreads=3 -XX:ConcGCThreads=1 -XX:G1ConcRefinementThreads=3 -jar RunGeneratorConfig.jar "$@" diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree.sh b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree.sh new file mode 100755 index 00000000..5895ff6a --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash +NODE="$1" +./run.sh "${NODE}" -d FamilyTree -lb 20 -nm 10 -rt 3600 +./run.sh "${NODE}" -d FamilyTree -lb 40 -nm 10 -rt 3600 +./run.sh "${NODE}" -d FamilyTree -lb 60 -nm 10 -rt 3600 +./run.sh "${NODE}" -d FamilyTree -lb 80 -nm 10 -rt 3600 +./run.sh "${NODE}" -d FamilyTree -lb 100 -nm 10 -rt 3600 diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree_exact.sh b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree_exact.sh new file mode 100755 index 00000000..3d4a4755 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree_exact.sh @@ -0,0 +1,14 @@ +#!/usr/bin/bash +NODE="$1" +VERSION="$2" +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 5 -ub 5 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 6 -ub 6 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 7 -ub 7 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 8 -ub 8 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 9 -ub 9 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 10 -ub 10 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 20 -ub 20 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 40 -ub 40 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 60 -ub 60 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 80 -ub 80 -nm 1 -rt 300 +./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 100 -ub 100 -nm 1 -rt 300 diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runSatellite.sh b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runSatellite.sh new file mode 100755 index 00000000..f5eee8a3 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runSatellite.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash +NODE="$1" +./run.sh "${NODE}" -d Satellite -lb 20 -nm 10 -rt 3600 +./run.sh "${NODE}" -d Satellite -lb 40 -nm 10 -rt 3600 +./run.sh "${NODE}" -d Satellite -lb 60 -nm 10 -rt 3600 +./run.sh "${NODE}" -d Satellite -lb 80 -nm 10 -rt 3600 +./run.sh "${NODE}" -d Satellite -lb 100 -nm 10 -rt 3600 diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runTaxation.sh b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runTaxation.sh new file mode 100755 index 00000000..75080359 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/runTaxation.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash +NODE="$1" +./run.sh "${NODE}" -d Taxation -lb 20 -nm 10 -rt 3600 -hh 1 +./run.sh "${NODE}" -d Taxation -lb 40 -nm 10 -rt 3600 -hh 2 +./run.sh "${NODE}" -d Taxation -lb 60 -nm 10 -rt 3600 -hh 3 +./run.sh "${NODE}" -d Taxation -lb 80 -nm 10 -rt 3600 -hh 4 +./run.sh "${NODE}" -d Taxation -lb 100 -nm 10 -rt 3600 -hh 5 -- cgit v1.2.3-70-g09d2