github/SHARK-Studio
1
1
Fork 0
mirror of https://github.com/nod-ai/SHARK-Studio.git synced 2026-01-09 22:07:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change dependency installation order in venv setup script. (#470)

Browse Source
This commit is contained in:
Ean Garvey
2022-11-04 20:53:54 -05:00
committed by GitHub
parent c63009a6db
commit 1e95e4b502
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements-importer-macos.txt
View File

@@ -2,7 +2,7 @@
--pre --pre
numpy numpy
torch==1.14.0.dev20221021 torch
torchvision torchvision
tqdm tqdm

1
requirements-importer.txt
View File

@@ -2,7 +2,6 @@
--pre --pre
numpy==1.22.4 numpy==1.22.4
torch
torchvision torchvision
tqdm tqdm

11
setup_venv.sh
View File

@@ -103,22 +103,21 @@ if [[ -z "${NO_BACKEND}" ]]; then
else else
echo "Not installing a backend, please make sure to add your backend to PYTHONPATH" echo "Not installing a backend, please make sure to add your backend to PYTHONPATH"
fi fi
$PYTHON -m pip install -e . -f https://llvm.github.io/torch-mlir/package-index/ -f ${RUNTIME}
if [[ ! -z "${IMPORTER}" ]]; then if [[ ! -z "${IMPORTER}" ]]; then
echo "${Yellow}Installing importer tools.." echo "${Yellow}Installing importer tools.."
if [[ $(uname -s) = 'Linux' ]]; then if [[ $(uname -s) = 'Linux' ]]; then
echo "${Yellow}Linux detected.. installing Linux importer tools" echo "${Yellow}Linux detected.. installing Linux importer tools"
#Always get the importer tools from upstream IREE #Always get the importer tools from upstream IREE
$PYTHON -m pip install --upgrade -r "$TD/requirements-importer.txt" -f https://iree-org.github.io/iree/pip-release-links.html --extra-index-url https://download.pytorch.org/whl/nightly/cpu $PYTHON -m pip install --no-warn-conflicts --upgrade -r "$TD/requirements-importer.txt" -f https://iree-org.github.io/iree/pip-release-links.html --extra-index-url https://download.pytorch.org/whl/nightly/cpu
elif [[ $(uname -s) = 'Darwin' ]]; then elif [[ $(uname -s) = 'Darwin' ]]; then
echo "${Yellow}macOS detected.. installing macOS importer tools" echo "${Yellow}macOS detected.. installing macOS importer tools"
#Conda seems to have some problems installing these packages and hope they get resolved upstream. #Conda seems to have some problems installing these packages and hope they get resolved upstream.
$PYTHON -m pip install --upgrade -r "$TD/requirements-importer-macos.txt" -f ${RUNTIME} --extra-index-url https://download.pytorch.org/whl/nightly/cpu $PYTHON -m pip install --no-warn-conflicts --upgrade -r "$TD/requirements-importer-macos.txt" -f ${RUNTIME} --extra-index-url https://download.pytorch.org/whl/nightly/cpu
$PYTHON -m pip install https://github.com/llvm/torch-mlir/releases/download/snapshot-20221024.636/torch_mlir-20221024.636-cp310-cp310-macosx_11_0_universal2.whl
fi fi
fi fi
$PYTHON -m pip install -e . -f https://llvm.github.io/torch-mlir/package-index/ -f ${RUNTIME}
if [[ $(uname -s) = 'Linux' && ! -z "${BENCHMARK}" ]]; then if [[ $(uname -s) = 'Linux' && ! -z "${BENCHMARK}" ]]; then
$PYTHON -m pip uninstall -y torch torchvision $PYTHON -m pip uninstall -y torch torchvision
$PYTHON -m pip install --pre torch torchvision --extra-index-url https://download.pytorch.org/whl/nightly/cu116 $PYTHON -m pip install --pre torch torchvision --extra-index-url https://download.pytorch.org/whl/nightly/cu116