Try again

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
Change BLAS from INTERFACE to PRIVATE
2024-11-22 13:24:24 +02:00 · 2024-11-22 12:57:42 +02:00 · 2024-11-22 11:40:54 +02:00 · 2024-11-22 10:27:40 +02:00 · 2024-11-21 16:03:00 +02:00 · 2024-09-23 11:21:47 -06:00
4 changed files with 234 additions and 239 deletions
--- a/papilo-test.patch
+++ b/papilo-test.patch
@ -1,87 +0,0 @@
--- 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()
- 
- set(unit_tests
-        "accurate-numerical-statistics"
-
-         "matrix-buffer"
-         "vector-comparisons"
-         "matrix-comparisons"
-@@ -94,7 +92,7 @@ set(unit_tests
-         "domcol-happy-path"
-         "domcol-parallel-columns"
-         "domcol-multiple-parallel-cols-generate_redundant-reductions"
-        "domcol-multiple-column"
-+        #"domcol-multiple-columns"
- 
-         #DualFix
-         "dual-fix-happy-path"
-@@ -130,13 +128,13 @@ set(unit_tests
-         "parallel-row-two-inequalities-tighten-upper-bound-first-row-dominant"
-         "parallel-row-two-inequalities-infeasible-first-row-dominant"
-         "parallel-row-two-inequalities-infeasible-second-row-dominant"
-        "parallel-row-two-inequalities-tighten-upper-bound-first-row-neg"
-+        "parallel-row-two-inequalities-tighten-upper-bound-first-row-negfactor-dominant"
-         "parallel-row-overwrite-inf-first-row-rhs-inf"
-         "parallel-row-overwrite-inf-first-row-lhs-inf"
-         "parallel-row-overwrite-inf-first-row-lhs-inf-neg-factor"
-         "parallel-row-mixed-infeasible-first-row-equation"
-         "parallel-row-best-bound-is-used-for-rhs-coeff-not-1"
-        "parallel-row-best-bound-is-used-for-rhs-coeff"
-+        "parallel-row-best-bound-is-used-for-rhs"
-         "parallel-row-mixed-second-row-equation"
-         "parallel-row-mixed-infeasible-second-row-equation"
-         "parallel-row-multiple-parallel-rows"
-@@ -165,6 +163,7 @@ set(unit_tests
-         "happy-path-singleton-column-implied-bounds-negative-coeff-neg-bounds"
-         "happy-path-singleton-column-implied-bounds-positive-coeff-pos-bounds"
-         "happy-path-singleton-column-implied-bounds-positive-coeff-neg-bounds"
-+        "happy-path-singleton-column-infinity-bounds-equation"
- 
-         #Singleton Stuffing
-         "singleton-stuffing-make-sure-to-first-set-bounds-to-infinity"
-@@ -174,32 +173,35 @@ set(unit_tests
-         "simple-probing-negative-binary-coeff"
-         "simple-probing-positive-binary-coeff"
-         "simple-different-int-coeff"
-        "simple-different-int-coeff-pt2"
-+        #"simple-different-int-coeff.pt2"
- 
-         #Simple Substitution
-         "simple-substitution-happy-path-for-2-int"
-         "simple-substitution-happy-path-for-2-continuous"
-         "simple-substitution-happy-path-for-continuous-and-integer"
-         "simple-substitution-happy-path-for-int-continuous-coeff"
-        "simple-substitution-should_return_infeasible_if_gcd_of_coeff_is_in_rhs"
-        "simple-substitution-should_return_feasible_if_gcd_of_coeff_is_in_rhs"
-        "simple-substitution-failed-path-for-2-int"
-+        "simple-substitution-simple-substitution-for-2-int"
-+        "example_10_1_in_constraint_integer_programming"
-+        "should_return_infeasible_if_gcd_of_coeff_is_in_rhs"
-+        "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
-        "happy-path-simplify-inequalities-only-greatest-divisor"
-+        #"happy-path-simplify-inequalities"
-         "simplify_inequ_doesnt_lock_more_rows"
-         "simplify_inequ_doesnt_apply_lb_and_ub_on_one_row"
- 
-         #Sparsify
-         "happy-path-sparsify"
-         "happy-path-sparsify-two-equalities"
-        "failed-path-sparsify"
-+        "failed-path-sparsify-if-misses-one-for-integer"
-+        "happy-path-sparsify-if-misses-one-for-continuous"
-+        "happy-path-sparsify-if-misses-one-for-continuous_2"
-+        "failed-path-sparsify-if-misses-two-for-continuous"
- 
-        "integration-test-for-flugpl"
-         ${PAPILOLIB_TESTS}
-         ${BOOST_REQUIRED_TESTS}
-         )
--- a/papilo-unbundle.patch
+++ b/papilo-unbundle.patch
@ -1,6 +1,8 @@
--- 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()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2408b54..2e204b6 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -204,27 +204,13 @@ else()
 endif()
 
 if(LUSOL)
@ -26,10 +28,14 @@
    set(PAPILO_HAVE_LUSOL 1)
 -   set(CLUSOL_TARGET clusol)
 +   set(CLUSOL_TARGET "")
+   find_package(BLAS)
+   if(BLAS_FOUND)
+      target_link_libraries(papilo ${BLAS_LIBRARIES})
+   endif()
 else()
    set(PAPILO_HAVE_LUSOL 0)
    set(CLUSOL_TARGET "")
-@@ -240,17 +222,7 @@ if(NOT MSVC)
+@@ -245,17 +231,7 @@ if(NOT MSVC)
       endif()
    endif()
 endif()
@ -48,7 +54,7 @@
 
 add_library(papilo-core STATIC
    src/papilo/core/VariableDomains.cpp
-@@ -453,20 +425,6 @@ install(FILES
+@@ -458,20 +434,6 @@ install(FILES
      ${PROJECT_SOURCE_DIR}/src/papilo/external/fmt/ranges.h
  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/papilo/external/fmt)
 
@ -69,8 +75,10 @@
 # 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.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
+diff --git a/src/convMPS.cpp b/src/convMPS.cpp
+index 2398c4f..5897b9a 100644
+--- a/src/convMPS.cpp
+++ b/src/convMPS.cpp
@@ -36,7 +36,7 @@
 #ifdef PAPILO_TBB
 #include "papilo/misc/tbb.hpp"
@ -80,8 +88,10 @@
 #include "tbb/concurrent_unordered_set.h"
 #include <algorithm>
 
--- 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
+diff --git a/src/duplicates.cpp b/src/duplicates.cpp
+index 5767e29..bfbee3d 100644
+--- a/src/duplicates.cpp
+++ b/src/duplicates.cpp
@@ -30,7 +30,7 @@
 #ifdef PAPILO_TBB
 #include "papilo/misc/tbb.hpp"
@ -91,8 +101,10 @@
 #include <algorithm>
 #include <sys/stat.h>
 
--- 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
+diff --git a/src/papilo/core/Components.hpp b/src/papilo/core/Components.hpp
+index f27cd1c..9502e0f 100644
+--- a/src/papilo/core/Components.hpp
+++ b/src/papilo/core/Components.hpp
@@ -26,7 +26,7 @@
 #include "papilo/core/Problem.hpp"
 #include "papilo/misc/Hash.hpp"
@ -102,8 +114,10 @@
 #include <boost/pending/disjoint_sets.hpp>
 
 namespace papilo
--- 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
+diff --git a/src/papilo/core/SparseStorage.hpp b/src/papilo/core/SparseStorage.hpp
+index ce55c4d..bd0908e 100644
+--- a/src/papilo/core/SparseStorage.hpp
+++ b/src/papilo/core/SparseStorage.hpp
@@ -25,7 +25,7 @@
 
 #include "papilo/misc/MultiPrecision.hpp"
@ -113,8 +127,10 @@
 #include <algorithm>
 #include <cassert>
 #include <cstdint>
--- 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
+diff --git a/src/papilo/io/MpsParser.hpp b/src/papilo/io/MpsParser.hpp
+index f8ec4ba..ca840d3 100644
+--- a/src/papilo/io/MpsParser.hpp
+++ b/src/papilo/io/MpsParser.hpp
@@ -29,7 +29,7 @@
 #include "papilo/core/Objective.hpp"
 #include "papilo/core/Problem.hpp"
@ -124,8 +140,10 @@
 #include "papilo/io/BoundType.hpp"
 #include "papilo/io/ParseKey.hpp"
 #include "papilo/misc/Flags.hpp"
--- 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
+diff --git a/src/papilo/io/OpbParser.hpp b/src/papilo/io/OpbParser.hpp
+index 9920b19..c4e423c 100644
+--- a/src/papilo/io/OpbParser.hpp
+++ b/src/papilo/io/OpbParser.hpp
@@ -28,7 +28,7 @@
 #include "papilo/core/Objective.hpp"
 #include "papilo/core/Problem.hpp"
@ -135,8 +153,10 @@
 #include "papilo/io/BoundType.hpp"
 #include "papilo/io/ParseKey.hpp"
 #include "papilo/misc/Flags.hpp"
--- 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
+diff --git a/src/papilo/misc/DependentRows.hpp b/src/papilo/misc/DependentRows.hpp
+index 557c7b7..90b7563 100644
+--- a/src/papilo/misc/DependentRows.hpp
+++ b/src/papilo/misc/DependentRows.hpp
@@ -28,7 +28,7 @@
 #ifdef PAPILO_HAVE_LUSOL
 extern "C"
@ -146,8 +166,10 @@
 }
 #endif
 
--- 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
+diff --git a/src/papilo/presolvers/FreeVarSubstitution.hpp b/src/papilo/presolvers/FreeVarSubstitution.hpp
+index 9687f13..6bcc6b3 100644
+--- a/src/papilo/presolvers/FreeVarSubstitution.hpp
+++ b/src/papilo/presolvers/FreeVarSubstitution.hpp
@@ -28,7 +28,7 @@
 #include "papilo/core/ProblemUpdate.hpp"
 #include "papilo/misc/Num.hpp"
@ -157,8 +179,10 @@
 #include <boost/dynamic_bitset.hpp>
 
 namespace papilo
--- 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
+diff --git a/src/papilo/presolvers/ParallelColDetection.hpp b/src/papilo/presolvers/ParallelColDetection.hpp
+index f353a5d..ecbd8e3 100644
+--- a/src/papilo/presolvers/ParallelColDetection.hpp
+++ b/src/papilo/presolvers/ParallelColDetection.hpp
@@ -30,7 +30,7 @@
 #ifdef PAPILO_TBB
 #include "papilo/misc/tbb.hpp"
@ -168,8 +192,10 @@
 
 namespace papilo
 {
--- 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
+diff --git a/src/papilo/presolvers/ParallelRowDetection.hpp b/src/papilo/presolvers/ParallelRowDetection.hpp
+index 11e5cee..e85b853 100644
+--- a/src/papilo/presolvers/ParallelRowDetection.hpp
+++ b/src/papilo/presolvers/ParallelRowDetection.hpp
@@ -30,7 +30,7 @@
 #ifdef PAPILO_TBB
 #include "papilo/misc/tbb.hpp"
@ -179,8 +205,10 @@
 
 namespace papilo
 {
--- 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
+diff --git a/src/papilo/presolvers/SimplifyInequalities.hpp b/src/papilo/presolvers/SimplifyInequalities.hpp
+index 3d80ba0..5381940 100644
+--- a/src/papilo/presolvers/SimplifyInequalities.hpp
+++ b/src/papilo/presolvers/SimplifyInequalities.hpp
@@ -26,7 +26,7 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
@ -190,8 +218,10 @@
 #include <boost/integer/common_factor.hpp>
 
 namespace papilo
--- 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
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 57f783c..d32eb4f 100644
+--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -59,7 +59,7 @@ add_executable(unit_test TestMain.cpp
         ${BOOST_REQUIRED_TEST_FILES}
         ${PAPILOLIB_TEST_FILE})
@ -201,74 +231,10 @@
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
     target_link_libraries(unit_test log)
 endif()
--- 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 @@
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- 
- #include "papilo/core/MatrixBuffer.hpp"
-#include "papilo/external/catch/catch.hpp"
-+#include <catch2/catch_all.hpp>
- #include "papilo/misc/fmt.hpp"
- 
- using namespace papilo;
--- 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 @@
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- 
- #include "papilo/core/postsolve/Postsolve.hpp"
-#include "papilo/external/catch/catch.hpp"
-+#include <catch2/catch_all.hpp>
- #include "papilo/core/postsolve/PostsolveStatus.hpp"
- #include <boost/archive/binary_iarchive.hpp>
- 
--- 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 @@
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- 
- #include "papilo/core/Presolve.hpp"
-#include "papilo/external/catch/catch.hpp"
-+#include <catch2/catch_all.hpp>
- #include "papilo/core/Problem.hpp"
- #include "papilo/core/ProblemBuilder.hpp"
- #include "papilo/core/Reductions.hpp"
--- 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 @@
- /*                                                                           */
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- 
-#include "papilo/external/catch/catch.hpp"
-+#include <catch2/catch_all.hpp>
- #include "papilo/core/Problem.hpp"
- #include "papilo/core/ProblemBuilder.hpp"
- #include "papilo/core/Reductions.hpp"
--- 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 @@
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- 
- #include "papilo/core/SparseStorage.hpp"
-#include "papilo/external/catch/catch.hpp"
-+#include <catch2/catch_all.hpp>
- #include "papilo/misc/compress_vector.hpp"
- 
- papilo::SparseStorage<double>
--- 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 <memory>
- #include "papilo/io/MpsParser.hpp"
-#include "papilo/external/catch/catch.hpp"
-+#include <catch2/catch_all.hpp>
- #include "papilo/core/PresolveMethod.hpp"
- #include "papilo/core/Problem.hpp"
- 
--- 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
+diff --git a/test/PapiloLib.cpp b/test/PapiloLib.cpp
+index 10d55b2..f8dd379 100644
+--- a/test/PapiloLib.cpp
+++ b/test/PapiloLib.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -298,8 +264,98 @@
 
    papilo_solver_free( solver );
 }
--- 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
+diff --git a/test/TestMain.cpp b/test/TestMain.cpp
+index 689f088..5a5b5a9 100644
+--- a/test/TestMain.cpp
+++ b/test/TestMain.cpp
+@@ -22,4 +22,4 @@
+ 
+ #define CATCH_CONFIG_MAIN
+ 
+-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
+diff --git a/test/papilo/core/MatrixBufferTest.cpp b/test/papilo/core/MatrixBufferTest.cpp
+index ef63d4c..bb4305a 100644
+--- a/test/papilo/core/MatrixBufferTest.cpp
+++ b/test/papilo/core/MatrixBufferTest.cpp
+@@ -21,7 +21,7 @@
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+ #include "papilo/core/MatrixBuffer.hpp"
+-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
+ #include "papilo/misc/fmt.hpp"
+ 
+ using namespace papilo;
+diff --git a/test/papilo/core/PostsolveTest.cpp b/test/papilo/core/PostsolveTest.cpp
+index 701382e..2374fc8 100644
+--- a/test/papilo/core/PostsolveTest.cpp
+++ b/test/papilo/core/PostsolveTest.cpp
+@@ -21,7 +21,7 @@
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+ #include "papilo/core/postsolve/Postsolve.hpp"
+-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
+ #include "papilo/core/postsolve/PostsolveStatus.hpp"
+ #include <boost/archive/binary_iarchive.hpp>
+ 
+diff --git a/test/papilo/core/PresolveTest.cpp b/test/papilo/core/PresolveTest.cpp
+index 7ac214a..16cdac2 100644
+--- a/test/papilo/core/PresolveTest.cpp
+++ b/test/papilo/core/PresolveTest.cpp
+@@ -21,7 +21,7 @@
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+ #include "papilo/core/Presolve.hpp"
+-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
+ #include "papilo/core/Problem.hpp"
+ #include "papilo/core/ProblemBuilder.hpp"
+ #include "papilo/core/Reductions.hpp"
+diff --git a/test/papilo/core/ProblemUpdateTest.cpp b/test/papilo/core/ProblemUpdateTest.cpp
+index 94c9b36..a3f8ed9 100644
+--- a/test/papilo/core/ProblemUpdateTest.cpp
+++ b/test/papilo/core/ProblemUpdateTest.cpp
+@@ -20,7 +20,7 @@
+ /*                                                                           */
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
+ #include "papilo/core/Problem.hpp"
+ #include "papilo/core/ProblemBuilder.hpp"
+ #include "papilo/core/Reductions.hpp"
+diff --git a/test/papilo/core/SparseStorageTest.cpp b/test/papilo/core/SparseStorageTest.cpp
+index dbe1d2c..a739d03 100644
+--- a/test/papilo/core/SparseStorageTest.cpp
+++ b/test/papilo/core/SparseStorageTest.cpp
+@@ -21,7 +21,7 @@
+ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+ #include "papilo/core/SparseStorage.hpp"
+-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
+ #include "papilo/misc/compress_vector.hpp"
+ 
+ papilo::SparseStorage<double>
+diff --git a/test/papilo/io/MpsParserTest.cpp b/test/papilo/io/MpsParserTest.cpp
+index 6c01343..fe43ea5 100644
+--- a/test/papilo/io/MpsParserTest.cpp
+++ b/test/papilo/io/MpsParserTest.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include <memory>
+ #include "papilo/io/MpsParser.hpp"
+-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
+ #include "papilo/core/PresolveMethod.hpp"
+ #include "papilo/core/Problem.hpp"
+ 
+diff --git a/test/papilo/misc/VectorUtilsTest.cpp b/test/papilo/misc/VectorUtilsTest.cpp
+index 691f0d0..5116877 100644
+--- a/test/papilo/misc/VectorUtilsTest.cpp
+++ b/test/papilo/misc/VectorUtilsTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -309,8 +365,10 @@
 
 using namespace papilo;
 
--- 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
+diff --git a/test/papilo/presolve/CoefficientStrengtheningTest.cpp b/test/papilo/presolve/CoefficientStrengtheningTest.cpp
+index 9b55947..f6e58d5 100644
+--- a/test/papilo/presolve/CoefficientStrengtheningTest.cpp
+++ b/test/papilo/presolve/CoefficientStrengtheningTest.cpp
@@ -20,7 +20,7 @@
 /*                                                                           */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@ -320,8 +378,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/ConstraintPropagationTest.cpp b/test/papilo/presolve/ConstraintPropagationTest.cpp
+index a1c16bd..538d617 100644
+--- a/test/papilo/presolve/ConstraintPropagationTest.cpp
+++ b/test/papilo/presolve/ConstraintPropagationTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -331,8 +391,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/DominatedColsTest.cpp b/test/papilo/presolve/DominatedColsTest.cpp
+index 5915b5b..4775269 100644
+--- a/test/papilo/presolve/DominatedColsTest.cpp
+++ b/test/papilo/presolve/DominatedColsTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -342,8 +404,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/DualFixTest.cpp b/test/papilo/presolve/DualFixTest.cpp
+index 95edefd..583730a 100644
+--- a/test/papilo/presolve/DualFixTest.cpp
+++ b/test/papilo/presolve/DualFixTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -353,8 +417,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/FixContinuousTest.cpp b/test/papilo/presolve/FixContinuousTest.cpp
+index c6278ec..b9857d6 100644
+--- a/test/papilo/presolve/FixContinuousTest.cpp
+++ b/test/papilo/presolve/FixContinuousTest.cpp
@@ -20,7 +20,7 @@
 /*                                                                           */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@ -364,8 +430,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/FreeVarSubstitutionTest.cpp b/test/papilo/presolve/FreeVarSubstitutionTest.cpp
+index 36df2ca..36a7f43 100644
+--- a/test/papilo/presolve/FreeVarSubstitutionTest.cpp
+++ b/test/papilo/presolve/FreeVarSubstitutionTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -375,8 +443,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/ImplIntDetectionTest.cpp b/test/papilo/presolve/ImplIntDetectionTest.cpp
+index ee8a85b..9937677 100644
+--- a/test/papilo/presolve/ImplIntDetectionTest.cpp
+++ b/test/papilo/presolve/ImplIntDetectionTest.cpp
@@ -20,7 +20,7 @@
 /*                                                                           */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@ -386,8 +456,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/ParallelColDetectionTest.cpp b/test/papilo/presolve/ParallelColDetectionTest.cpp
+index 125f3b0..642ce0e 100644
+--- a/test/papilo/presolve/ParallelColDetectionTest.cpp
+++ b/test/papilo/presolve/ParallelColDetectionTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -397,8 +469,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/ParallelRowDetectionTest.cpp b/test/papilo/presolve/ParallelRowDetectionTest.cpp
+index dd9a582..13033d6 100644
+--- a/test/papilo/presolve/ParallelRowDetectionTest.cpp
+++ b/test/papilo/presolve/ParallelRowDetectionTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -408,8 +482,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/ProbingTest.cpp b/test/papilo/presolve/ProbingTest.cpp
+index 3da0e57..4a78128 100644
+--- a/test/papilo/presolve/ProbingTest.cpp
+++ b/test/papilo/presolve/ProbingTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -419,8 +495,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/SimpleProbingTest.cpp b/test/papilo/presolve/SimpleProbingTest.cpp
+index 4d2bd86..0d6e542 100644
+--- a/test/papilo/presolve/SimpleProbingTest.cpp
+++ b/test/papilo/presolve/SimpleProbingTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -430,8 +508,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/SimpleSubstitutionTest.cpp b/test/papilo/presolve/SimpleSubstitutionTest.cpp
+index 5514d61..723f48b 100644
+--- a/test/papilo/presolve/SimpleSubstitutionTest.cpp
+++ b/test/papilo/presolve/SimpleSubstitutionTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -441,8 +521,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/SimplifyInequalitiesTest.cpp b/test/papilo/presolve/SimplifyInequalitiesTest.cpp
+index 200f4b9..a108b05 100644
+--- a/test/papilo/presolve/SimplifyInequalitiesTest.cpp
+++ b/test/papilo/presolve/SimplifyInequalitiesTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -452,8 +534,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/SingletonColsTest.cpp b/test/papilo/presolve/SingletonColsTest.cpp
+index f00244f..da0a518 100644
+--- a/test/papilo/presolve/SingletonColsTest.cpp
+++ b/test/papilo/presolve/SingletonColsTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -463,8 +547,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/SingletonStuffingTest.cpp b/test/papilo/presolve/SingletonStuffingTest.cpp
+index 8a5b3cf..84be4ee 100644
+--- a/test/papilo/presolve/SingletonStuffingTest.cpp
+++ b/test/papilo/presolve/SingletonStuffingTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -474,8 +560,10 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
+diff --git a/test/papilo/presolve/SparsifyTest.cpp b/test/papilo/presolve/SparsifyTest.cpp
+index fb0440e..afde146 100644
+--- a/test/papilo/presolve/SparsifyTest.cpp
+++ b/test/papilo/presolve/SparsifyTest.cpp
@@ -21,7 +21,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@ -485,11 +573,3 @@
 #include "papilo/core/PresolveMethod.hpp"
 #include "papilo/core/Problem.hpp"
 #include "papilo/core/ProblemBuilder.hpp"
--- 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
- 
-#include "papilo/external/catch/catch.hpp"
-+#include <catch2/catch_all.hpp>
--- a/papilo.spec
+++ b/papilo.spec
@ -8,11 +8,13 @@
 # The papilo binary depends on several solvers that transitively depend on the
 # papilo library.  In a bootstrap situation, first build the binary without
 # solver support, build the solvers, then do a non-bootstrap build.
-%bcond bootstrap 0
+%bcond bootstrap 1
+
+%global giturl  https://github.com/scipopt/papilo/

 Name:           papilo
-Version:        2.3.0
-Release:        %autorelease
+Version:        2.3.1
+Release:        %autorelease -e 0.riscv64
 Summary:        Parallel presolve for integer and linear optimization

 # LGPL-3.0-or-later: the project as a whole
@ -21,17 +23,15 @@ Summary:        Parallel presolve for integer and linear optimization
 # MIT: the bundled fmt project
 License:        LGPL-3.0-or-later AND BSL-1.0 AND Zlib AND MIT
 URL:            https://www.scipopt.org/
-VCS:            https://github.com/scipopt/papilo/
-Source0:        %{vcs}/archive/v%{version}/%{name}-%{version}.tar.gz
+VCS:            git:%{giturl}.git
+Source:         %{giturl}/archive/v%{version}/%{name}-%{version}.tar.gz
 # Unbundle catch, LUSOL, pdqsort, and ska
-Patch0:         %{name}-unbundle.patch
+Patch:          %{name}-unbundle.patch
 # Build a shared library instead of a static library
-Patch1:         %{name}-shared.patch
-# The list of tests in CMakeLists.txt doesn't match the actual tests
-Patch2:         %{name}-test.patch
+Patch:          %{name}-shared.patch
 # Avoid out-of-bounds vector access
 # https://github.com/scipopt/papilo/pull/48
-Patch3:         %{name}-vector-bounds.patch
+Patch:          %{name}-vector-bounds.patch

 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
@ -42,9 +42,11 @@ BuildRequires:  cmake(catch2)
 BuildRequires:  cmake(tbb)
 BuildRequires:  gcc-c++
 BuildRequires:  help2man
+BuildRequires:  libatomic
 %if %{quadmath}
 BuildRequires:  libquadmath-devel
 %endif
+BuildRequires:  openblas-devel
 BuildRequires:  lusol-devel
 BuildRequires:  pdqsort-static
 BuildRequires:  pkgconfig(gmp)
@ -119,8 +121,8 @@ cd -
 sed -i 's,\./\(papilo\),\1,' %{buildroot}%{_mandir}/man1/papilo.1

 %check
-# Temporarily skip a test that is broken in the 2.3.0 release
-%ctest -E '(d|q)-solve-rgn\.mps-default\.set'
+# Temporarily skip a test that is broken in the 2.3.1 release
+%ctest -E 'q-solve-rgn\.mps-default\.set'

 %files
 %doc CHANGELOG README.md parameters.txt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (papilo-2.3.0.tar.gz) = a33f325774a060a0c89e0568ced07a771f01dfd244e190d0d11fa2e0465f5acb2555f1d842288e32c0f8826e343395162cf4fa3585d1e4f2b805061851f32cfc
+SHA512 (papilo-2.3.1.tar.gz) = 3b1df7fdfbac0df9e5e0c0e682dae522f9744b5f93d3a3a8d462f787e05fc86911daa33673643613d873c3611a52a8a723d6e552d6c830a2a6032ceaeb262c5a
Author	SHA1	Message	Date
David Abdurachmanov	bf54999781	Try again Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-11-22 13:24:24 +02:00
David Abdurachmanov	5e7e294f72	Change BLAS from INTERFACE to PRIVATE Compiling soplex: gmake[2]: *** No rule to make target '/usr/lib64/libopenblas.so', needed by 'lib/libsoplex.so.7.1.1.0'. Stop. In papilo usr/lib64/cmake/papilo/papilo-targets.cmake INTERFACE_LINK_LIBRARIES incl. /usr/lib64/libopenblas.so Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-11-22 12:57:42 +02:00
David Abdurachmanov	60bc4ee6c4	Update patch Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-11-22 11:40:54 +02:00
David Abdurachmanov	6ce1b6c1a0	Link to BLAS library clusol uses functions from BLAS library. If not linked those get undefined. [..] /usr/bin/ld: /lib64/lp64d/../lib64/lp64d/libclusol.so: undefined reference to `dscal_' /usr/bin/ld: /lib64/lp64d/../lib64/lp64d/libclusol.so: undefined reference to `daxpy_' /usr/bin/ld: /lib64/lp64d/../lib64/lp64d/libclusol.so: undefined reference to `dcopy_' /usr/bin/ld: /lib64/lp64d/../lib64/lp64d/libclusol.so: undefined reference to `idamax_' collect2: error: ld returned 1 exit status gmake[2]: *** [binaries/CMakeFiles/papilo-executable.dir/build.make:107: bin/papilo] Error 1 [..] Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-11-22 10:27:40 +02:00
David Abdurachmanov	607504c8ab	Merge remote-tracking branch 'up/main' into main-riscv64 Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-11-21 16:03:00 +02:00
Jerry James	4e899ba20f	Version 2.3.1 - Drop upstreamed test patch - BR libatomic for architectures that need it	2024-09-23 11:21:47 -06:00
Fedora Release Engineering	6b9786fa23	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-18 21:26:24 +00:00
Jerry James	11ba5a2c03	Fix the VCS field	2024-07-17 14:36:57 -06:00
David Abdurachmanov	7a934666c3	Bootstrap (riscv64) Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2024-07-15 13:08:54 +03:00