From patchwork Fri Jan 7 22:02:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 36116 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 DDAF727BBEA; Fri, 7 Jan 2022 22:03:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 69D5127BBE9 for ; Fri, 7 Jan 2022 22:03:27 +0000 (GMT) Received: from localhost ([::1]:43848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5xKY-0000Yn-I7 for patchwork@mira.cbaines.net; Fri, 07 Jan 2022 17:03:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5xKA-0000Wg-FK for guix-patches@gnu.org; Fri, 07 Jan 2022 17:03:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5xKA-0003Hh-5s for guix-patches@gnu.org; Fri, 07 Jan 2022 17:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5xK9-0005j6-RC for guix-patches@gnu.org; Fri, 07 Jan 2022 17:03:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53121] [PATCH] gnu: ceres: Update to 2.0.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Jan 2022 22:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53121 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53121@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164159295721968 (code B ref -1); Fri, 07 Jan 2022 22:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jan 2022 22:02:37 +0000 Received: from localhost ([127.0.0.1]:46008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5xJl-0005iG-5B for submit@debbugs.gnu.org; Fri, 07 Jan 2022 17:02:37 -0500 Received: from lists.gnu.org ([209.51.188.17]:44104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5xJh-0005i6-1V for submit@debbugs.gnu.org; Fri, 07 Jan 2022 17:02:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5xJg-00082i-Og for guix-patches@gnu.org; Fri, 07 Jan 2022 17:02:32 -0500 Received: from mout02.posteo.de ([185.67.36.66]:51745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5xJe-0003Da-E9 for guix-patches@gnu.org; Fri, 07 Jan 2022 17:02:32 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AB47F240101 for ; Fri, 7 Jan 2022 23:02:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1641592947; bh=IXvEad+qWlzBUETO5vISmZLTRVXbIQpGbWCdSfZz6FY=; h=From:To:Cc:Subject:Date:From; b=ODyY2rgi2JL5RwWA8nREj+w1uBAWPaWdRMaVDyrozor5oM4XCMcjRC/ZyUCt86jJe D3Jj0wpAagVJZlHubiSMnbslhw24xTZw3cfNg5yfGKTX9O1A8AXjaOmIKbv7IyULrD IlyRjshBM5bARFytG+lr7cFQACWZ9B8U1UBEeNe6PptXJUFeEhQ1sRcZ5KKFEwuTsZ OOmh/g0OVaKjcDAtUOxvUvd/BqMLRoNuwdeH19okSfVxD2VmR0PEGUie8jrYbPK5ys 5Dkj0zggPfFVINpmtwZCAdK5QvcgYLEj5XpzsmdLlAl9mHvkq5i7fsbDhmRguOJVd0 jxeuxMGDq4/VA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JVxz71gDLz6tmh; Fri, 7 Jan 2022 23:02:27 +0100 (CET) From: Felix Gruber Date: Fri, 7 Jan 2022 22:02:17 +0000 Message-Id: <20220107220217.15305-1-felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (ceres): Update to 2.0.0. [inputs]: Use simplified format. (ceres-solver-benchmarks)[phases]: Add schur_eliminator_benchmark. Replace autodiff_cost_function_benchmark with new autodiff_benchmarks. --- gnu/packages/maths.scm | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b0944f307b..a8fd8a65fa 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2437,7 +2437,7 @@ satisfiability checking (SAT).") (define-public ceres (package (name "ceres-solver") - (version "1.14.0") + (version "2.0.0") (home-page "http://ceres-solver.org/") (source (origin (method url-fetch) @@ -2445,7 +2445,7 @@ satisfiability checking (SAT).") version ".tar.gz")) (sha256 (base32 - "13lfxy8x58w8vprr0nkbzziaijlh0vvqshgahvcgw0mrqdgh0i27")))) + "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h")))) (build-system cmake-build-system) (arguments ;; TODO: Build HTML user documentation and install separately. @@ -2464,11 +2464,11 @@ satisfiability checking (SAT).") (propagated-inputs (list glog)) ;for #include (inputs - `(("eigen" ,eigen) - ("blas" ,openblas) - ("lapack" ,lapack) - ("suitesparse" ,suitesparse) - ("gflags" ,gflags))) + (list eigen + openblas + lapack + suitesparse + gflags)) (synopsis "C++ library for solving large optimization problems") (description "Ceres Solver is a C++ library for modeling and solving large, @@ -2506,21 +2506,24 @@ can solve two kinds of problems: "pkg-config" "eigen3" "--cflags")))) - (define (compile-file file) - (let ((source (string-append file ".cc"))) - (format #t "building '~a'...~%" file) - (apply invoke "c++" "-fopenmp" "-O2" "-g" "-DNDEBUG" - source "-lceres" "-lbenchmark" "-lglog" - "-pthread" - "-o" (string-append bin "/" file) - "-I" ".." flags))) + (define (compile-file top-dir) + (lambda (file) + (let ((source (string-append file ".cc"))) + (format #t "building '~a'...~%" file) + (apply invoke "c++" "-fopenmp" "-O2" "-g" "-DNDEBUG" + source "-lceres" "-lbenchmark" "-lglog" + "-pthread" + "-o" (string-append bin "/" file) + "-I" top-dir flags)))) (mkdir-p bin) (with-directory-excursion "internal/ceres" - (for-each compile-file - '("small_blas_gemm_benchmark" - "small_blas_gemv_benchmark" - "autodiff_cost_function_benchmark")))))) + (for-each (compile-file "..") + '("schur_eliminator_benchmark" + "small_blas_gemm_benchmark" + "small_blas_gemv_benchmark")) + (with-directory-excursion "autodiff_benchmarks" + ((compile-file "../..") "autodiff_benchmarks")))))) (delete 'check) (delete 'install)))) (inputs (modify-inputs (package-inputs ceres)