From patchwork Sun Sep 10 20:01:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 53710 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 32B4827BBE2; Sun, 10 Sep 2023 21:02:38 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS 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 1F33027BBEA for ; Sun, 10 Sep 2023 21:02:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfQd7-0002JZ-33; Sun, 10 Sep 2023 16:02:01 -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 1qfQd5-0002DE-0e for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:59 -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 1qfQd4-0006XT-PE for guix-patches@gnu.org; Sun, 10 Sep 2023 16:01:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfQd8-0007yq-Bc for guix-patches@gnu.org; Sun, 10 Sep 2023 16:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65630] [PATCH v3 3/4] gnu: onnx: Use G-Expressions. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Sep 2023 20:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65630 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65630@debbugs.gnu.org Cc: Andy Tai Received: via spool by 65630-submit@debbugs.gnu.org id=B65630.169437609930625 (code B ref 65630); Sun, 10 Sep 2023 20:02:02 +0000 Received: (at 65630) by debbugs.gnu.org; 10 Sep 2023 20:01:39 +0000 Received: from localhost ([127.0.0.1]:51431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfQck-0007xq-K5 for submit@debbugs.gnu.org; Sun, 10 Sep 2023 16:01:39 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:46377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfQcg-0007xC-4T for 65630@debbugs.gnu.org; Sun, 10 Sep 2023 16:01:34 -0400 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-573f722b86eso2602674a12.1 for <65630@debbugs.gnu.org>; Sun, 10 Sep 2023 13:01:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694376084; x=1694980884; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=SQRdchcqV6HeZ1YSFpwcwE8DDZsd8pdjOhfk+S+3GcY=; b=KovIyaykERpXUj2w9a5YRwpjyWnTbPgTbE0KOCcas9VhaELDiHopOB7OPSmucDhOFk evr+cjXroSFcdsmGH0miHdkkjMWL01hCNQAKV+Bedo9ZjVFebwk/TWyXqJeDTdDt0ySQ KO1tYYh06WCaS4knw+69srbkWVc9Z3zljOOZrBNQxaIVgko1vRLZBJ46eWxKCJwxTKgd USFH8dOAPf+0FtmehBUrd5vMN2FgQK2R4K7BljQBzP7c789lvejBPQ7qQNCM15iOmslT VsXiXEa3lImXddGXjXRDGwHpO5yQH8Dy1sN+SXb2+TSw3HuJPyPtAyJxGdcoBhtWRHvx tcKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694376084; x=1694980884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SQRdchcqV6HeZ1YSFpwcwE8DDZsd8pdjOhfk+S+3GcY=; b=w3vratwj5Am7XCDN8hZaKGusy7SHWp8DJ+ibLbECmrGFFCm6azio+p/SuEEMLrr43p 8rBecHL/DBtn6kOGiguCrknBN2t13E/Z3yuX3JcWTEull/HwVLl9sb43yBUZpQoEPhPY beI6H6jjNiAAS071mv4C5pbMkIR4vhWbY1ipAcgYduyBeLm4zxM97pKgKETY1V8ubZQU eQYW3/Q2tQvcELoekAVU+7dDdT6JKw+58O+Z8bYx8epofhkTyYTLNZvUkHJVnNbScAau P9OjRAZ+vvQQxvV1raUOTPLFUAMPEjXRsQEFM0kmxW3jEuSlq89c2zK16Yn4m8kwtKKj wTSQ== X-Gm-Message-State: AOJu0YyPkIxgJewYbPBq0gNbM6KAKHVK+xPIKPAkpeDFFpofT4G+G0W2 fCvko4OGQDVkVnLy9bBg2zFhw8i/BR93Vg== X-Google-Smtp-Source: AGHT+IEaSe0JhfOcDBBjDkTdpc9kWxPUxKCO8pLmrPkUs5NMBkY66kIBJSXDbP/Vq5sWWrPKOesPxw== X-Received: by 2002:a17:90b:1256:b0:271:ab23:6288 with SMTP id gx22-20020a17090b125600b00271ab236288mr5610289pjb.14.1694376084440; Sun, 10 Sep 2023 13:01:24 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id i8-20020a17090a2ac800b002696aeb72e5sm6703783pjg.2.2023.09.10.13.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Sep 2023 13:01:23 -0700 (PDT) From: Andy Tai Date: Sun, 10 Sep 2023 13:01:14 -0700 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , 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/machine-learning.scm (onnx)[arguments]: Convert to list of G-Expressions. --- gnu/packages/machine-learning.scm | 88 ++++++++++++++++--------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index c1f5925b11..3c26eb4e64 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1078,50 +1078,52 @@ (define-public onnx (snippet '(delete-file-recursively "third_party")))) (build-system python-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'build 'pass-cmake-arguments - (lambda* (#:key outputs #:allow-other-keys) - ;; Pass options to the CMake-based build process. - (define out - (assoc-ref outputs "out")) - - (define args - ;; Copy arguments from 'cmake-build-system', plus ask - ;; for shared libraries. - (list "-DCMAKE_BUILD_TYPE=RelWithDebInfo" - (string-append "-DCMAKE_INSTALL_PREFIX=" out) - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" - (string-append "-DCMAKE_INSTALL_RPATH=" out - "/lib") - "-DCMAKE_VERBOSE_MAKEFILE=ON" - "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON" - "-DONNX_OPT_USE_SYSTEM_PROTOBUF=ON" + (list #:phases #~(modify-phases %standard-phases + (add-before 'build 'pass-cmake-arguments + (lambda* (#:key outputs #:allow-other-keys) + ;; Pass options to the CMake-based build process. + (define out + (assoc-ref outputs "out")) + + (define args + ;; Copy arguments from 'cmake-build-system', plus ask + ;; for shared libraries. + (list "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + (string-append "-DCMAKE_INSTALL_PREFIX=" out) + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" + (string-append "-DCMAKE_INSTALL_RPATH=" out + "/lib") + "-DCMAKE_VERBOSE_MAKEFILE=ON" + "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON" + "-DONNX_OPT_USE_SYSTEM_PROTOBUF=ON" ; force system copy use; - "-DBUILD_SHARED_LIBS=ON")) - - ;; This environment variable is honored by 'setup.py', - ;; which passes it down to 'cmake'. - (setenv "CMAKE_ARGS" (string-join args)) - - ;; This one is honored by 'setup.py' and passed to 'make - ;; -j'. - (setenv "MAX_JOBS" - (number->string (parallel-job-count))))) - (add-before 'check 'make-test-directory-writable - (lambda _ - ;; Make things writable for tests. - (setenv "HOME" (getcwd)) - (for-each make-file-writable - (find-files "onnx/examples" "." - #:directories? #t)))) - (add-after 'install 'install-from-cmake - (lambda _ - ;; Run "make install" in the build tree 'setup.py' - ;; created for CMake so that libonnx.so, - ;; libonnx_proto.so, etc. are installed. - (invoke "make" "install" - "-C" ".setuptools-cmake-build")))))) + "-DBUILD_SHARED_LIBS=ON")) + + ;; This environment variable is honored by 'setup.py', + ;; which passes it down to 'cmake'. + (setenv "CMAKE_ARGS" + (string-join args)) + + ;; This one is honored by 'setup.py' and passed to 'make + ;; -j'. + (setenv "MAX_JOBS" + (number->string (parallel-job-count))))) + (add-before 'check 'make-test-directory-writable + (lambda _ + ;; Make things writable for tests. + (setenv "HOME" + (getcwd)) + (for-each make-file-writable + (find-files "onnx/examples" "." + #:directories? #t)))) + (add-after 'install 'install-from-cmake + (lambda _ + ;; Run "make install" in the build tree 'setup.py' + ;; created for CMake so that libonnx.so, + ;; libonnx_proto.so, etc. are installed. + (invoke "make" "install" "-C" + ".setuptools-cmake-build")))))) (native-inputs (list cmake googletest