GNU bug report logs - #65630
[PATCH] gnu: onnx: Update to 1.14.1

Previous Next

Full log

View this message in rfc822 format

From: Andy Tai <atai <at> atai.org>
To: 65630 <at> debbugs.gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [bug#65630] [PATCH v3 4/4] gnu: onnx-optimizer: Update to 0.3.17
Date: Sun, 10 Sep 2023 13:01:15 -0700

* 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             | 12 +++--
 .../onnx-optimizer-system-library.patch       | 48 +++++++++++--------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 3c26eb4e64..dfba9f666a 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1098,8 +1098,10 @@ (define-public onnx
                                "-DONNX_USE_PROTOBUF_SHARED_LIBS=ON"
                                "-DONNX_OPT_USE_SYSTEM_PROTOBUF=ON"
                                ; force system copy use;
-                               "-DBUILD_SHARED_LIBS=ON"))
-
+                               "-DBUILD_SHARED_LIBS=ON"
+                               (string-append "-DONNX_ROOT="
+                                   #$(package-source this-package))))
+                                 ;; for derived package use
                             ;; This environment variable is honored by 'setup.py',
                             ;; which passes it down to 'cmake'.
                             (setenv "CMAKE_ARGS"
@@ -1157,8 +1159,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)
@@ -1167,7 +1169,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..7890bee045 100644
--- a/gnu/packages/patches/onnx-optimizer-system-library.patch
+++ b/gnu/packages/patches/onnx-optimizer-system-library.patch
@@ -1,42 +1,42 @@
-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"
+@@ -41,14 +39,18 @@ file(GLOB 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)
+ onnxopt_add_library(onnx_optimizer ${onnx_opt_srcs})
+-target_link_libraries(onnx_optimizer PUBLIC ${ONNX_TARGET_NAME})
++target_link_libraries(onnx_optimizer PUBLIC ${ONNX_TARGET_NAME}  onnx_proto)
  target_include_directories(onnx_optimizer PUBLIC
      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
      $<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 +49,15 @@ index c2e48b35..8af51076 100644
 +                          PROPERTIES LINK_FLAGS
 +			  "-Wl,-rpath=${CMAKE_INSTALL_PREFIX}/lib")
    endif()
- 
+
    target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer)
+diff --git a/cmake/utils.cmake b/cmake/utils.cmake
+index 6cca9f36..8e39d5c4 100644
+--- a/cmake/utils.cmake
++++ b/cmake/utils.cmake
+@@ -1,4 +1,4 @@
+-include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake)
++include(${ONNX_ROOT}/cmake/Utils.cmake)
+ 
+ # Poor man's FetchContent
+ function(add_subdirectory_if_no_target dir target)
-- 
2.41.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.