From 5d08e2ed2b25853ac4d4750d26511451766f21c4 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Thu, 13 Feb 2020 12:54:19 +0100
Subject: [PATCH] [Docker] take PYNQ_BOARD from host env if it exists
---
Dockerfile | 1 -
run-docker.sh | 7 ++++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 7780d3fd4..734a8fd3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,6 @@ 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"
-ENV PYNQ_BOARD "Pynq-Z1"
ARG GID
ARG GNAME
diff --git a/run-docker.sh b/run-docker.sh
index 77441ed95..aadc4c787 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -17,8 +17,11 @@ DOCKER_TAG="finn_${DOCKER_UNAME}"
# uncomment to run multiple instances with different names
# DOCKER_INST_NAME="finn_${DOCKER_UNAME}_${DOCKER_RND}"
DOCKER_INST_NAME="finn_${DOCKER_UNAME}"
+# the settings below will be taken from environment variables if available,
+# otherwise the defaults below will be used
: ${JUPYTER_PORT=8888}
: ${NETRON_PORT=8081}
+: ${PYNQ_BOARD="Pynq-Z1"}
# Absolute path to this script, e.g. /home/user/bin/foo.sh
SCRIPT=$(readlink -f "$0")
@@ -40,7 +43,7 @@ PYVERILATOR_LOCAL=$SCRIPTPATH/pyverilator
PYNQSHELL_LOCAL=$SCRIPTPATH/PYNQ-HelloWorld
BUILD_LOCAL=/tmp/$DOCKER_INST_NAME
VIVADO_HLS_LOCAL=$VIVADO_PATH
-: ${VIVADO_IP_CACHE=$BUILD_LOCAL/vivado_ip_cache}
+VIVADO_IP_CACHE=$BUILD_LOCAL/vivado_ip_cache
# clone dependency repos
git clone --branch feature/finn_onnx_export $BREVITAS_REPO $BREVITAS_LOCAL || git -C "$BREVITAS_LOCAL" pull
@@ -67,6 +70,7 @@ echo "Mounting $VIVADO_PATH into $VIVADO_PATH"
echo "Port-forwarding for Jupyter $JUPYTER_PORT:$JUPYTER_PORT"
echo "Port-forwarding for Netron $NETRON_PORT:$NETRON_PORT"
echo "Vivado IP cache dir is at $VIVADO_IP_CACHE"
+echo "Using default PYNQ board $PYNQ_BOARD"
if [ "$1" = "test" ]; then
echo "Running test suite"
@@ -107,6 +111,7 @@ docker run -t --rm --name $DOCKER_INST_NAME -it \
-e FINN_INST_NAME=$DOCKER_INST_NAME \
-e FINN_ROOT="/workspace/finn" \
-e VIVADO_IP_CACHE="$VIVADO_IP_CACHE" \
+-e PYNQ_BOARD=$PYNQ_BOARD \
-p $JUPYTER_PORT:$JUPYTER_PORT \
-p $NETRON_PORT:$NETRON_PORT \
$DOCKER_TAG bash -c "$DOCKER_CMD"
--
GitLab