From 504a4ea9a4d7e7a4335a4a71e04fd61c23bbfe31 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Sat, 26 Sep 2020 15:31:30 +0200
Subject: [PATCH] [Deps+Docker] clone finn-base in dockerfile, update version
---
docker/Dockerfile.finn_ci | 2 ++
docker/Dockerfile.finn_dev | 2 ++
docker/finn_entrypoint.sh | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/docker/Dockerfile.finn_ci b/docker/Dockerfile.finn_ci
index 4518fe564..b9c71df58 100644
--- a/docker/Dockerfile.finn_ci
+++ b/docker/Dockerfile.finn_ci
@@ -47,6 +47,8 @@ RUN bash xrtdeps.sh
RUN rm xrtdeps.sh
# cloning dependency repos
+# finn-base
+RUN git clone https://github.com/maltanar/finn-base.git /workspace/finn-base
# Brevitas
RUN git clone https://github.com/Xilinx/brevitas.git /workspace/brevitas
# CNPY
diff --git a/docker/Dockerfile.finn_dev b/docker/Dockerfile.finn_dev
index 4be975442..fe7f45b46 100644
--- a/docker/Dockerfile.finn_dev
+++ b/docker/Dockerfile.finn_dev
@@ -71,6 +71,8 @@ RUN chown -R $UNAME:$GNAME /home/$UNAME
USER $UNAME
# cloning dependency repos (as user)
+# finn-base
+RUN git clone https://github.com/maltanar/finn-base.git /workspace/finn-base
# Brevitas
RUN git clone https://github.com/Xilinx/brevitas.git /workspace/brevitas
# CNPY
diff --git a/docker/finn_entrypoint.sh b/docker/finn_entrypoint.sh
index f4cecf985..7de26d8e4 100644
--- a/docker/finn_entrypoint.sh
+++ b/docker/finn_entrypoint.sh
@@ -12,7 +12,7 @@ gecho () {
# checkout the correct dependency repo commits
# the repos themselves are cloned in the Dockerfile
-FINN_BASE_COMMIT=b932297c769a90e01372ba3da931db0ee3e443fe
+FINN_BASE_COMMIT=eebb2e4053a46ae314c13ee91657c3b82cd93b24
BREVITAS_COMMIT=6ffefa8dbf37fdb0f44c994f34604c29fadb16b0
CNPY_COMMIT=4e8810b1a8637695171ed346ce68f6984e585ef4
HLSLIB_COMMIT=cfafe11a93b79ab1af7529d68f08886913a6466e
@@ -22,7 +22,7 @@ OMX_COMMIT=1bae737669901e762f581af73348332b5c4b2ada
gecho "Setting up known-good commit versions for FINN dependencies"
# finn-base
gecho "finn-base @ $FINN_BASE_COMMIT"
-git clone https://github.com/maltanar/finn-base.git /workspace/finn-base
+git -C /workspace/finn-base pull --quiet
git -C /workspace/finn-base checkout $FINN_BASE_COMMIT --quiet
pip install --user -e /workspace/finn-base
# Brevitas
--
GitLab