aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Aren Babikian <aren.babikian@mail.mcgill.ca>2021-01-05 04:13:26 +0100
committerLibravatar Aren Babikian <aren.babikian@mail.mcgill.ca>2021-01-05 04:13:26 +0100
commit873aeb05180afbedae494282ef360cacd69e2d84 (patch)
tree11ff5ac3bb7df668479f364bfd9bafe379286969
parentClean up MODELS20 files (diff)
downloadVIATRA-Generator-873aeb05180afbedae494282ef360cacd69e2d84.tar.gz
VIATRA-Generator-873aeb05180afbedae494282ef360cacd69e2d84.tar.zst
VIATRA-Generator-873aeb05180afbedae494282ef360cacd69e2d84.zip
add models20 measuement setup from VM
Diffstat
-rwxr-xr-xSolvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.sobin46416 -> 38488 bytes
-rw-r--r--Solvers/SMT-Solver/com.microsoft.z3/lib/libz3.dllbin15446904 -> 0 bytes
-rwxr-xr-xSolvers/SMT-Solver/com.microsoft.z3/lib/libz3.dylibbin22033856 -> 0 bytes
-rw-r--r--Solvers/SMT-Solver/com.microsoft.z3/lib/libz3java.dllbin109432 -> 0 bytes
-rwxr-xr-xSolvers/SMT-Solver/com.microsoft.z3/lib/libz3java.dylibbin166568 -> 0 bytes
-rw-r--r--Solvers/VIATRA-Solver/org.eclipse.viatra.dse/.gitignore1
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.familyTree.model/.gitignore1
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore1
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore4
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore4
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbinbin6885 -> 6885 bytes
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTEndMeasurements.bat5
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.run/SMTQualMeasurements.bat5
-rw-r--r--Tests/MODELS2020-CaseStudies/case.study.pledge.run/officialMeasurementsSetup.bat18
-rwxr-xr-xTests/MODELS2020-CaseStudies/case.study.pledge.run/run.sh5
-rwxr-xr-xTests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree.sh7
-rwxr-xr-xTests/MODELS2020-CaseStudies/case.study.pledge.run/runFamilyTree_exact.sh14
-rwxr-xr-xTests/MODELS2020-CaseStudies/case.study.pledge.run/runSatellite.sh7
-rwxr-xr-xTests/MODELS2020-CaseStudies/case.study.pledge.run/runTaxation.sh7
19 files changed, 51 insertions, 28 deletions
diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so
index ba3cdc06..e2dc84e1 100755
--- a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so
+++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so
Binary files differ
diff --git a/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3.dll b/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3.dll
deleted file mode 100644
index 46b1e7c2..00000000
--- a/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3.dll
+++ /dev/null
Binary files differ
diff --git a/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3.dylib b/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3.dylib
deleted file mode 100755
index 6ca9aea8..00000000
--- a/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3.dylib
+++ /dev/null
Binary files differ
diff --git a/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3java.dll b/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3java.dll
deleted file mode 100644
index 615bf3b8..00000000
--- a/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3java.dll
+++ /dev/null
Binary files differ
diff --git a/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3java.dylib b/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3java.dylib
deleted file mode 100755
index 73e02b97..00000000
--- a/Solvers/SMT-Solver/com.microsoft.z3/lib/libz3java.dylib
+++ /dev/null
Binary files differ
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/.gitignore b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/.gitignore
@@ -0,0 +1 @@
/bin/
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 @@
1/queries/ 1/queries/
2/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 @@
7/.MemberHasParent.java._trace 7/.MemberHasParent.java._trace
8/.TwoMembersHaveNoParent.java._trace 8/.TwoMembersHaveNoParent.java._trace
9/.NegativeAge.java._trace 9/.NegativeAge.java._trace
10/MemberHasParent.java
11/NegativeAge.java
12/ParentTooYoung.java
13/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 @@
7/.MemberHasParent.java._trace 7/.MemberHasParent.java._trace
8/.TwoMembersHaveNoParent.java._trace 8/.TwoMembersHaveNoParent.java._trace
9/.NegativeAge.java._trace 9/.NegativeAge.java._trace
10/MemberHasParent.java
11/NegativeAge.java
12/ParentTooYoung.java
13/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
--- 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
Binary files 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 @@
1java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 20 -rt 350
2java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 40 -rt 350
3java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 60 -rt 350
4java -Xms12G -jar gencache.jar -d FamilyTreeSMTEnd -lb 80 -rt 350
5java -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 @@
1java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 20 -rt 350
2java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 40 -rt 350
3java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 60 -rt 350
4java -Xms12G -jar gencache.jar -d FamilyTreeSMTQual -lb 80 -rt 350
5java -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 @@
1java -Xms12G -jar gencache.jar -d Taxation -lb 20 -hh 1
2java -Xms12G -jar gencache.jar -d Satellite -lb 20
3REM java -Xms12G -jar gencache.jar -d FamilyTree -lb 20
4
5java -Xms12G -jar gencache.jar -d Taxation -lb 40 -hh 2
6java -Xms12G -jar gencache.jar -d Satellite -lb 40
7REM java -Xms12G -jar gencache.jar -d FamilyTree -lb 40
8
9java -Xms12G -jar gencache.jar -d Satellite -lb 60
10java -Xms12G -jar gencache.jar -d FamilyTree -lb 60
11java -Xms12G -jar gencache.jar -d Satellite -lb 80
12java -Xms12G -jar gencache.jar -d FamilyTree -lb 80
13java -Xms12G -jar gencache.jar -d Satellite -lb 100
14java -Xms12G -jar gencache.jar -d FamilyTree -lb 100
15
16java -Xms12G -jar gencache.jar -d Taxation -lb 60 -hh 3
17java -Xms12G -jar gencache.jar -d Taxation -lb 80 -hh 4
18java -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 @@
1#!/usr/bin/env bash
2NODE="$1"
3shift
4CPUS="$((NODE*3))-$((NODE*3+2))"
5taskset -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 @@
1#!/usr/bin/bash
2NODE="$1"
3./run.sh "${NODE}" -d FamilyTree -lb 20 -nm 10 -rt 3600
4./run.sh "${NODE}" -d FamilyTree -lb 40 -nm 10 -rt 3600
5./run.sh "${NODE}" -d FamilyTree -lb 60 -nm 10 -rt 3600
6./run.sh "${NODE}" -d FamilyTree -lb 80 -nm 10 -rt 3600
7./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 @@
1#!/usr/bin/bash
2NODE="$1"
3VERSION="$2"
4./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 5 -ub 5 -nm 1 -rt 300
5./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 6 -ub 6 -nm 1 -rt 300
6./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 7 -ub 7 -nm 1 -rt 300
7./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 8 -ub 8 -nm 1 -rt 300
8./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 9 -ub 9 -nm 1 -rt 300
9./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 10 -ub 10 -nm 1 -rt 300
10./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 20 -ub 20 -nm 1 -rt 300
11./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 40 -ub 40 -nm 1 -rt 300
12./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 60 -ub 60 -nm 1 -rt 300
13./run.sh "${NODE}" -d "FamilyTree${VERSION}" -lb 80 -ub 80 -nm 1 -rt 300
14./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 @@
1#!/usr/bin/bash
2NODE="$1"
3./run.sh "${NODE}" -d Satellite -lb 20 -nm 10 -rt 3600
4./run.sh "${NODE}" -d Satellite -lb 40 -nm 10 -rt 3600
5./run.sh "${NODE}" -d Satellite -lb 60 -nm 10 -rt 3600
6./run.sh "${NODE}" -d Satellite -lb 80 -nm 10 -rt 3600
7./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 @@
1#!/usr/bin/bash
2NODE="$1"
3./run.sh "${NODE}" -d Taxation -lb 20 -nm 10 -rt 3600 -hh 1
4./run.sh "${NODE}" -d Taxation -lb 40 -nm 10 -rt 3600 -hh 2
5./run.sh "${NODE}" -d Taxation -lb 60 -nm 10 -rt 3600 -hh 3
6./run.sh "${NODE}" -d Taxation -lb 80 -nm 10 -rt 3600 -hh 4
7./run.sh "${NODE}" -d Taxation -lb 100 -nm 10 -rt 3600 -hh 5
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-07 23:00:35 +0000