Merge branch 'dev' of https://github.com/Xilinx/finn into feature/end2end_fullnet

docker/Dockerfile.finn_ci

@@ -40,12 +40,6 @@ RUN apt-get install -y verilator zsh
 RUN apt-get -y install sshpass wget unzip
 RUN echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
 
-# install XRT dependencies
-RUN wget https://raw.githubusercontent.com/Xilinx/XRT/master/src/runtime_src/tools/scripts/xrtdeps.sh
-RUN apt-get update
-RUN bash xrtdeps.sh
-RUN rm xrtdeps.sh
-
 # cloning dependency repos
 # Brevitas
 RUN git clone https://github.com/Xilinx/brevitas.git /workspace/brevitas

docker/Dockerfile.finn_dev

@@ -46,12 +46,6 @@ RUN apt-get install -y verilator nano zsh rsync
 RUN apt-get -y install sshpass wget unzip
 RUN echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
 
-# install XRT dependencies
-RUN wget https://raw.githubusercontent.com/Xilinx/XRT/master/src/runtime_src/tools/scripts/xrtdeps.sh
-RUN apt-get update
-RUN bash xrtdeps.sh
-RUN rm xrtdeps.sh
-
 COPY requirements.txt .
 RUN pip install -r requirements.txt
 RUN rm requirements.txt

docker/finn_entrypoint.sh

@@ -52,6 +52,11 @@ if [ ! -z "$VITIS_PATH" ];then
   source $VITIS_PATH/settings64.sh
 fi
 if [ ! -z "$XILINX_XRT" ];then
+  # TODO install XRT dependencies?
+  # wget https://raw.githubusercontent.com/Xilinx/XRT/master/src/runtime_src/tools/scripts/xrtdeps.sh
+  # apt-get update
+  # bash xrtdeps.sh
+  # rm xrtdeps.sh
   # source XRT
   source $XILINX_XRT/setup.sh
 fi

tests/brevitas/test_brevitas_avg_pool_export.py

@@ -23,7 +23,7 @@ export_onnx_path = "test_brevitas_avg_pool_export.onnx"
 @pytest.mark.parametrize("stride", [1, 2])
 @pytest.mark.parametrize("signed", [False, True])
 @pytest.mark.parametrize("bit_width", [2, 4])
-@pytest.mark.parametrize("input_bit_width", [4, 8, 32])
+@pytest.mark.parametrize("input_bit_width", [4, 8, 16])
 @pytest.mark.parametrize("channels", [2, 4])
 @pytest.mark.parametrize("idim", [7, 8])
 def test_brevitas_avg_pool_export(
@@ -35,9 +35,7 @@ def test_brevitas_avg_pool_export(
     b_avgpool = QuantAvgPool2d(
         kernel_size=kernel_size,
         stride=stride,
-        signed=signed,
-        min_overall_bit_width=bit_width,
-        max_overall_bit_width=bit_width,
+        bit_width=bit_width,
         quant_type=QuantType.INT,
     )
     # call forward pass manually once to cache scale factor and bitwidth
@@ -55,7 +53,7 @@ def test_brevitas_avg_pool_export(
         prefix = "INT"
     else:
         prefix = "UINT"
-    dt_name = prefix + str(input_bit_width // 2)
+    dt_name = prefix + str(input_bit_width)
     dtype = DataType[dt_name]
     model = model.transform(InferShapes())
     model = model.transform(InferDataTypes())