Browse Source

patch now unneeded with new version of super_prove

master
T. Meissner 1 year ago
parent
commit
c77a31e70a
2 changed files with 1 additions and 29 deletions
  1. +0
    -25
      packages/fix_super_prove_build.txt
  2. +1
    -4
      symbiyosys.Dockerfile

+ 0
- 25
packages/fix_super_prove_build.txt View File

@ -1,25 +0,0 @@
diff -r bde167bca3cd Bip/Main_bip.cc
--- a/Bip/Main_bip.cc Thu Sep 14 01:44:08 2017 -0700
+++ b/Bip/Main_bip.cc Thu Aug 08 15:02:00 2019 +0200
@@ -508,8 +508,8 @@
void writeCex(Out& out, NetlistRef N, const Cex& cex, uint orig_num_pis)
{
Vec<Pair<int,GLit> > ffs, pis;
- For_Gatetype(N, gate_Flop, w) ffs.push(tuple(attr_Flop(w).number, w));
- For_Gatetype(N, gate_PI , w) pis.push(tuple(attr_PI (w).number, w));
+ For_Gatetype(N, gate_Flop, w) ffs.push(::tuple(attr_Flop(w).number, w));
+ For_Gatetype(N, gate_PI , w) pis.push(::tuple(attr_PI (w).number, w));
sort(ffs);
sort(pis);
diff -r bde167bca3cd MetaSat/MiniSat2/System.cc
--- a/MetaSat/MiniSat2/System.cc Thu Sep 14 01:44:08 2017 -0700
+++ b/MetaSat/MiniSat2/System.cc Thu Aug 08 15:02:00 2019 +0200
@@ -20,6 +20,7 @@
#include <signal.h>
#include <stdio.h>
+#include <stdlib.h>
#include "System.hh"

+ 1
- 4
symbiyosys.Dockerfile View File

@ -41,7 +41,6 @@ RUN apt-get update -qq && \
FROM yosys AS symbiyosys
COPY packages/suprove /root/suprove
COPY packages/fix_super_prove_build.txt /root/fix_super_prove_build.txt
RUN apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
@ -96,9 +95,7 @@ RUN apt-get update -qq && \
cp deps/btor2tools/bin/btorsim /opt/boolector/bin/ && \
cd /root && \
git clone --recursive https://github.com/sterin/super-prove-build && \
cd super-prove-build/abc-zz && \
patch -p1 < /root/fix_super_prove_build.txt && \
cd .. && \
cd super-prove-build && \
mkdir build && \
cd build && \
cmake -DCMAKE_BUILD_TYPE=Release -G Ninja .. && \


Loading…
Cancel
Save