Skip to content

onnx v1.15.0 #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbourjau merged 11 commits into from
Nov 7, 2023
Merged

onnx v1.15.0 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
685dbdc
repro
adityagoel4512 Oct 31, 2023
78b32d1
ONNX 1.15.0
adityagoel4512 Nov 1, 2023
656de9a
Expand build matrix
adityagoel4512 Nov 1, 2023
4c1d5ad
update patch
adityagoel4512 Nov 1, 2023
22b406e
No patch
adityagoel4512 Nov 1, 2023
e97d9c4
Readd patch
adityagoel4512 Nov 2, 2023
3a4825f
Expand matrix
adityagoel4512 Nov 2, 2023
b1bc7a4
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
59384e3
Merge branch 'main' into onnx-1.15
adityagoel4512 Nov 2, 2023
7a979be
Use git format-patch
adityagoel4512 Nov 7, 2023
0b8ccd6
Use git format-patch
adityagoel4512 Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions recipe/0001-Link-to-abseil_dll.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From b2828440f9930c76e42235ddccfa0954d58a84ac Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwe.korn@quantco.com>
Date: Tue, 4 Jul 2023 11:29:21 +0200
From 4195334fa39b4aa929c9d84258323ea8a3a0f9c6 Mon Sep 17 00:00:00 2001
From: Aditya Goel <agoel4512@gmail.com>
Date: Tue, 7 Nov 2023 11:47:35 +0000
Subject: [PATCH] Link to abseil_dll

---
CMakeLists.txt | 2 +-
Comment thread
adityagoel4512 marked this conversation as resolved.
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dd56b6..3a002a5 100644
index 585786e1..64290187 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,7 +430,7 @@ target_include_directories(onnx PUBLIC
@@ -519,7 +519,7 @@ target_include_directories(onnx PUBLIC
$<BUILD_INTERFACE:${ONNX_ROOT}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
$<INSTALL_INTERFACE:include>)
Expand All @@ -21,5 +21,5 @@ index 4dd56b6..3a002a5 100644

if(BUILD_ONNX_PYTHON)
--
2.39.2 (Apple Git-143)
2.40.1

5 changes: 1 addition & 4 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@echo on
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt
if %ERRORLEVEL% neq 0 exit 1

set "ONNX_ML=1"
set CONDA_PREFIX=%LIBRARY_PREFIX%
set CMAKE_BUILD_TYPE=Release
Expand All @@ -10,4 +7,4 @@ set "CMAKE_ARGS=%CMAKE_ARGS% -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DProtobuf_USE_S
set "PYTHON_EXECUTABLE=%PYTHON%"
set "PYTHON_LIBRARIES=%LIBRARY_LIB%"
set USE_MSVC_STATIC_RUNTIME=0
%PYTHON% -m pip install --no-deps --no-use-pep517 --ignore-installed --verbose .
%PYTHON% -m pip install --no-deps --ignore-installed --verbose .
4 changes: 0 additions & 4 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#!/bin/bash

set -euxo pipefail

# Let us set the C++ Standard
sed -i '/CMAKE_CXX_STANDARD/d' CMakeLists.txt

export ONNX_ML=1
# build script looks at this, but not set on
export CONDA_PREFIX="$PREFIX"
Expand Down
8 changes: 3 additions & 5 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{% set name = "onnx" %}
{% set version = "1.14.1" %}
{% set version = "1.15.0" %}

package:
name: {{ name|lower }}
version: {{ version }}

source:
url: https://github.com/onnx/onnx/archive/v{{ version }}.tar.gz
sha256: e296f8867951fa6e71417a18f2e550a730550f8829bd35e947b4df5e3e777aa1
sha256: c757132e018dd0dd171499ef74fca88b74c5430a20781ec53da19eb7f937ef68
patches:
- 0001-Link-to-abseil_dll.patch # [win and (libprotobuf != "3.21")]

build:
number: 4
number: 0
entry_points:
- check-model = onnx.bin.checker:check_model
- check-node = onnx.bin.checker:check_node
Expand All @@ -29,8 +29,6 @@ requirements:
- cmake
- make
- libprotobuf
- sed # [unix]
- m2-sed # [win]
host:
- python
- pip
Expand Down