Let's try to just build

msoos · Jul 14, 2024 · ad7cdcc · ad7cdcc
1 parent c435d7d
commit ad7cdcc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 87 deletions.
diff --git a/.github/workflows/python-wheel-build.yml b/.github/workflows/python-wheel-build.yml
@@ -30,12 +30,11 @@ jobs:
           ref: 'mate'
           path: python/cadiback
 
-      - name: configure CaDiCaL
-        run: cd python/cadical && CXXFLAGS=-fPIC ./configure --competition
-
-      - name: Configure Cadiback
-        run: cd python/cadiback && ./configure
+      - name: configure and build CaDiCaL
+        run: cd python/cadical && CXXFLAGS=-fPIC ./configure --competition && make -j4
 
+      - name: Configure and build Cadiback
+        run: cd python/cadiback && ./configure && make -j4
 
       # Used to host cibuildwheel
       - uses: actions/setup-python@v3

diff --git a/setup.py b/setup.py
@@ -61,88 +61,6 @@ def gen_modules(version):
         include_dirs = ["src/"],
         sources = ["python/src/pycryptosat.cpp",
                    "python/src/GitSHA1.cpp",
-                   "python/cadical/src/analyze.cpp",
-                   "python/cadical/src/arena.cpp",
-                   "python/cadical/src/assume.cpp",
-                   "python/cadical/src/averages.cpp",
-                   "python/cadical/src/backtrack.cpp",
-                   "python/cadical/src/backward.cpp",
-                   "python/cadical/src/bins.cpp",
-                   "python/cadical/src/block.cpp",
-                   "python/cadical/src/checker.cpp",
-                   "python/cadical/src/clause.cpp",
-                   "python/cadical/src/collect.cpp",
-                   "python/cadical/src/compact.cpp",
-                   "python/cadical/src/condition.cpp",
-                   "python/cadical/src/config.cpp",
-                   "python/cadical/src/constrain.cpp",
-                   "python/cadical/src/contract.cpp",
-                   "python/cadical/src/cover.cpp",
-                   "python/cadical/src/decide.cpp",
-                   "python/cadical/src/decompose.cpp",
-                   "python/cadical/src/deduplicate.cpp",
-                   "python/cadical/src/drattracer.cpp",
-                   "python/cadical/src/elim.cpp",
-                   "python/cadical/src/ema.cpp",
-                   "python/cadical/src/extend.cpp",
-                   "python/cadical/src/external.cpp",
-                   "python/cadical/src/external_propagate.cpp",
-                   "python/cadical/src/file.cpp",
-                   "python/cadical/src/flags.cpp",
-                   "python/cadical/src/flip.cpp",
-                   "python/cadical/src/format.cpp",
-                   "python/cadical/src/frattracer.cpp",
-                   "python/cadical/src/gates.cpp",
-                   "python/cadical/src/idruptracer.cpp",
-                   "python/cadical/src/instantiate.cpp",
-                   "python/cadical/src/internal.cpp",
-                   "python/cadical/src/ipasir.cpp",
-                   "python/cadical/src/lidruptracer.cpp",
-                   "python/cadical/src/limit.cpp",
-                   "python/cadical/src/logging.cpp",
-                   "python/cadical/src/lookahead.cpp",
-                   "python/cadical/src/lratbuilder.cpp",
-                   "python/cadical/src/lratchecker.cpp",
-                   "python/cadical/src/lrattracer.cpp",
-                   "python/cadical/src/lucky.cpp",
-                   "python/cadical/src/message.cpp",
-                   "python/cadical/src/minimize.cpp",
-                   "python/cadical/src/mobical.cpp",
-                   "python/cadical/src/occs.cpp",
-                   "python/cadical/src/options.cpp",
-                   "python/cadical/src/parse.cpp",
-                   "python/cadical/src/phases.cpp",
-                   "python/cadical/src/probe.cpp",
-                   "python/cadical/src/profile.cpp",
-                   "python/cadical/src/proof.cpp",
-                   "python/cadical/src/propagate.cpp",
-                   "python/cadical/src/queue.cpp",
-                   "python/cadical/src/random.cpp",
-                   "python/cadical/src/reap.cpp",
-                   "python/cadical/src/reduce.cpp",
-                   "python/cadical/src/rephase.cpp",
-                   "python/cadical/src/report.cpp",
-                   "python/cadical/src/resources.cpp",
-                   "python/cadical/src/restart.cpp",
-                   "python/cadical/src/restore.cpp",
-                   "python/cadical/src/score.cpp",
-                   "python/cadical/src/shrink.cpp",
-                   "python/cadical/src/signal.cpp",
-                   "python/cadical/src/solution.cpp",
-                   "python/cadical/src/solver.cpp",
-                   "python/cadical/src/stats.cpp",
-                   "python/cadical/src/subsume.cpp",
-                   "python/cadical/src/terminal.cpp",
-                   "python/cadical/src/ternary.cpp",
-                   "python/cadical/src/transred.cpp",
-                   "python/cadical/src/util.cpp",
-                   "python/cadical/src/var.cpp",
-                   "python/cadical/src/veripbtracer.cpp",
-                   "python/cadical/src/version.cpp",
-                   "python/cadical/src/vivify.cpp",
-                   "python/cadical/src/walk.cpp",
-                   "python/cadical/src/watch.cpp",
-                   "python/cadiback/cadiback.cpp",
                    "src/cardfinder.cpp",
                    "src/ccnr_cms.cpp",
                    "src/ccnr.cpp",