diff --git a/docker/Dockerfile.ci_arm b/docker/Dockerfile.ci_arm index 2be887079e34..16ffecb315e9 100644 --- a/docker/Dockerfile.ci_arm +++ b/docker/Dockerfile.ci_arm @@ -75,6 +75,10 @@ RUN bash /install/ubuntu_install_tflite.sh COPY install/ubuntu_install_onnx.sh /install/ubuntu_install_onnx.sh RUN bash /install/ubuntu_install_onnx.sh +# NNEF +COPY install/ubuntu_install_nnef.sh /install/ubuntu_install_nnef.sh +RUN bash /install/ubuntu_install_nnef.sh + # AutoTVM deps COPY install/ubuntu_install_redis.sh /install/ubuntu_install_redis.sh RUN bash /install/ubuntu_install_redis.sh diff --git a/docker/Dockerfile.ci_cortexm b/docker/Dockerfile.ci_cortexm index 8006b27e84c2..5535d29ed104 100644 --- a/docker/Dockerfile.ci_cortexm +++ b/docker/Dockerfile.ci_cortexm @@ -108,6 +108,10 @@ RUN bash /install/ubuntu_install_arduino.sh COPY install/ubuntu_install_onnx.sh /install/ubuntu_install_onnx.sh RUN bash /install/ubuntu_install_onnx.sh +# NNEF +COPY install/ubuntu_install_nnef.sh /install/ubuntu_install_nnef.sh +RUN bash /install/ubuntu_install_nnef.sh + # Install CMSIS_NN COPY install/ubuntu_install_cmsis.sh /install/ubuntu_install_cmsis.sh RUN bash /install/ubuntu_install_cmsis.sh /opt/arm/ethosu/cmsis diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index 37c7c9085714..9e53882e1638 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -134,6 +134,10 @@ RUN bash /install/ubuntu_install_libxsmm.sh COPY install/ubuntu_install_onnx.sh /install/ubuntu_install_onnx.sh RUN bash /install/ubuntu_install_onnx.sh +# NNEF +COPY install/ubuntu_install_nnef.sh /install/ubuntu_install_nnef.sh +RUN bash /install/ubuntu_install_nnef.sh + # AArch64 Architecture Envelope Model (AEM) COPY install/ubuntu_install_aprofile_aem.sh /install RUN bash /install/ubuntu_install_aprofile_aem.sh diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu index 1a5721c549ab..7f5a68911c6a 100644 --- a/docker/Dockerfile.ci_gpu +++ b/docker/Dockerfile.ci_gpu @@ -104,6 +104,9 @@ RUN bash /install/ubuntu_install_libtorch.sh COPY install/ubuntu_install_tflite.sh /install/ubuntu_install_tflite.sh RUN bash /install/ubuntu_install_tflite.sh +COPY install/ubuntu_install_nnef.sh /install/ubuntu_install_nnef.sh +RUN bash /install/ubuntu_install_nnef.sh + COPY install/ubuntu_install_dgl.sh /install/ubuntu_install_dgl.sh RUN bash /install/ubuntu_install_dgl.sh diff --git a/docker/Dockerfile.ci_hexagon b/docker/Dockerfile.ci_hexagon index 11b3041f3c56..489894d252ae 100644 --- a/docker/Dockerfile.ci_hexagon +++ b/docker/Dockerfile.ci_hexagon @@ -84,6 +84,10 @@ RUN bash /install/ubuntu_install_tflite.sh COPY install/ubuntu_install_onnx.sh /install/ubuntu_install_onnx.sh RUN bash /install/ubuntu_install_onnx.sh +# NNEF +COPY install/ubuntu_install_nnef.sh /install/ubuntu_install_nnef.sh +RUN bash /install/ubuntu_install_nnef.sh + # xgboost (for tuning) COPY install/ubuntu_install_redis.sh /install/ubuntu_install_redis.sh RUN bash /install/ubuntu_install_redis.sh diff --git a/docker/Dockerfile.ci_riscv b/docker/Dockerfile.ci_riscv index d1b5a033b6e7..c26470985a92 100644 --- a/docker/Dockerfile.ci_riscv +++ b/docker/Dockerfile.ci_riscv @@ -75,6 +75,10 @@ RUN bash /install/ubuntu_install_tflite.sh COPY install/ubuntu_install_onnx.sh /install/ubuntu_install_onnx.sh RUN bash /install/ubuntu_install_onnx.sh +# NNEF +COPY install/ubuntu_install_nnef.sh /install/ubuntu_install_nnef.sh +RUN bash /install/ubuntu_install_nnef.sh + # sccache COPY install/ubuntu_install_sccache.sh /install/ubuntu_install_sccache.sh RUN bash /install/ubuntu_install_sccache.sh diff --git a/docker/install/ubuntu_install_nnef.sh b/docker/install/ubuntu_install_nnef.sh new file mode 100644 index 000000000000..6cd4761787c5 --- /dev/null +++ b/docker/install/ubuntu_install_nnef.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +set -u +set -o pipefail + +pip3 install \ + nnef_tools==1.0.6 \ + nnef==1.0.7 diff --git a/docker/python/ci-constraints.txt b/docker/python/ci-constraints.txt index 003c13170411..feba27cd03d0 100644 --- a/docker/python/ci-constraints.txt +++ b/docker/python/ci-constraints.txt @@ -37,3 +37,5 @@ tflite = "==2.4.0" torch = "==1.11.0" torchvision = "==0.12.0+cpu" #xgboost = "==1.4.2" +nnef = "==1.0.7" +nnef_tools = "==1.0.6"