[Test] Add port to DeployToPYNQ trafo in tests

tests/end2end/test_end2end_cnv_w1a1.py

@@ -287,8 +287,9 @@ def test_end2end_cnv_w1a1_deploy_on_pynq():
             pytest.skip("PYNQ board IP address not specified")
         username = os.getenv("PYNQ_USERNAME", "xilinx")
         password = os.getenv("PYNQ_PASSWORD", "xilinx")
+        port = os.getenv("PYNQ_PORT", 22)
         target_dir = os.getenv("PYNQ_TARGET_DIR", "/home/xilinx/finn")
-        model = model.transform(DeployToPYNQ(ip, username, password, target_dir))
+        model = model.transform(DeployToPYNQ(ip, port, username, password, target_dir))
         # save the model to be able to link it to the parent
         model.save(build_dir + "/end2end_cnv_w1a1_pynq_deploy.onnx")
     except KeyError:

tests/end2end/test_end2end_tfc_w1a1_throughput_test.py

@@ -279,7 +279,7 @@ def test_end2end_tfc_w1a1_deploy_on_pynq():
         if ip == "":
             pytest.skip("PYNQ board IP address not specified")
         username = os.getenv("PYNQ_USERNAME", "xilinx")
-        password = os.getenv("PYNQ_PASSWORD", "x1l1nx_f1nn")
+        password = os.getenv("PYNQ_PASSWORD", "xilinx")
         port = os.getenv("PYNQ_PORT", 22)
         target_dir = os.getenv("PYNQ_TARGET_DIR", "/home/xilinx/finn")
         model = model.transform(DeployToPYNQ(ip, port, username, password, target_dir))

tests/end2end/test_end2end_tfc_w1a2.py

@@ -255,8 +255,9 @@ def test_end2end_tfc_w1a2_deploy_on_pynq():
             pytest.skip("PYNQ board IP address not specified")
         username = os.getenv("PYNQ_USERNAME", "xilinx")
         password = os.getenv("PYNQ_PASSWORD", "xilinx")
+        port = os.getenv("PYNQ_PORT", 22)
         target_dir = os.getenv("PYNQ_TARGET_DIR", "/home/xilinx/finn")
-        model = model.transform(DeployToPYNQ(ip, username, password, target_dir))
+        model = model.transform(DeployToPYNQ(ip, port, username, password, target_dir))
         # save the model to be able to link it to the parent
         model.save(build_dir + "/end2end_tfc_w1a2_pynq_deploy.onnx")
     except KeyError:

tests/end2end/test_end2end_tfc_w2a2.py

@@ -255,8 +255,9 @@ def test_end2end_tfc_w2a2_deploy_on_pynq():
             pytest.skip("PYNQ board IP address not specified")
         username = os.getenv("PYNQ_USERNAME", "xilinx")
         password = os.getenv("PYNQ_PASSWORD", "xilinx")
+        port = os.getenv("PYNQ_PORT", 22)
         target_dir = os.getenv("PYNQ_TARGET_DIR", "/home/xilinx/finn")
-        model = model.transform(DeployToPYNQ(ip, username, password, target_dir))
+        model = model.transform(DeployToPYNQ(ip, port, username, password, target_dir))
         # save the model to be able to link it to the parent
         model.save(build_dir + "/end2end_tfc_w2a2_pynq_deploy.onnx")
     except KeyError:

tests/fpgadataflow/test_fpgadataflow_fifo.py

@@ -95,8 +95,9 @@ def test_fpgadataflow_fifo_rtlsim(Shape, folded_shape, depth, finn_dtype):
     ip = os.environ["PYNQ_IP"]
     username = os.getenv("PYNQ_USERNAME", "xilinx")
     password = os.getenv("PYNQ_PASSWORD", "xilinx")
+    port = os.getenv("PYNQ_PORT", 22)
     target_dir = os.getenv("PYNQ_TARGET_DIR", "/home/xilinx/finn")
-    model = model.transform(DeployToPYNQ(ip, username, password, target_dir))
+    model = model.transform(DeployToPYNQ(ip, port, username, password, target_dir))
 
     # y = oxe.execute_onnx(model, input_dict)["outp"]
 

tests/fpgadataflow/test_fpgadataflow_ip_stitch.py

@@ -295,8 +295,9 @@ def test_fpgadataflow_ipstitch_pynq_deployment_folder():
         )
         username = os.getenv("PYNQ_USERNAME", "xilinx")
         password = os.getenv("PYNQ_PASSWORD", "xilinx")
+        port = os.getenv("PYNQ_PORT", 22)
         target_dir = os.getenv("PYNQ_TARGET_DIR", "/home/xilinx/finn")
-        model = model.transform(DeployToPYNQ(ip, username, password, target_dir))
+        model = model.transform(DeployToPYNQ(ip, port, username, password, target_dir))
         pynq_ip = model.get_metadata_prop("pynq_ip")
         pynq_username = model.get_metadata_prop("pynq_username")
         pynq_password = model.get_metadata_prop("pynq_password")