GNU bug report logs - #65650
[PATCH] gnu: onnx-optimizer: Update to 0.3.17

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 06:31:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Aug 31 02:31:16 2023
Received: from localhost ([127.0.0.1]:54679 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1qbbD2-0003va-1h
	for submit <at> debbugs.gnu.org; Thu, 31 Aug 2023 02:31:16 -0400
Received: from lists.gnu.org ([2001:470:142::17]:54846)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <lichengtai@HIDDEN>) id 1qbbCz-0003vK-Ee
 for submit <at> debbugs.gnu.org; Thu, 31 Aug 2023 02:31: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 <lichengtai@HIDDEN>)
 id 1qbbCj-0008Id-SU
 for guix-patches@HIDDEN; Thu, 31 Aug 2023 02:30:58 -0400
Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <lichengtai@HIDDEN>)
 id 1qbbCg-0001HQ-ST
 for guix-patches@HIDDEN; Thu, 31 Aug 2023 02:30:57 -0400
Received: by mail-pl1-x62a.google.com with SMTP id
 d9443c01a7336-1bc63ef9959so3393325ad.2
 for <guix-patches@HIDDEN>; Wed, 30 Aug 2023 23:30:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20221208; t=1693463453; x=1694068253; darn=gnu.org;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:sender:from:to:cc:subject:date:message-id:reply-to;
 bh=z5wO5+agtAsFf2j2I9hYx5JOD7fU4rz8tgQ1hj9hEk8=;
 b=HLDBH8Ym4++gzvitaY0lQFFEjdfklG4fXX3HgwoKooDq2PaIvq3vLVBRrE+fel1eg7
 0bIF3VDJjkRJRzqjWPlIkJr6z4xF8pKaOGA0oUWNvUr6V17kJOUcUDKjZv3QNiWr5ISn
 19xWikuzJh0dfU8ySJ2B/Cq9moJtVPS+/61xib/n5pROINQ1A57R1NSbcNxrbj8smAs3
 bkU+EL2NJbq4fnVGp/Fk+1KriEBIu5VmYmOgokAm+FRBBNSh7efJQ0G9YKvw8aWQg+mF
 lZaPzdrsLCNa0TUW5QRYlJWLYgowIKhGdQZkzx3kymJ5emgGqJMsn0myCBQm29TRUYKl
 lRlg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20221208; t=1693463453; x=1694068253;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:sender:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=z5wO5+agtAsFf2j2I9hYx5JOD7fU4rz8tgQ1hj9hEk8=;
 b=JN2quAfyy1YZlsQqyBweC32r0CvzVb2wqgh2NbVkR354SP/uGkkn4YfYI+yI+Ygdqd
 tQkdUsY9dj4HFouT0xnHZmyaQv6mr70jZ7tKQCJJC48SH27yXgkXs+fqn+wFNssD8zN2
 SKzxq8CVP9UomSGDR91bmDLtnjx/yXISFT0i5s5Uet5QiBswPoNdsQPraFmQqddEDPAh
 Zjro7uot9kuBz5uyqDPmz5FOTpM3B6+VNGRwOnxoCH8auFLtELsG4fYeE5X8TO8iNWGb
 d2VQ7h5AT/t3f2owaxX0fPSAIQ0a47VQkTlpO7u2cFHplqvH3PEqw9mAfIkrE1LNPtBw
 k8Zg==
X-Gm-Message-State: AOJu0YzeiKDv7BxkuL9Cz5r7XI3QmWLhRdBuL17BUmHq+ddnWhQWgmNa
 g8L/wgx5UbSB4hIQHQJo5OnX+xLrl0OgCQ==
X-Google-Smtp-Source: AGHT+IFEKQVTYaXsl/e90okDy75qbtPdNo4k2VFmvQ1EHrbJupnWkJTADNQYXo6AzqZ2MUVpIFrw0A==
X-Received: by 2002:a17:902:dacb:b0:1b8:1335:b775 with SMTP id
 q11-20020a170902dacb00b001b81335b775mr4972939plx.0.1693463452994; 
 Wed, 30 Aug 2023 23:30:52 -0700 (PDT)
Received: from localhost.localdomain ([98.37.226.98])
 by smtp.googlemail.com with ESMTPSA id
 j3-20020a170902da8300b001c0a414695dsm539164plx.62.2023.08.30.23.30.52
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Wed, 30 Aug 2023 23:30:52 -0700 (PDT)
From: Andy Tai <atai@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: onnx-optimizer: Update to 0.3.17
Date: Wed, 30 Aug 2023 23:30:48 -0700
Message-ID: <25a690fabd15942946ba175fe4be7a3483a61078.1693463416.git.atai@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::62a;
 envelope-from=lichengtai@HIDDEN; helo=mail-pl1-x62a.google.com
