rpms/papilo
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22ca7ce58d
papilo/papilo-unbundle.patch
Jerry James 22ca7ce58d Version 2.2.1
2024-06-19 08:58:50 -06:00

496 lines
21 KiB
Diff
Raw Blame History

--- 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)
- include(CheckLanguage)
- check_language(Fortran)
- find_package(BLAS)
-endif()
-if(CMAKE_Fortran_COMPILER AND BLAS_FOUND)
- enable_language(Fortran)
-
- add_library(clusol STATIC
- src/papilo/external/lusol/src/lusol6b.f
- src/papilo/external/lusol/src/lusol7b.f
- src/papilo/external/lusol/src/lusol8b.f
- src/papilo/external/lusol/src/lusol_util.f
- src/papilo/external/lusol/src/lusol.f90
- src/papilo/external/lusol/src/clusol.c
- src/papilo/external/lusol/src/lusol_precision.f90)
- set_property(TARGET clusol PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_include_directories(clusol PRIVATE src/papilo/external/lusol)
- target_link_libraries(clusol ${BLAS_LIBRARIES})
target_link_libraries(papilo INTERFACE clusol)
set(PAPILO_HAVE_LUSOL 1)
- set(CLUSOL_TARGET clusol)
+ set(CLUSOL_TARGET "")
else()
set(PAPILO_HAVE_LUSOL 0)
set(CLUSOL_TARGET "")
@@ -240,17 +222,7 @@ if(NOT MSVC)
endif()
endif()
endif()
-set(CMAKE_REQUIRED_INCLUDES ${PROJECT_SOURCE_DIR}/src/papilo/external)
-check_cxx_source_compiles(
- "#include \"ska/bytell_hash_map.hpp\"
- int main() { ska::bytell_hash_map<int,int> hashmap; (void)hashmap; return 0; }"
- PAPILO_BYTELL_HASHMAP_WORKS )
-
-if( PAPILO_BYTELL_HASHMAP_WORKS )
- set(PAPILO_USE_STANDARD_HASHMAP 0)
-else()
- set(PAPILO_USE_STANDARD_HASHMAP 1)
-endif()
+set(PAPILO_USE_STANDARD_HASHMAP 1)
add_library(papilo-core STATIC
src/papilo/core/VariableDomains.cpp
@@ -453,20 +425,6 @@ install(FILES
${PROJECT_SOURCE_DIR}/src/papilo/external/fmt/ranges.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/papilo/external/fmt)
-install(FILES
- ${PROJECT_SOURCE_DIR}/src/papilo/external/pdqsort/pdqsort.h
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/papilo/external/pdqsort)
-
-install(FILES
- ${PROJECT_SOURCE_DIR}/src/papilo/external/ska/bytell_hash_map.hpp
- ${PROJECT_SOURCE_DIR}/src/papilo/external/ska/flat_hash_map.hpp
- ${PROJECT_SOURCE_DIR}/src/papilo/external/ska/unordered_map.hpp
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/papilo/external/ska)
-
-install(FILES
- ${PROJECT_SOURCE_DIR}/src/papilo/external/lusol/clusol.h
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/papilo/external/lusol)
-
# 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
@@ -36,7 +36,7 @@
#ifdef PAPILO_TBB
#include "papilo/misc/tbb.hpp"
#endif
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
#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
@@ -30,7 +30,7 @@
#ifdef PAPILO_TBB
#include "papilo/misc/tbb.hpp"
#endif
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
#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
@@ -26,7 +26,7 @@
#include "papilo/core/Problem.hpp"
#include "papilo/misc/Hash.hpp"
#include "papilo/misc/Vec.hpp"
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
#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
@@ -25,7 +25,7 @@
#include "papilo/misc/MultiPrecision.hpp"
#include "papilo/misc/Vec.hpp"
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
#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
@@ -29,7 +29,7 @@
#include "papilo/core/Objective.hpp"
#include "papilo/core/Problem.hpp"
#include "papilo/core/VariableDomains.hpp"
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
#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
@@ -28,7 +28,7 @@
#include "papilo/core/Objective.hpp"
#include "papilo/core/Problem.hpp"
#include "papilo/core/VariableDomains.hpp"
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
#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
@@ -28,7 +28,7 @@
#ifdef PAPILO_HAVE_LUSOL
extern "C"
{
-#include "papilo/external/lusol/clusol.h"
+#include <clusol.h>
}
#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
@@ -28,7 +28,7 @@
#include "papilo/core/ProblemUpdate.hpp"
#include "papilo/misc/Num.hpp"
#include "papilo/misc/fmt.hpp"
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
#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
@@ -30,7 +30,7 @@
#ifdef PAPILO_TBB
#include "papilo/misc/tbb.hpp"
#endif
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
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
@@ -30,7 +30,7 @@
#ifdef PAPILO_TBB
#include "papilo/misc/tbb.hpp"
#endif
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
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
@@ -26,7 +26,7 @@
#include "papilo/core/PresolveMethod.hpp"
#include "papilo/core/Problem.hpp"
#include "papilo/core/ProblemUpdate.hpp"
-#include "papilo/external/pdqsort/pdqsort.h"
+#include <pdqsort.h>
#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
@@ -59,7 +59,7 @@ add_executable(unit_test TestMain.cpp
${BOOST_REQUIRED_TEST_FILES}
${PAPILOLIB_TEST_FILE})
-target_link_libraries(unit_test papilo ${PAPILOLIB_TARGET} ${Boost_LIBRARIES})
+target_link_libraries(unit_test papilo ${PAPILOLIB_TARGET} ${Boost_LIBRARIES} Catch2 Catch2Main)
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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilolib.h"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#include "papilo/misc/fmt.hpp"
TEST_CASE( "papilolib", "[C-API]" )
@@ -441,8 +441,8 @@ TEST_CASE( "papilolib", "[C-API]" )
PAPILO_SOLVING_INFO* result = papilo_solver_start( solver );
REQUIRE( result->solve_result == PAPILO_SOLVE_RESULT_OPTIMAL );
- REQUIRE( result->bestsol_obj == Approx( 796648.4375 ) );
- REQUIRE( result->dualbound == Approx( 796648.4375 ) );
+ REQUIRE( result->bestsol_obj == Catch::Approx( 796648.4375 ) );
+ REQUIRE( result->dualbound == Catch::Approx( 796648.4375 ) );
REQUIRE( result->bestsol_intviol >= 0.0 );
REQUIRE( result->bestsol_boundviol >= 0.0 );
REQUIRE( result->bestsol_consviol >= 0.0 );
@@ -456,7 +456,7 @@ TEST_CASE( "papilolib", "[C-API]" )
double objval = 0;
for( int i = 0; i < nvars; ++i )
objval += obj[i] * sol[i];
- REQUIRE( objval == Approx( 796648.4375 ) );
+ REQUIRE( objval == Catch::Approx( 796648.4375 ) );
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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/misc/VectorUtils.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
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
@@ -20,7 +20,7 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/ConstraintPropagation.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/DominatedCols.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/DualFix.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -20,7 +20,7 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/FreeVarSubstitution.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -20,7 +20,7 @@
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/ParallelColDetection.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/ParallelRowDetection.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/Probing.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/SimpleProbing.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/SimpleSubstitution.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/SimplifyInequalities.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/SingletonCols.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/SingletonStuffing.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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
@@ -21,7 +21,7 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "papilo/presolvers/Sparsify.hpp"
-#include "papilo/external/catch/catch.hpp"
+#include <catch2/catch_all.hpp>
#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>
Reference in New Issue View Git Blame Copy Permalink