This is an automated email from the ASF dual-hosted git repository. areusch pushed a commit to branch areusch/freeze-dependencies in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 2862b9e872e5d4e0db6ca9cf6ecafa7663b20224 Author: Andrew Reusch <areu...@gmail.com> AuthorDate: Thu May 19 15:18:02 2022 -0700 Adjust package installs with py-deps to use the virtualenv. --- docker/install/ubuntu_install_caffe.sh | 1 + docker/install/ubuntu_install_vitis_ai_packages_ci.sh | 6 +++--- docker/install/ubuntu_install_zephyr.sh | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docker/install/ubuntu_install_caffe.sh b/docker/install/ubuntu_install_caffe.sh index 6867993c58..9dc58b8a0a 100755 --- a/docker/install/ubuntu_install_caffe.sh +++ b/docker/install/ubuntu_install_caffe.sh @@ -34,6 +34,7 @@ cd /caffe_src echo "Building Caffe" mkdir /caffe_src/build && cd /caffe_src/build +. "${TVM_VENV}/bin/activate" cmake -DCMAKE_INSTALL_PREFIX=${CAFFE_HOME}\ -DCMAKE_BUILD_TYPE=Release \ -DCPU_ONLY=1 \ diff --git a/docker/install/ubuntu_install_vitis_ai_packages_ci.sh b/docker/install/ubuntu_install_vitis_ai_packages_ci.sh index ccaf113cec..49e9e49149 100755 --- a/docker/install/ubuntu_install_vitis_ai_packages_ci.sh +++ b/docker/install/ubuntu_install_vitis_ai_packages_ci.sh @@ -6,9 +6,9 @@ # 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 @@ -26,4 +26,4 @@ mkdir "$PYXIR_HOME" pip3 install progressbar git clone --recursive --branch v0.3.5 --depth 1 https://github.com/Xilinx/pyxir.git "${PYXIR_HOME}" -cd "${PYXIR_HOME}" && python3 setup.py install +cd "${PYXIR_HOME}" && "${TVM_VENV}/bin/python3" setup.py install diff --git a/docker/install/ubuntu_install_zephyr.sh b/docker/install/ubuntu_install_zephyr.sh index 1237f91a41..5dcf148803 100755 --- a/docker/install/ubuntu_install_zephyr.sh +++ b/docker/install/ubuntu_install_zephyr.sh @@ -42,7 +42,14 @@ sudo apt-get update sudo apt-get install -y cmake -pip3 install west +python3 -mvenv /venv/west +. /venv/west/bin/activate +pip3 install -U pip +# TODO: is setuptools-scm needed? +pip3 install \ + setuptools-scm \ + west +ln -s /venv/west/bin/west /usr/local/bin/ # Init ZephyrProject ZEPHYR_PROJECT_PATH=/opt/zephyrproject