X-Spam_score_int: -14
X-Spam_score: -1.5
X-Spam_bar: -
X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249,
 FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.5 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * gnu/packages/machine-learning.scm (onnx-optimizer): Update
 to 0.3.17 * gnu/packages/patches/onnx-optimizer-system-library.patch: Adapt
 to onnx-optimizer 0.3.17 --- gnu/packages/machine-learning.scm [...] 
 Content analysis details:   (1.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 0.0 FREEMAIL_FROM          Sender email is commonly abused enduser mail
 provider (lichengtai[at]gmail.com)
 1.0 SPF_SOFTFAIL           SPF: sender does not match SPF record (softfail)
 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
 mail domains are different
 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
 EnvelopeFrom freemail headers are different
X-Debbugs-Envelope-To: submit
Cc: Andy Tai <atai@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.5 (/)

* gnu/packages/machine-learning.scm (onnx-optimizer): Update to 0.3.17
* gnu/packages/patches/onnx-optimizer-system-library.patch:
  Adapt to onnx-optimizer 0.3.17
---
 gnu/packages/machine-learning.scm             |  6 +--
 .../onnx-optimizer-system-library.patch       | 39 ++++++++-----------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 626afeb030..eef12ecb4d 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1118,8 +1118,8 @@ (define-public python-onnx
 (define-public onnx-optimizer
   (package
     (name "onnx-optimizer")
-    ;; Note: 0.2.x is *more* recent than 1.5.0.
-    (version "0.2.6")
+    ;; Note: 0.2.x or 0.3.x is *more* recent than 1.5.0.
+    (version "0.3.17")
     (home-page "https://github.com/onnx/optimizer")
     (source (origin
               (method git-fetch)
@@ -1128,7 +1128,7 @@ (define-public onnx-optimizer
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "1wkqqdxcxpfbf8zpbdfdd3zz5jkw775g31gyykj11z4y6pp659l6"))
+                "0j8civ0vf2vxyk5ihb9zxvwsqv8yzbfmkg42rnxwf59gdzgz48li"))
               (file-name (git-file-name name version))
               (patches (search-patches "onnx-optimizer-system-library.patch"))
               (modules '((guix build utils)))
diff --git a/gnu/packages/patches/onnx-optimizer-system-library.patch b/gnu/packages/patches/onnx-optimizer-system-library.patch
index 5c592597e0..9c888cc846 100644
--- a/gnu/packages/patches/onnx-optimizer-system-library.patch
+++ b/gnu/packages/patches/onnx-optimizer-system-library.patch
@@ -1,42 +1,35 @@
-Arrange so that onnx-optimizer (1) uses our own ONNX build, 
+Arrange so that onnx-optimizer (1) uses our own ONNX build,
 (2) builds as a shared library, and (3) links against the shared
 libraries of ONNX.
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2e48b35..8af51076 100644
+index 00633856..c6f3188d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -9,8 +9,6 @@ endif(NOT MSVC)
- 
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- 
+@@ -27,8 +27,6 @@ if(NOT ONNX_OPT_USE_SYSTEM_PROTOBUF)
+ endif()
+
+
 -set(ONNX_ROOT ${PROJECT_SOURCE_DIR}/third_party/onnx)
--add_subdirectory(${ONNX_ROOT})
- 
+-add_subdirectory_if_no_target(${ONNX_ROOT} ${ONNX_TARGET_NAME})
+
  file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION)
  string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION)
-@@ -21,14 +19,18 @@ file(GLOB_RECURSE onnx_opt_srcs "onnxoptimizer/*.cc"
- list(REMOVE_ITEM onnx_opt_srcs "${PROJECT_SOURCE_DIR}/onnxoptimizer/cpp2py_export.cc")
- 
- add_library(onnx_optimizer ${onnx_opt_srcs})
--target_link_libraries(onnx_optimizer PUBLIC onnx)
-+target_link_libraries(onnx_optimizer PUBLIC onnx onnx_proto)
- target_include_directories(onnx_optimizer PUBLIC
-     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+@@ -47,8 +45,12 @@ target_include_directories(onnx_optimizer PUBLIC
      $<INSTALL_INTERFACE:include>
      )
- 
+
 +# These cpp macros must be defined so the ONNX headers behave
 +# correctly.
 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DONNX_ML=1 -DONNX_NAMESPACE=onnx")
 +
- add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
+ onnxopt_add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
 -target_link_libraries(onnx_optimizer_exec onnx_optimizer)
 +target_link_libraries(onnx_optimizer_exec onnx_optimizer protobuf)
- 
- if(BUILD_ONNX_PYTHON)
-   if("${PY_EXT_SUFFIX}" STREQUAL "")
-@@ -79,11 +81,10 @@ if(BUILD_ONNX_PYTHON)
+
+
+ file(GLOB onnx_opt_c_api_srcs "onnxoptimizer/c_api/*.cc"
+@@ -112,11 +114,10 @@ if(BUILD_ONNX_PYTHON)
                            PRIVATE $<TARGET_OBJECTS:onnx_optimizer>)
    else()
      # Assume everything else is like gcc
@@ -49,5 +42,5 @@ index c2e48b35..8af51076 100644
 +                          PROPERTIES LINK_FLAGS
 +			  "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib")
    endif()
- 
+
    target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer)

base-commit: 74d72046bdc1ed6c859565570d0db58d20c9ddd7
prerequisite-patch-id: 829815d0ecb2dcb88c93fa4a09340cb889be4adb
-- 
2.41.0