Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package google-or-tools for openSUSE:Factory
checked in at 2022-09-20 19:23:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-or-tools (Old)
and /work/SRC/openSUSE:Factory/.google-or-tools.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-or-tools"
Tue Sep 20 19:23:48 2022 rev:3 rq:1004865 version:9.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-or-tools/google-or-tools.changes
2022-07-19 17:19:25.700371954 +0200
+++
/work/SRC/openSUSE:Factory/.google-or-tools.new.2083/google-or-tools.changes
2022-09-20 19:23:54.146528900 +0200
@@ -1,0 +2,24 @@
+Sat Sep 17 16:21:13 UTC 2022 - Stefan Br??ns <[email protected]>
+
+- Update to version 9.4:
+ * Graph
+ + Split ortools.graph.pywrapgraph into:
+ - ortools.graph.python.linear_sum_assignment
+ - ortools.graph.python.max_flow
+ - ortools.graph.python.min_cost_flow
+ This allows using numpy to speed up the setup of the problems.
+ * CP-SAT
+ + Some improvement on:
+ - scheduling (propagation, cuts, lower bounds)
+ - MaxSAT (presolve, core based heuristics)
+ - MIP performance (presolve, cuts)
+- Drop upstream patches:
+ * fix_re2_string_view.patch
+ * 0001-Build-Python-modules-as-CMake-MODULEs.patch
+ * fix_malformed_Cpp.patch
+ * 0001-Set-SWIGWORDSIZE-dependent-on-architecture-bitness.patch
+- Add patches:
+ * do_not_call_pdlp_solve_test.patch
+ * 0003-Reuse-common-add_cxx_example-function-for-Sat-Runner.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Build-Python-modules-as-CMake-MODULEs.patch
0001-Set-SWIGWORDSIZE-dependent-on-architecture-bitness.patch
fix_malformed_Cpp.patch
fix_re2_string_view.patch
google-or-tools-9.3.tar.gz
New:
----
0003-Reuse-common-add_cxx_example-function-for-Sat-Runner.patch
do_not_call_pdlp_solve_test.patch
google-or-tools-9.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-or-tools.spec ++++++
--- /var/tmp/diff_new_pack.cFVI7b/_old 2022-09-20 19:23:55.602533076 +0200
+++ /var/tmp/diff_new_pack.cFVI7b/_new 2022-09-20 19:23:55.606533087 +0200
@@ -20,26 +20,21 @@
%bcond_without tests
Name: google-or-tools
-Version: 9.3
+Version: 9.4
Release: 0
License: Apache-2.0
Summary: Suite for solving combinatorial optimization problems
URL: https://developers.google.com/optimization/
Group: Development/Languages/C++
-Source:
https://github.com/google/or-tools/archive/refs/tags/v9.3.tar.gz#/google-or-tools-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM - fix incompatibility with re2, abseil and C++17
-Patch0:
https://github.com/google/or-tools/commit/0d3572bda874ce30b35af161a713ecd1793cd296.patch#/fix_re2_string_view.patch
-# PATCH-FIX-UPSTREAM - fix build with -Wl,--no-undefined
-Patch1: 0001-Build-Python-modules-as-CMake-MODULEs.patch
+Source:
https://github.com/google/or-tools/archive/refs/tags/v%{version}.tar.gz#/google-or-tools-%{version}.tar.gz
# PATCH-FIX-OPENSUSE
Patch2: 0001-Do-not-try-to-download-ortools-wheel.patch
-# PATCH-FIX-UPSTREAM - fix malformed C++
-Patch3:
https://github.com/google/or-tools/commit/672303cc2f2396c4bd5fbed8430208308815bd54.patch#/fix_malformed_Cpp.patch
-# PATCH-FIX-UPSTREAM - allow build on i586/armv7
-Patch4: 0001-Set-SWIGWORDSIZE-dependent-on-architecture-bitness.patch
+# PATCH-FIX-UPSTREAM -- https://github.com/google/or-tools/issues/3429
+Patch3:
https://github.com/google/or-tools/commit/7072ae92ec204afcbfce17d5360a5884c136ce90.patch#/do_not_call_pdlp_solve_test.patch
# PATCH-FIX-UPSTREAM - remove bad entries from RUNPATHs
Patch5: 0001-Only-add-relevant-directories-to-sample-RUNPATHs.patch
Patch6: 0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch
+Patch7: 0003-Reuse-common-add_cxx_example-function-for-Sat-Runner.patch
BuildRequires: abseil-cpp-devel
BuildRequires: cmake >= 3.18
BuildRequires: fdupes
@@ -88,18 +83,18 @@
%description -n libortools%{sonum}
OR-Tools is an open source software suite for optimization.
-%package -n libflatzinc%{sonum}
+%package -n libortools_flatzinc%{sonum}
Summary: Suite for solving combinatorial optimization problems
Group: System/Libraries
-%description -n libflatzinc%{sonum}
+%description -n libortools_flatzinc%{sonum}
OR-Tools is an open source software suite for optimization.
%package devel
Summary: Suite for solving combinatorial optimization problems
Group: Development/Languages/C++
-Requires: libflatzinc%{sonum} = %{version}
Requires: libortools%{sonum} = %{version}
+Requires: libortools_flatzinc%{sonum} = %{version}
%description devel
Development files (C/C++) for the OR-Tools suite.
@@ -110,6 +105,7 @@
%build
%global optflags %{optflags} -Wno-error=return-type
%cmake \
+ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name}/ \
-DBUILD_DEPS:BOOL=OFF \
-DBUILD_pybind11:BOOL=OFF \
-DBUILD_PYTHON:BOOL=ON \
@@ -121,16 +117,19 @@
%install
%cmake_install
+rm %{buildroot}/%{_docdir}/%{name}/LICENSE
# Remove duplicate library
rm %{buildroot}/%{python3_sitearch}/ortools/.libs/libortools.so.9
rmdir %{buildroot}/%{python3_sitearch}/ortools/.libs
%post -n libortools%{sonum} -p /sbin/ldconfig
%postun -n libortools%{sonum} -p /sbin/ldconfig
-%post -n libflatzinc%{sonum} -p /sbin/ldconfig
-%postun -n libflatzinc%{sonum} -p /sbin/ldconfig
+%post -n libortools_flatzinc%{sonum} -p /sbin/ldconfig
+%postun -n libortools_flatzinc%{sonum} -p /sbin/ldconfig
%check
+# https://github.com/google/or-tools/issues/3461
+sed -i -e 's/max_time_in_seconds = 15.0/max_time_in_seconds = 30.0/'
examples/python/prize_collecting_vrp_sat.py
# Test using e.g. SCIP are not skipped, exclude
%if %{with tests}
%define known_fail
'python.*mip|python_contrib.*|python_linear_solver_integer_programming_example|python_python_appointments|python_python_steel_mill_slab_sat|cxx_tests_issue173|python_tests_dual_loading|python_tests_pywraplp_test'
@@ -145,21 +144,23 @@
%doc CONTRIBUTING.md README.md
%license LICENSE
%{_bindir}/*
-%exclude %{_bindir}/fz
+%{_docdir}/%{name}/{sat,constraint_solver}
+%exclude %{_bindir}/fzn-ortools
%files -n python3-ortools
%{python3_sitearch}/ortools
%{python3_sitearch}/ortools-%{version}*info
%files minizinc
-%{_bindir}/fz
+%{_bindir}/fzn-ortools
%{_datadir}/minizinc
%files -n libortools%{sonum}
%{_libdir}/libor*.so.%{sonum}*
+%exclude %{_libdir}/libortools_flatzinc*.so.%{sonum}*
-%files -n libflatzinc%{sonum}
-%{_libdir}/libflatzinc*.so.%{sonum}*
+%files -n libortools_flatzinc%{sonum}
+%{_libdir}/libortools_flatzinc*.so.%{sonum}*
%files devel
%{_libdir}/lib*.so
++++++ 0001-Only-add-relevant-directories-to-sample-RUNPATHs.patch ++++++
--- /var/tmp/diff_new_pack.cFVI7b/_old 2022-09-20 19:23:55.634533167 +0200
+++ /var/tmp/diff_new_pack.cFVI7b/_new 2022-09-20 19:23:55.638533179 +0200
@@ -1,7 +1,7 @@
-From 0806f549ac1144746917272009605e4adfd0312a Mon Sep 17 00:00:00 2001
+From 97cf476cbbfbd6583aaabee5285f63a79a649f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]>
Date: Fri, 15 Jul 2022 14:29:51 +0200
-Subject: [PATCH 1/2] Only add relevant directories to sample RUNPATHs
+Subject: [PATCH 1/3] Only add relevant directories to sample RUNPATHs
The old code added several irrelevant, duplicate or even non-existing
directories to the RUNPATHs of the samples.
@@ -14,10 +14,10 @@
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
-index 014244cb49..5edc74c083 100644
+index 5518fa3a55..293b5415ac 100644
--- a/cmake/cpp.cmake
+++ b/cmake/cpp.cmake
-@@ -346,20 +346,23 @@ function(add_cxx_sample FILE_NAME)
+@@ -389,20 +389,23 @@ function(add_cxx_sample FILE_NAME)
get_filename_component(COMPONENT_DIR ${SAMPLE_DIR} DIRECTORY)
get_filename_component(COMPONENT_NAME ${COMPONENT_DIR} NAME)
@@ -49,7 +49,7 @@
install(TARGETS ${SAMPLE_NAME})
if(BUILD_TESTING)
-@@ -380,19 +383,23 @@ function(add_cxx_example FILE_NAME)
+@@ -423,19 +426,23 @@ function(add_cxx_example FILE_NAME)
get_filename_component(COMPONENT_DIR ${FILE_NAME} DIRECTORY)
get_filename_component(COMPONENT_NAME ${COMPONENT_DIR} NAME)
@@ -81,6 +81,6 @@
if(BUILD_TESTING)
--
-2.37.0
+2.37.1
++++++ 0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch ++++++
--- /var/tmp/diff_new_pack.cFVI7b/_old 2022-09-20 19:23:55.646533202 +0200
+++ /var/tmp/diff_new_pack.cFVI7b/_new 2022-09-20 19:23:55.650533213 +0200
@@ -1,54 +1,64 @@
-From 664490070e24be6bb1849084c36f9fe234cfe3f9 Mon Sep 17 00:00:00 2001
+From 98a0b0b08ff4ade9c819918db77d6092738b82cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]>
Date: Fri, 15 Jul 2022 17:02:31 +0200
-Subject: [PATCH 2/2] Only add relevant directories to flatzinc
+Subject: [PATCH 2/3] Only add relevant directories to flatzinc
library/executable RUNPATHs
The flatzinc library is installed to the same location (LIBDIR) as the
ortools library, so "$ORIGIN" suffices.
The executables should use the relative path between LIBDIR and BINDIR.
---
- cmake/flatzinc.cmake | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
+ cmake/flatzinc.cmake | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/cmake/flatzinc.cmake b/cmake/flatzinc.cmake
-index 82b2fc544e..af81122ef3 100644
+index 27cef073f7..c6ee1f879b 100644
--- a/cmake/flatzinc.cmake
+++ b/cmake/flatzinc.cmake
-@@ -102,10 +102,11 @@ add_library(${PROJECT_NAME}::flatzinc ALIAS flatzinc)
+@@ -93,6 +93,9 @@ target_compile_options(flatzinc PUBLIC
${FLATZINC_COMPILE_OPTIONS})
+ ## Properties
+ if(NOT APPLE)
+ set_target_properties(flatzinc PROPERTIES VERSION ${PROJECT_VERSION})
++ if(UNIX)
++ set_target_properties(flatzinc PROPERTIES INSTALL_RPATH "$ORIGIN")
++ endif()
+ else()
+ # Clang don't support version x.y.z with z > 255
+ set_target_properties(flatzinc PROPERTIES
+@@ -115,14 +118,6 @@ endif()
+ add_library(${PROJECT_NAMESPACE}::flatzinc ALIAS flatzinc)
- if(APPLE)
+-if(APPLE)
- set(CMAKE_INSTALL_RPATH
- "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
-+ set_target_properties(flatzinc PROPERTIES
-+ INSTALL_RPATH
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
- elseif(UNIX)
+-elseif(UNIX)
- set(CMAKE_INSTALL_RPATH
"$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
-+ set_target_properties(flatzinc PROPERTIES
-+ INSTALL_RPATH "$ORIGIN")
- endif()
-
-
-@@ -166,6 +167,17 @@ configure_file(
- ${PROJECT_BINARY_DIR}/ortools.msc
- @ONLY)
-
+-endif()
+-
+-
+ # fzn-ortools Binary
+ add_executable(fzn
+ ortools/flatzinc/fz.cc
+@@ -146,6 +141,17 @@ target_compile_options(fzn PUBLIC
${FLATZINC_COMPILE_OPTIONS})
+ target_link_libraries(fzn PRIVATE ${PROJECT_NAMESPACE}::flatzinc)
+ ## Alias
+ add_executable(${PROJECT_NAME}::fzn ALIAS fzn)
++## INSTALL_RPATH
+if(APPLE)
-+ set_target_properties(fz parser_main PROPERTIES
++ set_target_properties(fzn PROPERTIES
+ INSTALL_RPATH
"@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+elseif(UNIX)
+ cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
+ BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
+ OUTPUT_VARIABLE libdir_relative_path)
-+ set_target_properties(fz parser_main PROPERTIES
++ set_target_properties(fzn PROPERTIES
+ INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
+endif()
-+
- # Install rules
- include(GNUInstallDirs)
- install(TARGETS flatzinc fz parser_main
+
+
+ # Parser-main Binary
--
-2.37.0
+2.37.1
++++++ 0003-Reuse-common-add_cxx_example-function-for-Sat-Runner.patch ++++++
>From 7666bd037fff54b4734e091c24d3c9f1d1b46a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]>
Date: Sat, 17 Sep 2022 23:18:44 +0200
Subject: [PATCH 3/3] Reuse common add_cxx_example function for Sat Runner
---
cmake/cpp.cmake | 5 +++--
examples/cpp/CMakeLists.txt | 17 +----------------
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
index 293b5415ac..b6e4f9289c 100644
--- a/cmake/cpp.cmake
+++ b/cmake/cpp.cmake
@@ -445,8 +445,9 @@ function(add_cxx_example FILE_NAME)
install(TARGETS ${EXAMPLE_NAME})
- if(BUILD_TESTING)
- add_test(NAME cxx_${COMPONENT_NAME}_${EXAMPLE_NAME} COMMAND
${EXAMPLE_NAME})
+ set(SKIP_TEST (${ARGC} GREATER 1) AND ${ARG1})
+ if(BUILD_TESTING AND NOT SKIP_TEST)
+ add_test(NAME cxx_${COMPONENT_NAME}_${EXAMPLE_NAME} COMMAND
${EXAMPLE_NAME})
endif()
message(STATUS "Configuring example ${FILE_NAME}: ...DONE")
endfunction()
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index dac814b314..9b7c23dc83 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -53,23 +53,8 @@ foreach(SAMPLE IN LISTS CXX_SRCS)
endforeach()
# Sat Runner
-include(GNUInstallDirs)
-if(APPLE)
- set(CMAKE_INSTALL_RPATH
- "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
-elseif(UNIX)
- set(CMAKE_INSTALL_RPATH
-
"$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
-endif()
-
-add_executable(sat_runner)
+add_cxx_example("${CMAKE_CURRENT_LIST_DIR}/sat_runner.cc" TRUE)
target_sources(sat_runner PRIVATE
- "sat_runner.cc"
"opb_reader.h"
"sat_cnf_reader.h")
-target_include_directories(sat_runner PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_features(sat_runner PRIVATE cxx_std_17)
-target_link_libraries(sat_runner PRIVATE ${PROJECT_NAMESPACE}::ortools)
-
-install(TARGETS sat_runner)
--
2.37.1
++++++ do_not_call_pdlp_solve_test.patch ++++++
>From 7072ae92ec204afcbfce17d5360a5884c136ce90 Mon Sep 17 00:00:00 2001
From: Laurent Perron <[email protected]>
Date: Mon, 29 Aug 2022 16:00:30 +0200
Subject: [PATCH] do not call cxx_cpp_pdlp_solve #3429
---
examples/cpp/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index a4955d12228..dac814b3140 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -39,6 +39,7 @@ list(FILTER CXX_SRCS EXCLUDE REGEX ".*/knapsack_2d_sat.cc")
list(FILTER CXX_SRCS EXCLUDE REGEX ".*/mps_driver.cc") # crash
list(FILTER CXX_SRCS EXCLUDE REGEX ".*/multi_knapsack_sat.cc") # crash
list(FILTER CXX_SRCS EXCLUDE REGEX ".*/network_routing_sat.cc")
+list(FILTER CXX_SRCS EXCLUDE REGEX ".*/pdlp_solve.cc")
list(FILTER CXX_SRCS EXCLUDE REGEX ".*/pdptw.cc")
list(FILTER CXX_SRCS EXCLUDE REGEX ".*/sat_runner.cc")
list(FILTER CXX_SRCS EXCLUDE REGEX ".*/shift_minimization_sat.cc")
++++++ google-or-tools-9.3.tar.gz -> google-or-tools-9.4.tar.gz ++++++
/work/SRC/openSUSE:Factory/google-or-tools/google-or-tools-9.3.tar.gz
/work/SRC/openSUSE:Factory/.google-or-tools.new.2083/google-or-tools-9.4.tar.gz
differ: char 12, line 1
