Merge branch 'dev' into refactor/rtl_integration

Xilinx · Jan 23, 2024 · 248a41b · 248a41b
2 parents 6519986 + 244455e
commit 248a41b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/fetch-repos.sh b/fetch-repos.sh
@@ -127,17 +127,23 @@ fetch_repo $XIL_BDF_URL $XIL_BDF_COMMIT $XIL_BDF_DIR
 fetch_repo $RFSOC4x2_BDF_URL $RFSOC4x2_BDF_COMMIT $RFSOC4x2_BDF_DIR
 fetch_repo $KV260_BDF_URL $KV260_BDF_COMMIT $KV260_SOM_BDF_DIR
 
-# download extra Pynq board files and extract if needed
-if [ ! -d "$SCRIPTPATH/deps/board_files" ]; then
-    fetch_board_files
+# Can skip downloading of board files entirely if desired
+if [ "$FINN_SKIP_BOARD_FILES" = "1" ]; then
+    echo "Skipping download and verification of board files"
 else
-    cd $SCRIPTPATH
-    BOARD_FILES_MD5=$(find deps/board_files/ -type f -exec md5sum {} \; | sort -k 2 | md5sum | cut -d' ' -f 1)
-    if [ "$BOARD_FILES_MD5" = "$EXP_BOARD_FILES_MD5" ]; then
-        echo "Verified board files folder content md5: $BOARD_FILES_MD5"
-    else
-        echo "Board files folder content mismatch, removing and re-downloading"
-        rm -rf deps/board_files/
+    # download extra board files and extract if needed
+    if [ ! -d "$SCRIPTPATH/deps/board_files" ]; then
         fetch_board_files
+    else
+        cd $SCRIPTPATH
+        BOARD_FILES_MD5=$(find deps/board_files/ -type f -exec md5sum {} \; | sort -k 2 | md5sum | cut -d' ' -f 1)
+        if [ "$BOARD_FILES_MD5" = "$EXP_BOARD_FILES_MD5" ]; then
+            echo "Verified board files folder content md5: $BOARD_FILES_MD5"
+        else
+            echo "Board files folder md5: expected $BOARD_FILES_MD5 found $EXP_BOARD_FILES_MD5"
+            echo "Board files folder content mismatch, removing and re-downloading"
+            rm -rf deps/board_files/
+            fetch_board_files
+        fi
     fi
 fi
diff --git a/run-docker.sh b/run-docker.sh
@@ -93,7 +93,9 @@ SCRIPTPATH=$(dirname "$SCRIPT")
 : ${FINN_DOCKER_RUN_AS_ROOT="0"}
 : ${FINN_DOCKER_GPU="$(docker info | grep nvidia | wc -m)"}
 : ${FINN_DOCKER_EXTRA=""}
+: ${FINN_DOCKER_BUILD_EXTRA=""}
 : ${FINN_SKIP_DEP_REPOS="0"}
+: ${FINN_SKIP_BOARD_FILES="0"}
 : ${OHMYXILINX="${SCRIPTPATH}/deps/oh-my-xilinx"}
 : ${NVIDIA_VISIBLE_DEVICES=""}
 : ${DOCKER_BUILDKIT="1"}
@@ -181,7 +183,7 @@ if [ "$FINN_DOCKER_PREBUILT" = "0" ]; then
   # Need to ensure this is done within the finn/ root folder:
   OLD_PWD=$(pwd)
   cd $SCRIPTPATH
-  docker build -f docker/Dockerfile.finn --build-arg XRT_DEB_VERSION=$XRT_DEB_VERSION --tag=$FINN_DOCKER_TAG .
+  docker build -f docker/Dockerfile.finn --build-arg XRT_DEB_VERSION=$XRT_DEB_VERSION --tag=$FINN_DOCKER_TAG $FINN_DOCKER_BUILD_EXTRA .
   cd $OLD_PWD
 fi
 # Launch container with current directory mounted