Merge branch 'staging/v0.3b' of https://github.com/Xilinx/finn into staging/v0.3b

docker/Jenkinsfile

@@ -35,7 +35,7 @@ pipeline {
         stage('Test') {
             steps {
                 sh """
-                docker run --name $DOCKER_INST_NAME \
+                docker run --name $DOCKER_INST_NAME --init \
                 --hostname $DOCKER_INST_NAME \
                 -v ${params.VIVADO_PATH}:${params.VIVADO_PATH}:ro \
                 -e NUM_DEFAULT_WORKERS=${params.NUM_DEFAULT_WORKERS} \

docs/finn/example_networks.rst

@@ -18,19 +18,19 @@ version, this is indicated by an x mark in the table.
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
 | FINN step             | Basic test | TFC-w1a1 | TFC-w1a2 | TFC-w2a2 | CNV-w1a1 | CNV-w1a2 | CNV-w2a2 |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
-| Export/Import         | x          | x        | x        | x        | x        |          |          |
+| Export/Import         | x          | x        | x        | x        | x        |    x     |     x    |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
 | Streamlining          | x          | x        | x        | x        | x        |          |          |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
 | Convert to HLS layers | x          | x        | x        | x        | x        |          |          |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
-| Stitched IP           | x          | x        | x        | x        |          |          |          |
+| Stitched IP           | x          | x        | x        | x        | x        |          |          |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
-| Hardware test         | x          | x        | x        |          |          |          |          |
+| Hardware test         | x          | x        | x        |          | x        |          |          |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
 | npysim                | x          | x        | x        | x        | x        |          |          |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
-| rtlsim node-by-node   | x          | x        | x        | x        |          |          |          |
+| rtlsim node-by-node   | x          | x        | x        | x        | x        |          |          |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+
-| rtlsim stitched IP    | x          | x        | x        | x        |          |          |          |
+| rtlsim stitched IP    | x          | x        | x        | x        | x        |          |          |
 +-----------------------+------------+----------+----------+----------+----------+----------+----------+

run-docker.sh

@@ -104,7 +104,9 @@ docker build -f docker/Dockerfile.finn_dev --tag=$DOCKER_TAG \
              --build-arg NETRON_PORT=$NETRON_PORT \
              .
 # Launch container with current directory mounted
-docker run -t --rm --name $DOCKER_INST_NAME -it \
+# important to pass the --init flag here for correct Vivado operation, see:
+# https://stackoverflow.com/questions/55733058/vivado-synthesis-hangs-in-docker-container-spawned-by-jenkins
+docker run -t --rm --name $DOCKER_INST_NAME -it --init \
 --hostname $DOCKER_INST_NAME \
 -e "XILINX_VIVADO=$VIVADO_PATH" \
 -e "SHELL=/bin/bash" \