diff --git a/papilo-shared.patch b/papilo-shared.patch index c79406d..f47c460 100644 --- a/papilo-shared.patch +++ b/papilo-shared.patch @@ -1,6 +1,6 @@ ---- papilo-2.1.4/CMakeLists.txt.orig 2023-12-06 11:38:08.348390205 -0700 -+++ papilo-2.1.4/CMakeLists.txt 2023-12-06 11:38:51.994792168 -0700 -@@ -24,8 +24,6 @@ include(GNUInstallDirs) +--- papilo-2.2.1/CMakeLists.txt.orig 2024-06-07 12:08:24.745855052 -0600 ++++ papilo-2.2.1/CMakeLists.txt 2024-06-07 12:09:20.649152731 -0600 +@@ -28,8 +28,6 @@ include(GNUInstallDirs) # path to e.g. findGMP module list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules/) @@ -8,8 +8,8 @@ -set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) set(CMAKE_POSITION_INDEPENDENT_CODE ON) - option(GMP "should gmp be linked" ON) -@@ -197,7 +195,7 @@ if(NOT MSVC) + # disable fused floating point contraction to enhance reproducibility across compilers and architectures +@@ -224,7 +222,7 @@ if(NOT MSVC) endif() set(PAPILO_USE_STANDARD_HASHMAP 1) @@ -18,7 +18,7 @@ src/papilo/core/VariableDomains.cpp src/papilo/core/SparseStorage.cpp src/papilo/core/ConstraintMatrix.cpp -@@ -231,6 +229,7 @@ add_library(papilo-core STATIC +@@ -259,6 +257,7 @@ add_library(papilo-core STATIC function(setLibProperties targetname outputname) set_target_properties(${targetname} PROPERTIES OUTPUT_NAME ${outputname} diff --git a/papilo-test.patch b/papilo-test.patch index 178d23b..bed3299 100644 --- a/papilo-test.patch +++ b/papilo-test.patch @@ -1,5 +1,5 @@ ---- papilo-2.2.0/test/CMakeLists.txt.orig 2024-02-19 15:44:49.657384704 -0700 -+++ papilo-2.2.0/test/CMakeLists.txt 2024-02-21 13:58:40.635003137 -0700 +--- papilo-2.2.1/test/CMakeLists.txt.orig 2024-06-07 12:08:24.748855015 -0600 ++++ papilo-2.2.1/test/CMakeLists.txt 2024-06-07 12:11:45.357301793 -0600 @@ -65,8 +65,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Androi endif() @@ -42,7 +42,7 @@ #Singleton Stuffing "singleton-stuffing-make-sure-to-first-set-bounds-to-infinity" -@@ -174,31 +173,34 @@ set(unit_tests +@@ -174,32 +173,35 @@ set(unit_tests "simple-probing-negative-binary-coeff" "simple-probing-positive-binary-coeff" "simple-different-int-coeff" @@ -63,6 +63,7 @@ + "should_return_feasible_if_gcd_of_coeff_is_in_rhs" "simple-substitution-2-negative-integer" "simple-substitution-feasible-gcd" + "simple-substitution-non-coprime" "simple-substitution-violated-gcd" #Simplify Inequality diff --git a/papilo-unbundle.patch b/papilo-unbundle.patch index 83bde82..daa42e9 100644 --- a/papilo-unbundle.patch +++ b/papilo-unbundle.patch @@ -1,6 +1,6 @@ ---- papilo-2.2.0/CMakeLists.txt.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/CMakeLists.txt 2024-02-19 15:44:49.655384730 -0700 -@@ -187,27 +187,9 @@ else() +--- papilo-2.2.1/CMakeLists.txt.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/CMakeLists.txt 2024-06-07 12:08:24.745855052 -0600 +@@ -199,27 +199,9 @@ else() endif() if(LUSOL) @@ -29,7 +29,7 @@ else() set(PAPILO_HAVE_LUSOL 0) set(CLUSOL_TARGET "") -@@ -228,17 +210,7 @@ if(NOT MSVC) +@@ -240,17 +222,7 @@ if(NOT MSVC) endif() endif() endif() @@ -48,8 +48,8 @@ add_library(papilo-core STATIC src/papilo/core/VariableDomains.cpp -@@ -442,20 +414,6 @@ install(FILES - ${PROJECT_SOURCE_DIR}/src/papilo/external/fmt/posix.cc +@@ -453,20 +425,6 @@ install(FILES + ${PROJECT_SOURCE_DIR}/src/papilo/external/fmt/ranges.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/papilo/external/fmt) -install(FILES @@ -69,8 +69,8 @@ # configure the config file for the build tree set(QUADMATH_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) set(TBB_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) ---- papilo-2.2.0/src/convMPS.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/convMPS.cpp 2024-02-19 15:44:49.655384730 -0700 +--- papilo-2.2.1/src/convMPS.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/convMPS.cpp 2024-06-07 12:08:24.746855040 -0600 @@ -36,7 +36,7 @@ #ifdef PAPILO_TBB #include "papilo/misc/tbb.hpp" @@ -80,8 +80,8 @@ #include "tbb/concurrent_unordered_set.h" #include ---- papilo-2.2.0/src/duplicates.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/duplicates.cpp 2024-02-19 15:44:49.655384730 -0700 +--- papilo-2.2.1/src/duplicates.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/duplicates.cpp 2024-06-07 12:08:24.746855040 -0600 @@ -30,7 +30,7 @@ #ifdef PAPILO_TBB #include "papilo/misc/tbb.hpp" @@ -91,8 +91,8 @@ #include #include ---- papilo-2.2.0/src/papilo/core/Components.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/core/Components.hpp 2024-02-19 15:44:49.656384717 -0700 +--- papilo-2.2.1/src/papilo/core/Components.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/core/Components.hpp 2024-06-07 12:08:24.746855040 -0600 @@ -26,7 +26,7 @@ #include "papilo/core/Problem.hpp" #include "papilo/misc/Hash.hpp" @@ -102,8 +102,8 @@ #include namespace papilo ---- papilo-2.2.0/src/papilo/core/SparseStorage.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/core/SparseStorage.hpp 2024-02-19 15:44:49.656384717 -0700 +--- papilo-2.2.1/src/papilo/core/SparseStorage.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/core/SparseStorage.hpp 2024-06-07 12:08:24.746855040 -0600 @@ -25,7 +25,7 @@ #include "papilo/misc/MultiPrecision.hpp" @@ -113,8 +113,8 @@ #include #include #include ---- papilo-2.2.0/src/papilo/io/MpsParser.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/io/MpsParser.hpp 2024-02-19 15:46:22.446183829 -0700 +--- papilo-2.2.1/src/papilo/io/MpsParser.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/io/MpsParser.hpp 2024-06-07 12:08:24.746855040 -0600 @@ -29,7 +29,7 @@ #include "papilo/core/Objective.hpp" #include "papilo/core/Problem.hpp" @@ -124,8 +124,8 @@ #include "papilo/io/BoundType.hpp" #include "papilo/io/ParseKey.hpp" #include "papilo/misc/Flags.hpp" ---- papilo-2.2.0/src/papilo/io/OpbParser.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/io/OpbParser.hpp 2024-02-19 15:58:12.866987139 -0700 +--- papilo-2.2.1/src/papilo/io/OpbParser.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/io/OpbParser.hpp 2024-06-07 12:08:24.747855027 -0600 @@ -28,7 +28,7 @@ #include "papilo/core/Objective.hpp" #include "papilo/core/Problem.hpp" @@ -135,8 +135,8 @@ #include "papilo/io/BoundType.hpp" #include "papilo/io/ParseKey.hpp" #include "papilo/misc/Flags.hpp" ---- papilo-2.2.0/src/papilo/misc/DependentRows.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/misc/DependentRows.hpp 2024-02-19 15:44:49.656384717 -0700 +--- papilo-2.2.1/src/papilo/misc/DependentRows.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/misc/DependentRows.hpp 2024-06-07 12:08:24.747855027 -0600 @@ -28,7 +28,7 @@ #ifdef PAPILO_HAVE_LUSOL extern "C" @@ -146,8 +146,8 @@ } #endif ---- papilo-2.2.0/src/papilo/presolvers/FreeVarSubstitution.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/presolvers/FreeVarSubstitution.hpp 2024-02-19 15:44:49.657384704 -0700 +--- papilo-2.2.1/src/papilo/presolvers/FreeVarSubstitution.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/presolvers/FreeVarSubstitution.hpp 2024-06-07 12:08:24.747855027 -0600 @@ -28,7 +28,7 @@ #include "papilo/core/ProblemUpdate.hpp" #include "papilo/misc/Num.hpp" @@ -157,8 +157,8 @@ #include namespace papilo ---- papilo-2.2.0/src/papilo/presolvers/ParallelColDetection.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/presolvers/ParallelColDetection.hpp 2024-02-19 15:44:49.657384704 -0700 +--- papilo-2.2.1/src/papilo/presolvers/ParallelColDetection.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/presolvers/ParallelColDetection.hpp 2024-06-07 12:08:24.747855027 -0600 @@ -30,7 +30,7 @@ #ifdef PAPILO_TBB #include "papilo/misc/tbb.hpp" @@ -168,8 +168,8 @@ namespace papilo { ---- papilo-2.2.0/src/papilo/presolvers/ParallelRowDetection.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/presolvers/ParallelRowDetection.hpp 2024-02-19 15:44:49.657384704 -0700 +--- papilo-2.2.1/src/papilo/presolvers/ParallelRowDetection.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/presolvers/ParallelRowDetection.hpp 2024-06-07 12:08:24.747855027 -0600 @@ -30,7 +30,7 @@ #ifdef PAPILO_TBB #include "papilo/misc/tbb.hpp" @@ -179,8 +179,8 @@ namespace papilo { ---- papilo-2.2.0/src/papilo/presolvers/SimplifyInequalities.hpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/src/papilo/presolvers/SimplifyInequalities.hpp 2024-02-19 15:44:49.657384704 -0700 +--- papilo-2.2.1/src/papilo/presolvers/SimplifyInequalities.hpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/src/papilo/presolvers/SimplifyInequalities.hpp 2024-06-07 12:08:24.748855015 -0600 @@ -26,7 +26,7 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" @@ -190,8 +190,8 @@ #include namespace papilo ---- papilo-2.2.0/test/CMakeLists.txt.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/CMakeLists.txt 2024-02-19 15:44:49.657384704 -0700 +--- papilo-2.2.1/test/CMakeLists.txt.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/CMakeLists.txt 2024-06-07 12:08:24.748855015 -0600 @@ -59,7 +59,7 @@ add_executable(unit_test TestMain.cpp ${BOOST_REQUIRED_TEST_FILES} ${PAPILOLIB_TEST_FILE}) @@ -201,8 +201,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") target_link_libraries(unit_test log) endif() ---- papilo-2.2.0/test/papilo/core/MatrixBufferTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/core/MatrixBufferTest.cpp 2024-02-19 15:44:49.657384704 -0700 +--- papilo-2.2.1/test/papilo/core/MatrixBufferTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/core/MatrixBufferTest.cpp 2024-06-07 12:08:24.748855015 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -212,8 +212,8 @@ #include "papilo/misc/fmt.hpp" using namespace papilo; ---- papilo-2.2.0/test/papilo/core/PostsolveTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/core/PostsolveTest.cpp 2024-02-19 15:44:49.658384691 -0700 +--- papilo-2.2.1/test/papilo/core/PostsolveTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/core/PostsolveTest.cpp 2024-06-07 12:08:24.748855015 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -223,8 +223,8 @@ #include "papilo/core/postsolve/PostsolveStatus.hpp" #include ---- papilo-2.2.0/test/papilo/core/PresolveTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/core/PresolveTest.cpp 2024-02-19 15:44:49.658384691 -0700 +--- papilo-2.2.1/test/papilo/core/PresolveTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/core/PresolveTest.cpp 2024-06-07 12:08:24.748855015 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -234,8 +234,8 @@ #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" #include "papilo/core/Reductions.hpp" ---- papilo-2.2.0/test/papilo/core/ProblemUpdateTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/core/ProblemUpdateTest.cpp 2024-02-19 15:44:49.658384691 -0700 +--- papilo-2.2.1/test/papilo/core/ProblemUpdateTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/core/ProblemUpdateTest.cpp 2024-06-07 12:08:24.748855015 -0600 @@ -20,7 +20,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -245,8 +245,8 @@ #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" #include "papilo/core/Reductions.hpp" ---- papilo-2.2.0/test/papilo/core/SparseStorageTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/core/SparseStorageTest.cpp 2024-02-19 15:44:49.658384691 -0700 +--- papilo-2.2.1/test/papilo/core/SparseStorageTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/core/SparseStorageTest.cpp 2024-06-07 12:08:24.748855015 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -256,8 +256,8 @@ #include "papilo/misc/compress_vector.hpp" papilo::SparseStorage ---- papilo-2.2.0/test/papilo/io/MpsParserTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/io/MpsParserTest.cpp 2024-02-19 15:44:49.658384691 -0700 +--- papilo-2.2.1/test/papilo/io/MpsParserTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/io/MpsParserTest.cpp 2024-06-07 12:08:24.749855003 -0600 @@ -22,7 +22,7 @@ #include @@ -267,8 +267,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" ---- papilo-2.2.0/test/PapiloLib.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/PapiloLib.cpp 2024-02-26 10:45:46.493564658 -0700 +--- papilo-2.2.1/test/PapiloLib.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/PapiloLib.cpp 2024-06-07 12:08:24.749855003 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -298,8 +298,8 @@ papilo_solver_free( solver ); } ---- papilo-2.2.0/test/papilo/misc/VectorUtilsTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/misc/VectorUtilsTest.cpp 2024-02-19 15:44:49.659384678 -0700 +--- papilo-2.2.1/test/papilo/misc/VectorUtilsTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/misc/VectorUtilsTest.cpp 2024-06-07 12:08:24.749855003 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -309,8 +309,8 @@ using namespace papilo; ---- papilo-2.2.0/test/papilo/presolve/CoefficientStrengtheningTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/CoefficientStrengtheningTest.cpp 2024-02-19 15:44:49.659384678 -0700 +--- papilo-2.2.1/test/papilo/presolve/CoefficientStrengtheningTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/CoefficientStrengtheningTest.cpp 2024-06-07 12:08:24.749855003 -0600 @@ -20,7 +20,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -320,8 +320,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/ConstraintPropagationTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/ConstraintPropagationTest.cpp 2024-02-19 15:44:49.659384678 -0700 +--- papilo-2.2.1/test/papilo/presolve/ConstraintPropagationTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/ConstraintPropagationTest.cpp 2024-06-07 12:08:24.749855003 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -331,8 +331,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/DominatedColsTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/DominatedColsTest.cpp 2024-02-19 15:44:49.659384678 -0700 +--- papilo-2.2.1/test/papilo/presolve/DominatedColsTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/DominatedColsTest.cpp 2024-06-07 12:08:24.749855003 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -342,8 +342,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/DualFixTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/DualFixTest.cpp 2024-02-19 15:44:49.659384678 -0700 +--- papilo-2.2.1/test/papilo/presolve/DualFixTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/DualFixTest.cpp 2024-06-07 12:08:24.750854990 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -353,8 +353,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/FixContinuousTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/FixContinuousTest.cpp 2024-02-19 15:44:49.659384678 -0700 +--- papilo-2.2.1/test/papilo/presolve/FixContinuousTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/FixContinuousTest.cpp 2024-06-07 12:08:24.750854990 -0600 @@ -20,7 +20,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -364,8 +364,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/FreeVarSubstitutionTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/FreeVarSubstitutionTest.cpp 2024-02-19 15:44:49.660384665 -0700 +--- papilo-2.2.1/test/papilo/presolve/FreeVarSubstitutionTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/FreeVarSubstitutionTest.cpp 2024-06-07 12:08:24.750854990 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -375,8 +375,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/ImplIntDetectionTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/ImplIntDetectionTest.cpp 2024-02-19 15:44:49.660384665 -0700 +--- papilo-2.2.1/test/papilo/presolve/ImplIntDetectionTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/ImplIntDetectionTest.cpp 2024-06-07 12:08:24.750854990 -0600 @@ -20,7 +20,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -386,8 +386,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/ParallelColDetectionTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/ParallelColDetectionTest.cpp 2024-02-19 15:44:49.660384665 -0700 +--- papilo-2.2.1/test/papilo/presolve/ParallelColDetectionTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/ParallelColDetectionTest.cpp 2024-06-07 12:08:24.750854990 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -397,8 +397,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/ParallelRowDetectionTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/ParallelRowDetectionTest.cpp 2024-02-19 15:44:49.660384665 -0700 +--- papilo-2.2.1/test/papilo/presolve/ParallelRowDetectionTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/ParallelRowDetectionTest.cpp 2024-06-07 12:08:24.751854978 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -408,8 +408,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/ProbingTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/ProbingTest.cpp 2024-02-19 15:44:49.660384665 -0700 +--- papilo-2.2.1/test/papilo/presolve/ProbingTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/ProbingTest.cpp 2024-06-07 12:08:24.751854978 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -419,8 +419,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/SimpleProbingTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/SimpleProbingTest.cpp 2024-02-19 15:44:49.660384665 -0700 +--- papilo-2.2.1/test/papilo/presolve/SimpleProbingTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/SimpleProbingTest.cpp 2024-06-07 12:08:24.751854978 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -430,8 +430,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/SimpleSubstitutionTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/SimpleSubstitutionTest.cpp 2024-02-19 15:44:49.661384652 -0700 +--- papilo-2.2.1/test/papilo/presolve/SimpleSubstitutionTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/SimpleSubstitutionTest.cpp 2024-06-07 12:08:24.751854978 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -441,8 +441,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/SimplifyInequalitiesTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/SimplifyInequalitiesTest.cpp 2024-02-19 15:44:49.661384652 -0700 +--- papilo-2.2.1/test/papilo/presolve/SimplifyInequalitiesTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/SimplifyInequalitiesTest.cpp 2024-06-07 12:08:24.751854978 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -452,8 +452,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/SingletonColsTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/SingletonColsTest.cpp 2024-02-19 15:44:49.661384652 -0700 +--- papilo-2.2.1/test/papilo/presolve/SingletonColsTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/SingletonColsTest.cpp 2024-06-07 12:08:24.751854978 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -463,8 +463,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/SingletonStuffingTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/SingletonStuffingTest.cpp 2024-02-19 15:44:49.661384652 -0700 +--- papilo-2.2.1/test/papilo/presolve/SingletonStuffingTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/SingletonStuffingTest.cpp 2024-06-07 12:08:24.752854965 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -474,8 +474,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/papilo/presolve/SparsifyTest.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/papilo/presolve/SparsifyTest.cpp 2024-02-19 15:44:49.661384652 -0700 +--- papilo-2.2.1/test/papilo/presolve/SparsifyTest.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/papilo/presolve/SparsifyTest.cpp 2024-06-07 12:08:24.752854965 -0600 @@ -21,7 +21,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -485,8 +485,8 @@ #include "papilo/core/PresolveMethod.hpp" #include "papilo/core/Problem.hpp" #include "papilo/core/ProblemBuilder.hpp" ---- papilo-2.2.0/test/TestMain.cpp.orig 2024-02-08 04:11:10.000000000 -0700 -+++ papilo-2.2.0/test/TestMain.cpp 2024-02-19 15:44:49.662384639 -0700 +--- papilo-2.2.1/test/TestMain.cpp.orig 2024-05-06 06:07:02.000000000 -0600 ++++ papilo-2.2.1/test/TestMain.cpp 2024-06-07 12:08:24.752854965 -0600 @@ -22,4 +22,4 @@ #define CATCH_CONFIG_MAIN diff --git a/papilo-vector-bounds.patch b/papilo-vector-bounds.patch index 6ee1e72..e41b0bc 100644 --- a/papilo-vector-bounds.patch +++ b/papilo-vector-bounds.patch @@ -1,5 +1,5 @@ ---- papilo-2.2.0/src/papilo/core/SparseStorage.hpp.orig 2024-02-19 15:44:49.656384717 -0700 -+++ papilo-2.2.0/src/papilo/core/SparseStorage.hpp 2024-02-19 15:50:47.920748054 -0700 +--- papilo-2.2.1/src/papilo/core/SparseStorage.hpp.orig 2024-06-07 12:08:24.746855040 -0600 ++++ papilo-2.2.1/src/papilo/core/SparseStorage.hpp 2024-06-07 12:13:44.085783196 -0600 @@ -857,15 +857,15 @@ SparseStorage::shiftRows( const in // space } while( rowranges[l].start == rowranges[l - 1].end ); @@ -69,12 +69,12 @@ } rowranges[r].start += shift; ---- papilo-2.2.0/src/papilo/presolvers/ParallelColDetection.hpp.orig 2024-02-19 15:44:49.657384704 -0700 -+++ papilo-2.2.0/src/papilo/presolvers/ParallelColDetection.hpp 2024-03-06 06:48:56.980339757 -0700 -@@ -588,13 +588,16 @@ ParallelColDetection::execute( con - bool flag_b_integer = cflags[b].test( ColFlag::kIntegral ); +--- papilo-2.2.1/src/papilo/presolvers/ParallelColDetection.hpp.orig 2024-06-07 12:08:24.747855027 -0600 ++++ papilo-2.2.1/src/papilo/presolvers/ParallelColDetection.hpp 2024-06-07 12:16:57.755305982 -0600 +@@ -598,13 +598,16 @@ ParallelColDetection::execute( con if( flag_a_integer != flag_b_integer ) return !flag_a_integer; + + SparseVectorView coeffs_a = constMatrix.getColumnCoefficients( a ); + SparseVectorView coeffs_b = constMatrix.getColumnCoefficients( b ); + REAL coeff_a = (coeffs_a.getLength() > 0) ? coeffs_a.getValues()[0] : (REAL)0; diff --git a/papilo.spec b/papilo.spec index e156569..d64507f 100644 --- a/papilo.spec +++ b/papilo.spec @@ -11,7 +11,7 @@ %bcond bootstrap 0 Name: papilo -Version: 2.2.0 +Version: 2.2.1 Release: %autorelease Summary: Parallel presolve for integer and linear optimization @@ -69,7 +69,7 @@ the boost multiprecision package.} Summary: Library interface to PaPILO # The bundled version of fmt is incompatible with version 10 in Rawhide. -Provides: bundled(fmt) = 6.1.2 +Provides: bundled(fmt) = 7.1.3 %description -n libpapilo %_desc diff --git a/sources b/sources index 281e2c1..367806f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (papilo-2.2.0.tar.gz) = 60ae678d6aed5a1cba933aecebf45c3808d60fb3461f5fdf13b898a69652d357856325b2ec1d42b5ccc011085393bd98dc55bf90fb204d81fac86f15a0d0ca15 +SHA512 (papilo-2.2.1.tar.gz) = a1de159c866e85df9176971707cdbd6a8b9574a1fcc1419fbc2124867b42d5b1baa24f8a8d67a1bfb33b2f0f1655edd8916c82e8154821f87f131fc71af35bfe