Subject: [PATCH] gnu: onnx-optimizer: Update to 0.3.17
From: Andy Tai <[email-masked]>
To: [email-masked]
Cc: Andy Tai <[email-masked]>
Date: Wed, 30 Aug 2023 23:30:48 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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