Skip to content
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

Jump to bottom

Update ONNX Runtime to v1.0.0 #5346

Merged
merged 3 commits into from Nov 15, 2019
Merged

Update ONNX Runtime to v1.0.0 #5346

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cad3c7
Update ONNX Runtime to v1.0.0.
hqucms Nov 12, 2019
223ce01
Update onnxruntime.spec
smuzaffar Nov 13, 2019
1387bcd
Update onnxruntime.spec
smuzaffar Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion onnxruntime-toolfile.spec
View file
Open in desktop
Expand Up @@ -15,7 +15,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/onnxruntime.xml
<environment name="INCLUDE" default="$ONNXRUNTIME_BASE/include"/>
<environment name="LIBDIR" default="$ONNXRUNTIME_BASE/lib64"/>
</client>
<use name="eigen"/>
<use name="protobuf"/>
<runtime name="MLAS_DYNAMIC_CPU_ARCH" value="0"/>
</tool>
Expand Down
10 changes: 4 additions & 6 deletions onnxruntime.spec
View file
Open in desktop
@@ -1,11 +1,11 @@
### RPM external onnxruntime 0.5.0
%define tag 2824909ae569932d9aee1462049ff0da1e766989
%define branch cms/master/9f633c5b
### RPM external onnxruntime 1.0.0
%define tag dfec41d1371a7b1233d25db55561ce4021fc7ceb
%define branch cms/v1.0.0
%define github_user cms-externals
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz

BuildRequires: cmake ninja zlib python3
Requires: eigen protobuf
Requires: protobuf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hqucms , yes it is not needed as onnxruntime uses eigen internally i.e. non of the onnxruntime public headers include eigen. So removing it is correct. We need to be careful when onnxruntime public headers starts using eigen. In that case we have to make sure that onnxruntime and cmssw use the same eigen version.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smuzaffar Thank you very much for confirming that!



%prep
Expand Down Expand Up @@ -40,8 +40,6 @@ cmake ../%{n}-%{realversion}/cmake -GNinja \
-Donnxruntime_USE_FULL_PROTOBUF=ON \
-Donnxruntime_DISABLE_CONTRIB_OPS=OFF \
-Donnxruntime_BUILD_UNIT_TESTS=OFF \
-Donnxruntime_USE_PREINSTALLED_EIGEN=ON \
-Deigen_SOURCE_PATH=$EIGEN_ROOT/include/eigen3 \
-Donnxruntime_USE_PREINSTALLED_PROTOBUF=ON \
-Dprotobuf_INSTALL_PATH=${PROTOBUF_ROOT}

Expand Down