From patchwork Fri May 23 06:17:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 42874 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 517A627BC4C; Fri, 23 May 2025 07:20:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EEF7827BC49 for ; Fri, 23 May 2025 07:20:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uILlK-0004Zm-Fy; Fri, 23 May 2025 02:20:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uILlG-0004YK-Nn for guix-patches@gnu.org; Fri, 23 May 2025 02:20:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uILlG-0006Rr-Cn for guix-patches@gnu.org; Fri, 23 May 2025 02:20:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=JSPYoGScHk/QW4QiT1qPNTuMpCaQYiNdMA/Lzq0XXDE=; b=nQmsAg5+K6IAunSOcde0ghlyl8aRI0yrM8a9qusdbyqpEnYg4jv9GtVrQpgUjmoAvmw3tmMVK4Ix5cG2iDngdOZoj60jCBUurmovyz9fP2PKO60LbWI4tAeb+xIMGWBj+sTQnA9bWYQZWUZNh5BEcjxdT6wyajpYicDO31cC4fsnZ4tDfF2YdTYKnvpw+LCqcrB/og3Ao57eqW0UoACcPk5rzY28jV7dVKHAIJSQv2zo1Kz+OB8c0QHcQgH6UZwia6jeQPD0LzeFGi32aUrme7h6/r1LORhmIh/28XfQ13fZ1cF7I6r94Abz/cBmXOT/UwmL8zwsT6P0oJHRH51sMQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uILlC-0001Dj-8T; Fri, 23 May 2025 02:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78559] [PATCH 1/2] gnu: Add or-tools. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 06:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78559 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78559@debbugs.gnu.org Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.17479811604526 (code B ref -1); Fri, 23 May 2025 06:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2025 06:19:20 +0000 Received: from localhost ([127.0.0.1]:44027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uILkS-0001Ap-HX for submit@debbugs.gnu.org; Fri, 23 May 2025 02:19:20 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51142) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uILkM-00019l-Ha for submit@debbugs.gnu.org; Fri, 23 May 2025 02:19:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uILkF-0004Bb-Ns for guix-patches@gnu.org; Fri, 23 May 2025 02:19:04 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1uILk8-00066S-Pc for guix-patches@gnu.org; Fri, 23 May 2025 02:19:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1747981129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JSPYoGScHk/QW4QiT1qPNTuMpCaQYiNdMA/Lzq0XXDE=; b=lmx9uGyz+1z504s1UwgbaO7fmdrXrGlzP3VYQwmx/7n3yWftca8/fD34dnOT8gzyqIgLN6 avbIqPPWMphz8w9YWGnRQLOwdsmf5ksTywt/CW+TUGO9+DXBG1HjslaKz4BN4pf6SoEqTC CeRO37UwKodYZiFfNwlW0N2N48o/8bhv7gW8Ehz6pbebVvumG5XPFO53gHf3Z9aWgYouB8 bIMGKnlxOssZ6ATfs4e1DneV8XcLqK72Vu3dzEHV/lYWga/ZNoGZoWBPSspM34ophSeGVL by6xoT2U4ouhX46RuoDEAFU1BnqiG1X0OYsTZZNJAfrxAincfya8zb/GrYu0Sg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a07186ef (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Fri, 23 May 2025 06:18:48 +0000 (UTC) Date: Fri, 23 May 2025 08:17:48 +0200 Message-ID: <6a8d8a4fd03c5d5238517ddc6d31a7d50df0b1cc.1747981045.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (or-tools): Add variable. Change-Id: Iea8f971f3d06d048bfa08aa8bf6c171fb154e9d0 --- gnu/packages/maths.scm | 48 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) base-commit: ba59ec9a11d6d4c0add8d5832500261fa50346da diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index eea9f8f718b..5d20803999a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -63,7 +63,7 @@ ;;; Copyright © 2023 Jake Leporte ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2023, 2025 David Elsing -;;; Copyright © 2024 Herman Rimm +;;; Copyright © 2024, 2025 Herman Rimm ;;; Copyright © 2024 Foundation Devices, Inc. ;;; Copyright © 2024, 2025 Artyom V. Poptsov ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> @@ -174,6 +174,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages pcre) #:use-module (gnu packages popt) #:use-module (gnu packages perl) + #:use-module (gnu packages protobuf) #:use-module (gnu packages prolog) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -184,6 +185,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages regex) #:use-module (gnu packages ruby) #:use-module (gnu packages tbb) #:use-module (gnu packages scheme) @@ -10195,6 +10197,50 @@ (define-public libqalculate cli.") (license license:gpl2+))) +(define-public or-tools + (package + (name "or-tools") + (version "9.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/or-tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z15f2nf9jww34fmfpycc9z7j1j06xbihs4qhd4s7qsdjds67zpa")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~'("-DUSE_COINOR=OFF" "-DUSE_HIGHS=OFF" "-DUSE_SCIP=OFF") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-install-paths + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "ortools/flatzinc/ortools.msc.in" + (("\\.\\.") (string-append out "/share/minizinc")) + (("@FZ_REL_INSTALL_BINARY@") + (string-append out "/bin/fzn-ortools"))))))))) + (inputs (list abseil-cpp-20220623 eigen protobuf re2 zlib)) + (native-inputs (list googletest pkg-config)) + (home-page "https://developers.google.com/optimization") + (synopsis "Google's software suite for combinatorial optimization") + (description + "Google Optimization Tools (a.k.a. OR-Tools) is a software suite +for solving combinatorial optimization problems. The suite contains: +@itemize +@item CP* and CP-SAT constraint programming solvers; +@item Glop and PDLP linear programming solvers; +@item Wrappers around solvers, including mixed integer solvers; +@item Bin packing and knapsack algorithms; +@item Traveling Salesman Problem and Vehicle Routing Problem algorithms; +@item Graph algorithms for shortest paths, min cost flow, max flow, etc. +@end itemize") + (license license:asl2.0))) + (define-public qalculate-gtk (package (name "qalculate-gtk") From patchwork Fri May 23 06:19:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 42875 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E4F5F27BC4C; Fri, 23 May 2025 07:21:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0339427BC49 for ; Fri, 23 May 2025 07:21:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uILmH-0004nW-2p; Fri, 23 May 2025 02:21:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uILmE-0004nK-8S for guix-patches@gnu.org; Fri, 23 May 2025 02:21:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uILmD-0006W2-4G for guix-patches@gnu.org; Fri, 23 May 2025 02:21:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=N1g3fDgejDslS0xWmUz6KoMcFALO0sRPw7Jl91D9uQQ=; b=SK48EJlCIVq0cVUD5rFbJTX6zbbtTTDHTW5fAPwsgQQATRwfdYbsn1nfBbm4746+wFW8ciD4ztKsNHG2cQmiY6BAs/m4JspuNZ2eYJcVkUxc42cvAalE7wsonEqhs8Heb0Dv0L9TWX+rqc/Y3yyX6bAKaRK8w2thTvibRKXhY7vyL6zjESrDRf3eEPqOZZH1tMLmup2DVLXrWFqxwLUakwQWsUQbbXid0P0EdEz9km80Y8GXfQQ9OBobfiuioQOw7RRqXFD69L8UqYLSXqoB5hUxCoacNAY1esFnDxqVrsTSBrZOG4aIjLG5QRopdNLo6l6SwXtWZ6HH1lc2FO8qNg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uILmA-0001OD-LR; Fri, 23 May 2025 02:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78559] [PATCH 2/2] gnu: minizinc: Add Google's OR-Tools as solver. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 23 May 2025 06:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78559 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78559@debbugs.gnu.org Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 78559-submit@debbugs.gnu.org id=B78559.17479812495275 (code B ref 78559); Fri, 23 May 2025 06:21:02 +0000 Received: (at 78559) by debbugs.gnu.org; 23 May 2025 06:20:49 +0000 Received: from localhost ([127.0.0.1]:44054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uILlu-0001Mj-20 for submit@debbugs.gnu.org; Fri, 23 May 2025 02:20:49 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:33701 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uILlo-0001Lv-Fr for 78559@debbugs.gnu.org; Fri, 23 May 2025 02:20:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1747981233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N1g3fDgejDslS0xWmUz6KoMcFALO0sRPw7Jl91D9uQQ=; b=i4K2JakU0hL7RcxJLZ0ijYUZ/7kDwfA/qE+Ar5q3sSmEX+oR0SV8pqSp2djn+W0GzVouN4 2XYZZ1eaWj2Wwws3XDBSOvQn6AKoFaoEwIgx4Z5YotethfPjZkSaDA0eoUETB3IlMuJDa5 nl1j89CkVpizn3sKZks8KmA4L+/AqLnw1ikswMIfv9og5fs2vZ92l9vzoOcHj0J35WsOv4 BijhiAA7aI2/rxL4V0sDCU0At4aXawFzFGU8nTMQarxd89qjIZHhkEACo4VzB4N49gX/rL 8QAPQvrgGduUYoIxj+8uFkaUC8t/DkbhsS+80XCJt/6V2FVi7YDPW357ZjUHIg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9f8c6d97 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <78559@debbugs.gnu.org>; Fri, 23 May 2025 06:20:33 +0000 (UTC) Date: Fri, 23 May 2025 08:19:41 +0200 Message-ID: <403a32cc4d9b3b9aa416780939926e4e7db525c1.1747981045.git.herman@rimm.ee> X-Mailer: git-send-email 2.47.1 In-Reply-To: <6a8d8a4fd03c5d5238517ddc6d31a7d50df0b1cc.1747981045.git.herman@rimm.ee> References: <6a8d8a4fd03c5d5238517ddc6d31a7d50df0b1cc.1747981045.git.herman@rimm.ee> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (minizinc)[arguments]: Install OR-Tools config. [inputs]: Add or-tools. Change-Id: Ibc301b458487c3465251c1c6d97f5858d7d6d59e --- gnu/packages/maths.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5d20803999a..bf05db8345e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4844,6 +4844,7 @@ (define-public minizinc (lambda _ (let ((chuffed #$(this-package-input "chuffed")) (gecode #$(this-package-input "gecode")) + (or-tools #$(this-package-input "or-tools")) (pkgdatadir (string-append #$output "/share/minizinc"))) (call-with-output-file (string-append pkgdatadir @@ -4864,11 +4865,11 @@ (define-public minizinc (copy-recursively (string-append solver "/share/minizinc/solvers") (string-append pkgdatadir "/solvers"))) - (list gecode chuffed)))))))) + (list chuffed gecode or-tools)))))))) (native-inputs (list bison flex)) (inputs - (list cbc chuffed gecode zlib)) + (list cbc chuffed gecode or-tools zlib)) (home-page "https://www.minizinc.org") (synopsis "High-level constraint modeling language") (description "MiniZinc is a high-level modeling language for constraint