From 2382df8031ab3b76969db193ac695be0dcaa04ef Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <yamanu@xilinx.com>
Date: Wed, 22 Jan 2020 16:59:32 +0000
Subject: [PATCH] [PYNQ] add dependency repo for PYNQ shells
---
.gitignore | 1 +
Dockerfile | 1 +
run-docker.sh | 5 +++++
3 files changed, 7 insertions(+)
diff --git a/.gitignore b/.gitignore
index 6e557f12a..796e3e78d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ brevitas_cnv_lfc/
cnpy/
finn-hlslib/
pyverilator/
+PYNQ-HelloWorld/
diff --git a/Dockerfile b/Dockerfile
index 145424bbc..00050b9f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,7 @@ ENV PYTHONPATH "${PYTHONPATH}:/workspace/finn/src"
ENV PYTHONPATH "${PYTHONPATH}:/workspace/brevitas_cnv_lfc/training_scripts"
ENV PYTHONPATH "${PYTHONPATH}:/workspace/brevitas"
ENV PYTHONPATH "${PYTHONPATH}:/workspace/pyverilator"
+ENV PYNQSHELL_PATH "/workspace/PYNQ-HelloWorld/boards"
ARG GID
ARG GNAME
diff --git a/run-docker.sh b/run-docker.sh
index 4a2f0cfcf..5fc4c2eda 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -22,12 +22,14 @@ EXAMPLES_REPO=https://github.com/maltanar/brevitas_cnv_lfc.git
CNPY_REPO=https://github.com/rogersce/cnpy.git
FINN_HLS_REPO=https://github.com/Xilinx/finn-hlslib.git
PYVERILATOR_REPO=https://github.com/maltanar/pyverilator
+PYNQSHELL_REPO=https://github.com/maltanar/PYNQ-HelloWorld.git
BREVITAS_LOCAL=$SCRIPTPATH/brevitas
EXAMPLES_LOCAL=$SCRIPTPATH/brevitas_cnv_lfc
CNPY_LOCAL=$SCRIPTPATH/cnpy
FINN_HLS_LOCAL=$SCRIPTPATH/finn-hlslib
PYVERILATOR_LOCAL=$SCRIPTPATH/pyverilator
+PYNQSHELL_LOCAL=$SCRIPTPATH/PYNQ-HelloWorld
VIVADO_HLS_LOCAL=$VIVADO_PATH
# clone dependency repos
@@ -36,6 +38,7 @@ git clone $EXAMPLES_REPO $EXAMPLES_LOCAL || git -C "$EXAMPLES_LOCAL" pull
git clone $CNPY_REPO $CNPY_LOCAL || git -C "$CNPY_LOCAL" pull
git clone $FINN_HLS_REPO $FINN_HLS_LOCAL; git -C "$FINN_HLS_LOCAL" checkout b5dc957a16017b8356a7010144b0a4e2f8cfd124 || git -C "$FINN_HLS_LOCAL" checkout b5dc957a16017b8356a7010144b0a4e2f8cfd124
git clone $PYVERILATOR_REPO $PYVERILATOR_LOCAL || git -C "$PYVERILATOR_LOCAL" pull
+git clone $PYNQSHELL_REPO $PYNQSHELL_LOCAL || git -C "$PYNQSHELL_LOCAL" pull
echo "Mounting $SCRIPTPATH into /workspace/finn"
echo "Mounting $SCRIPTPATH/brevitas into /workspace/brevitas"
@@ -43,6 +46,7 @@ echo "Mounting $SCRIPTPATH/brevitas_cnv_lfc into /workspace/brevitas_cnv_lfc"
echo "Mounting $SCRIPTPATH/cnpy into /workspace/cnpy"
echo "Mounting $SCRIPTPATH/finn-hlslib into /workspace/finn-hlslib"
echo "Mounting $SCRIPTPATH/pyverilator into /workspace/pyverilator"
+echo "Mounting $SCRIPTPATH/PYNQ-HelloWorld into /workspace/PYNQ-HelloWorld"
echo "Mounting $VIVADO_PATH into $VIVADO_PATH"
if [ "$1" = "test" ]; then
@@ -73,6 +77,7 @@ docker run --rm --name finn_dev -it \
-v $SCRIPTPATH/cnpy:/workspace/cnpy \
-v $SCRIPTPATH/finn-hlslib:/workspace/finn-hlslib \
-v $SCRIPTPATH/pyverilator:/workspace/pyverilator \
+-v $SCRIPTPATH/PYNQ-HelloWorld:/workspace/PYNQ-HelloWorld \
-v $VIVADO_PATH:$VIVADO_PATH \
-e VIVADO_PATH=$VIVADO_PATH \
-p 8888:8888 -p 8081:8081 \
--
GitLab