From 6ce1b6c1a03e0d31d5ef41542e8e7a0907aed867 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Fri, 22 Nov 2024 10:27:40 +0200 Subject: [PATCH] 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 --- papilo-unbundle.patch | 359 ++++++++++++++++++++++++++---------------- papilo.spec | 1 + 2 files changed, 220 insertions(+), 140 deletions(-) diff --git a/papilo-unbundle.patch b/papilo-unbundle.patch index daa42e9..42b90de 100644 --- a/papilo-unbundle.patch +++ b/papilo-unbundle.patch @@ -1,12 +1,14 @@ ---- 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..f9da54a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -204,27 +204,13 @@ else() endif() if(LUSOL) - include(CheckLanguage) - check_language(Fortran) -- find_package(BLAS) + find_package(BLAS) -endif() -if(CMAKE_Fortran_COMPILER AND BLAS_FOUND) - enable_language(Fortran) @@ -22,6 +24,9 @@ - set_property(TARGET clusol PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(clusol PRIVATE src/papilo/external/lusol) - target_link_libraries(clusol ${BLAS_LIBRARIES}) ++ if(BLAS_FOUND) ++ target_link_libraries(papilo INTERFACE ${BLAS_LIBRARIES}) ++ endif() target_link_libraries(papilo INTERFACE clusol) set(PAPILO_HAVE_LUSOL 1) - set(CLUSOL_TARGET clusol) @@ -29,7 +34,7 @@ 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 +53,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 +74,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 +87,10 @@ #include "tbb/concurrent_unordered_set.h" #include ---- 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 +100,10 @@ #include #include ---- 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 +113,10 @@ #include 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 +126,10 @@ #include #include #include ---- 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 +139,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 +152,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 +165,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 +178,10 @@ #include 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 +191,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 +204,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 +217,10 @@ #include 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 +230,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 - #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 - #include "papilo/core/postsolve/PostsolveStatus.hpp" - #include - ---- 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 - #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 - #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 - #include "papilo/misc/compress_vector.hpp" - - papilo::SparseStorage ---- 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 - #include "papilo/io/MpsParser.hpp" --#include "papilo/external/catch/catch.hpp" -+#include - #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 +263,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 +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 + #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 + #include "papilo/core/postsolve/PostsolveStatus.hpp" + #include + +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 + #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 + #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 + #include "papilo/misc/compress_vector.hpp" + + papilo::SparseStorage +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 + #include "papilo/io/MpsParser.hpp" +-#include "papilo/external/catch/catch.hpp" ++#include + #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 +364,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 +377,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 +390,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 +403,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 +416,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 +429,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 +442,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 +455,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 +468,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 +481,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 +494,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 +507,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 +520,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 +533,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 +546,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 +559,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 +572,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 diff --git a/papilo.spec b/papilo.spec index 30a579f..69f2274 100644 --- a/papilo.spec +++ b/papilo.spec @@ -46,6 +46,7 @@ BuildRequires: libatomic %if %{quadmath} BuildRequires: libquadmath-devel %endif +BuildRequires: openblas-devel BuildRequires: lusol-devel BuildRequires: pdqsort-static BuildRequires: pkgconfig(gmp)