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 2023-05-16 14:16:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-or-tools (Old)
and /work/SRC/openSUSE:Factory/.google-or-tools.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-or-tools"
Tue May 16 14:16:19 2023 rev:5 rq:1087265 version:9.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-or-tools/google-or-tools.changes
2022-11-25 16:31:18.362588206 +0100
+++
/work/SRC/openSUSE:Factory/.google-or-tools.new.1533/google-or-tools.changes
2023-05-16 14:27:20.259711521 +0200
@@ -1,0 +2,56 @@
+Thu May 11 00:30:26 UTC 2023 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Update to version 9.6:
+ * Dependencies
+ + SCIP v801 -> v803 (note: now uses an OSI compatible license)
+ + abseil 20220623.1 -> 20230105.0
+ + Protobuf v21.5 -> v21.12
+ + SWIG 4.1.1
+ * PDLP
+ + Add python wrapper.
+ * CP-SAT
+ + Performance improvements.
+ * GLOP
+ + Tweak presolve.
+ * ModelBuilder
+ + Python: Improve numpy support.
+ * Bazel
+ + Add pybind11 support.
+ + Add java wrapper support.
+ * Routing
+ + Few improvements (local search)
+ * Known Issues:
+ + CP-SAT: Ignoring pseudo_costs subsolver returns Invalid
+ parameters. (#3706)
+- Update to version 9.5:
+ * CP-SAT
+ + Presolve improvements: max(array), Boolean constraints,
+ linear constraints.
+ + Interleaved search should be deterministic in parallel.
+ + Linear cuts: cleanup square and int_prod cuts; rewrite
+ cut pipeline.
+ + Fingerprint input model and solution (visible in the log).
+ + Scheduling improvements
+ + The usual bunch of bugfixes (crash during presolve, crash in
+ cuts, infeasible solutions, model infeasible in LNS).
+ * GLOP
+ + Speedup by rewriting the linear algebra, as well as the
+ pivot selection rule
+ * Linear Solver
+ + add knapsack_interface.cc.
+ + Move model_builder API under the linear_solver directory
+ (headers and samples).
+ + Add support for Gurobi 10.
+ * Routing
+ + Liberate few parser for various routing challenge.
+- Drop obsolete patches:
+ * do_not_call_pdlp_solve_test.patch
+ * 0003-Reuse-common-add_cxx_example-function-for-Sat-Runner.patch
+- Update patches:
+ * 0001-Only-add-relevant-directories-to-sample-RUNPATHs.patch
+ * 0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch
+ * 0003-Only-add-relevant-directories-to-sat_solver-RUNPATHs.patch
+- Use PIP_NO_INDEX instead of
+ 0001-Do-not-try-to-download-ortools-wheel.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Do-not-try-to-download-ortools-wheel.patch
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
New:
----
0003-Only-add-relevant-directories-to-sat_solver-RUNPATHs.patch
google-or-tools-9.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-or-tools.spec ++++++
--- /var/tmp/diff_new_pack.jZYeZV/_old 2023-05-16 14:27:20.751714335 +0200
+++ /var/tmp/diff_new_pack.jZYeZV/_new 2023-05-16 14:27:20.755714358 +0200
@@ -1,7 +1,7 @@
#
# spec file for package google-or-tools
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,22 +20,18 @@
%bcond_without tests
Name: google-or-tools
-Version: 9.4
+Version: 9.6
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/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 -- 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
+Patch7: 0003-Only-add-relevant-directories-to-sat_solver-RUNPATHs.patch
+BuildRequires: abseil-cpp-devel >= 20230105.0
BuildRequires: cmake >= 3.18
BuildRequires: fdupes
BuildRequires: gcc-c++ >= 7
@@ -46,12 +42,14 @@
BuildRequires: python3-numpy >= 1.13.1
BuildRequires: python3-pandas
BuildRequires: python3-pybind11-devel
+BuildRequires: python3-pytest
+BuildRequires: python3-scipy >= 1.10.0
BuildRequires: python3-setuptools
BuildRequires: python3-virtualenv
BuildRequires: python3-wheel
-BuildRequires: swig
+BuildRequires: swig >= 4.1.1
BuildRequires: pkgconfig(eigen3)
-BuildRequires: pkgconfig(protobuf)
+BuildRequires: pkgconfig(protobuf) >= 3.21.12
BuildRequires: pkgconfig(re2)
BuildRequires: pkgconfig(zlib)
@@ -63,6 +61,8 @@
%package -n python3-ortools
Summary: Suite for solving combinatorial optimization problems
Group: Development/Languages/Python
+Requires: python3-absl-py
+Requires: python3-numpy
%description -n python3-ortools
Python3 bindings for the OR-Tools suite, for solving combinatorial
@@ -101,14 +101,15 @@
%prep
%autosetup -p1 -n or-tools-%{version}
-# Fix incompatibility with SWIG 4.1,
https://github.com/google/or-tools/issues/3519
-find -iname \*CMakeLists.txt -exec sed -i -e '/COMPILE_DEFINITIONS/
s@ABSL_MUST_USE_RESULT@@g' '{}' \;
-sed -i -e '/FLAGS/ s@ABSL_MUST_USE_RESULT@ABSL_MUST_USE_RESULT="[[nodiscard]]"
@g' cmake/python.cmake
+# Allow doc install
+sed -i -e '/CMAKE_DEPENDENT_OPTION(INSTALL_DOC/ s/BUILD_CXX AND
BUILD_DOC/BUILD_CXX/' CMakeLists.txt
%build
+export PIP_NO_INDEX=1
%global optflags %{optflags} -Wno-error=return-type
%cmake \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name}/ \
+ -DINSTALL_DOC:BOOL=ON \
-DBUILD_DEPS:BOOL=OFF \
-DBUILD_pybind11:BOOL=OFF \
-DBUILD_PYTHON:BOOL=ON \
@@ -133,12 +134,17 @@
%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'
+# Tests using e.g. SCIP are not skipped, exclude
+# https://github.com/google/or-tools/issues/3261
+%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|python_linear_solver_model_builder_test'
%if %{__isa_bits} == 32
%ctest --exclude-regex %{known_fail} || true
%else
+echo "Run tests known to fail"
+%ctest --include-regex %{known_fail} || true
+echo "Run good tests"
+# More tests depending on SCIP
%ctest --exclude-regex %{known_fail}
%endif
%endif
++++++ 0001-Only-add-relevant-directories-to-sample-RUNPATHs.patch ++++++
--- /var/tmp/diff_new_pack.jZYeZV/_old 2023-05-16 14:27:20.787714541 +0200
+++ /var/tmp/diff_new_pack.jZYeZV/_new 2023-05-16 14:27:20.791714563 +0200
@@ -1,4 +1,4 @@
-From 97cf476cbbfbd6583aaabee5285f63a79a649f22 Mon Sep 17 00:00:00 2001
+From de6b324352978ee2333bce0c3cd551659bfe7529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de>
Date: Fri, 15 Jul 2022 14:29:51 +0200
Subject: [PATCH 1/3] Only add relevant directories to sample RUNPATHs
@@ -14,10 +14,10 @@
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
-index 5518fa3a55..293b5415ac 100644
+index daf6ba7eb8..c9ea383852 100644
--- a/cmake/cpp.cmake
+++ b/cmake/cpp.cmake
-@@ -389,20 +389,23 @@ function(add_cxx_sample FILE_NAME)
+@@ -440,20 +440,23 @@ function(add_cxx_sample FILE_NAME)
get_filename_component(COMPONENT_DIR ${SAMPLE_DIR} DIRECTORY)
get_filename_component(COMPONENT_NAME ${COMPONENT_DIR} NAME)
@@ -36,7 +36,7 @@
include(GNUInstallDirs)
+ if(APPLE)
-+ set(CMAKE_INSTALL_RPATH
++ set_target_properties(${SAMPLE_NAME} PROPERTIES INSTALL_RPATH
+ "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+ elseif(UNIX)
+ cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
@@ -49,7 +49,7 @@
install(TARGETS ${SAMPLE_NAME})
if(BUILD_TESTING)
-@@ -423,19 +426,23 @@ function(add_cxx_example FILE_NAME)
+@@ -474,19 +477,23 @@ function(add_cxx_example FILE_NAME)
get_filename_component(COMPONENT_DIR ${FILE_NAME} DIRECTORY)
get_filename_component(COMPONENT_NAME ${COMPONENT_DIR} NAME)
@@ -67,7 +67,7 @@
include(GNUInstallDirs)
+ if(APPLE)
-+ set(CMAKE_INSTALL_RPATH
++ set_target_properties(${EXAMPLE_NAME} PROPERTIES INSTALL_RPATH
+ "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
+ elseif(UNIX)
+ cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
@@ -81,6 +81,6 @@
if(BUILD_TESTING)
--
-2.37.1
+2.40.1
++++++ 0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch ++++++
--- /var/tmp/diff_new_pack.jZYeZV/_old 2023-05-16 14:27:20.803714632 +0200
+++ /var/tmp/diff_new_pack.jZYeZV/_new 2023-05-16 14:27:20.807714655 +0200
@@ -1,4 +1,4 @@
-From 98a0b0b08ff4ade9c819918db77d6092738b82cf Mon Sep 17 00:00:00 2001
+From 283756dfec1c4ea8ac4d83403edf6b504eb8d43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de>
Date: Fri, 15 Jul 2022 17:02:31 +0200
Subject: [PATCH 2/3] Only add relevant directories to flatzinc
@@ -59,6 +59,6 @@
# Parser-main Binary
--
-2.37.1
+2.40.1
++++++ 0003-Only-add-relevant-directories-to-sat_solver-RUNPATHs.patch ++++++
>From b275acd957455185783c484645ceb4c1921cfc3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de>
Date: Thu, 11 May 2023 02:55:33 +0200
Subject: [PATCH 3/3] Only add relevant directories to sat_solver RUNPATHs
Dito for linear_solve/solve.
---
ortools/linear_solver/CMakeLists.txt | 21 ++++++++++++---------
ortools/sat/CMakeLists.txt | 21 ++++++++++++---------
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/ortools/linear_solver/CMakeLists.txt
b/ortools/linear_solver/CMakeLists.txt
index f0ccb04182..c5b54cae0f 100644
--- a/ortools/linear_solver/CMakeLists.txt
+++ b/ortools/linear_solver/CMakeLists.txt
@@ -48,19 +48,22 @@ target_link_libraries(${NAME} PRIVATE
#add_library(${PROJECT_NAME}::linear_solver ALIAS ${NAME})
# solve
-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(solve)
target_sources(solve PRIVATE "solve.cc")
target_include_directories(solve PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_features(solve PRIVATE cxx_std_17)
target_link_libraries(solve PRIVATE ${PROJECT_NAMESPACE}::ortools)
+include(GNUInstallDirs)
+if(APPLE)
+ set_target_properties(solve 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(solve PROPERTIES
+ INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
+endif()
+
install(TARGETS solve)
diff --git a/ortools/sat/CMakeLists.txt b/ortools/sat/CMakeLists.txt
index 19bd83f738..aec4bec3f3 100644
--- a/ortools/sat/CMakeLists.txt
+++ b/ortools/sat/CMakeLists.txt
@@ -40,19 +40,22 @@ target_link_libraries(${NAME} PRIVATE
#add_library(${PROJECT_NAME}::sat ALIAS ${NAME})
# 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)
target_sources(sat_runner PRIVATE "sat_runner.cc")
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)
+include(GNUInstallDirs)
+if(APPLE)
+ set_target_properties(sat_runner 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(sat_runner PROPERTIES
+ INSTALL_RPATH "$ORIGIN/${libdir_relative_path}")
+endif()
+
install(TARGETS sat_runner)
--
2.40.1
++++++ google-or-tools-9.4.tar.gz -> google-or-tools-9.6.tar.gz ++++++
/work/SRC/openSUSE:Factory/google-or-tools/google-or-tools-9.4.tar.gz
/work/SRC/openSUSE:Factory/.google-or-tools.new.1533/google-or-tools-9.6.tar.gz
differ: char 12, line 1
