From 0b1a2196f3ed8a69db9184cdd368744e712a2e47 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Fri, 29 Dec 2023 17:27:55 +1100 Subject: [PATCH 1/4] Add missing export of encoder --- crates/pindakaas/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/pindakaas/src/lib.rs b/crates/pindakaas/src/lib.rs index 4f9209713a..1dc129c00b 100755 --- a/crates/pindakaas/src/lib.rs +++ b/crates/pindakaas/src/lib.rs @@ -35,7 +35,7 @@ pub mod trace; use crate::trace::subscript_number; pub use crate::{ cardinality::{Cardinality, SortingNetworkEncoder}, - cardinality_one::{CardinalityOne, LadderEncoder, PairwiseEncoder}, + cardinality_one::{BitwiseEncoder, CardinalityOne, LadderEncoder, PairwiseEncoder}, linear::{ AdderEncoder, BddEncoder, Comparator, LimitComp, LinExp, LinVariant, Linear, LinearAggregator, LinearConstraint, LinearEncoder, SwcEncoder, TotalizerEncoder, From a8566f533744164a58e1af24cb880f3a10cc9aba Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Fri, 29 Dec 2023 17:28:58 +1100 Subject: [PATCH 2/4] Add lto for setting to release profile for better solver linking --- Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index d7671484b0..f7ef798c80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,7 @@ [workspace] members = ["crates/*"] resolver = "2" + +[profile.release] +lto = "fat" +codegen-units = 1 From 7c14b217089edf703edfaf031f9426556d742dfa Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Fri, 29 Dec 2023 17:31:30 +1100 Subject: [PATCH 3/4] Update intel sat solver --- crates/pindakaas-intel-sat/vendor/intel_sat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/pindakaas-intel-sat/vendor/intel_sat b/crates/pindakaas-intel-sat/vendor/intel_sat index 3af838480f..a78cf99dd5 160000 --- a/crates/pindakaas-intel-sat/vendor/intel_sat +++ b/crates/pindakaas-intel-sat/vendor/intel_sat @@ -1 +1 @@ -Subproject commit 3af838480fc916b62e3962850b9ac8281de31cec +Subproject commit a78cf99dd5dff0f0b0c3818cac2aaa1593f573c1 From fb9cba400c67f4a88ca54eb94c7fa3ad27cf447c Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Fri, 29 Dec 2023 19:39:05 +1100 Subject: [PATCH 4/4] Fix clippy warnings --- crates/pindakaas/src/int/enc.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/crates/pindakaas/src/int/enc.rs b/crates/pindakaas/src/int/enc.rs index 7f3ea6eb0a..e7b22be215 100644 --- a/crates/pindakaas/src/int/enc.rs +++ b/crates/pindakaas/src/int/enc.rs @@ -531,12 +531,7 @@ impl IntVarEnc { // TODO account for bounds (or even better, create IntVarBin) // TODO old method (which at least respected bounds) if COUPLE_DOM_PART_TO_ORD { - let x_bin = IntVarBin::from_terms( - terms.iter().copied().map(|(l, i)| (l, i)).collect(), - *l, - *u, - String::from("x"), - ); + let x_bin = IntVarBin::from_terms(terms.to_vec(), *l, *u, String::from("x")); let x_ord = IntVarEnc::Ord(IntVarOrd::from_bounds( db, x_bin.lb(),