diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-03-25 00:51:20 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2021-03-25 00:51:20 +0100 |
commit | a27fbebd4d022a4239f9479badf45cba0cfd8144 (patch) | |
tree | b44c1bad608018793c8321dbfd32ad532cb53732 | |
download | dftcalc-storm-a27fbebd4d022a4239f9479badf45cba0cfd8144.tar.gz dftcalc-storm-a27fbebd4d022a4239f9479badf45cba0cfd8144.tar.zst dftcalc-storm-a27fbebd4d022a4239f9479badf45cba0cfd8144.zip |
Initial commit
-rw-r--r-- | Dockerfile | 26 | ||||
-rw-r--r-- | storm-non-exact.patch | 13 |
2 files changed, 39 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b50d20e --- /dev/null +++ b/Dockerfile | |||
@@ -0,0 +1,26 @@ | |||
1 | FROM movesrwth/storm:travis | ||
2 | |||
3 | # Patch enabled floating-point calculation with Storm | ||
4 | COPY storm-non-exact.patch /opt | ||
5 | |||
6 | RUN apt-get update && \ | ||
7 | apt-get install -y bison flex libyaml-cpp-dev openjdk-11-jdk-headless && \ | ||
8 | rm -rf /var/lib/apt/lists/* && \ | ||
9 | git clone --depth=1 https://github.com/utwente-fmt/dftcalc.git /opt/dftcalc && \ | ||
10 | cd /opt/dftcalc && \ | ||
11 | git apply /opt/storm-non-exact.patch && \ | ||
12 | mkdir build && \ | ||
13 | cd build && \ | ||
14 | cmake -DDFTROOT=/usr .. && \ | ||
15 | make && \ | ||
16 | make install && \ | ||
17 | git clone --depth=1 https://github.com/utwente-fmt/DFTRES /opt/DFTRES && \ | ||
18 | cd /opt/DFTRES && \ | ||
19 | make jar JFLAGS="-Xlint:deprecation -g -encoding UTF-8" | ||
20 | |||
21 | # Place Storm executable on the PATH so that dftcalc can find it | ||
22 | ENV PATH="$PATH:/opt/storm/build/bin" | ||
23 | |||
24 | # Tell dftcalc where we have DFTRES.jar | ||
25 | ENV DFTRES=/opt/DFTRES | ||
26 | |||
diff --git a/storm-non-exact.patch b/storm-non-exact.patch new file mode 100644 index 0000000..09ca080 --- /dev/null +++ b/storm-non-exact.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff --git a/dftcalc/dftcalc.cpp b/dftcalc/dftcalc.cpp | ||
2 | index df84616..b4e748d 100644 | ||
3 | --- a/dftcalc/dftcalc.cpp | ||
4 | +++ b/dftcalc/dftcalc.cpp | ||
5 | @@ -867,8 +867,6 @@ int DFT::DFTCalc::calculateDFT(const bool reuse, | ||
6 | } | ||
7 | |||
8 | StormRunner *sr = new StormRunner(messageFormatter, &exec, stormExec, jani); | ||
9 | - if (useConverter == DFTRES) | ||
10 | - sr->runExact = 1; | ||
11 | checker = std::unique_ptr<Checker>(sr); | ||
12 | break; | ||
13 | } | ||