Correct versal driver. Rolloback to xrt v2021.1 for regression testing

Accelize · Mar 14, 2022 · 6edfc97 · 6edfc97
1 parent cfcbe4c
commit 6edfc97
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/deployment/playbook.yml b/deployment/playbook.yml
@@ -13,10 +13,10 @@
       vars:
         aws_fpga_install: true
         aws_fpga_src_install: /opt/aws_fpga
-        xilinx_xrt_version: 2021.2
+        xilinx_xrt_version: 2021.1
         xilinx_xrt_env: aws
         xilinx_xrt_install: true
-        xilinx_xrt_ensure_compatible_kernel: true
+        xilinx_xrt_ensure_compatible_kernel: false
 
     # Install Accelize DRM source & test requirements
     - name: accelize.accelize_drm

diff --git a/deployment/playbook_test_pkg.yml b/deployment/playbook_test_pkg.yml
@@ -13,7 +13,7 @@
       vars:
         aws_fpga_install: true
         aws_fpga_src_install: /opt/aws_fpga
-        xilinx_xrt_version: 2021.2
+        xilinx_xrt_version: 2021.1
         xilinx_xrt_env: aws
         xilinx_xrt_install: false
         xilinx_xrt_ensure_compatible_kernel: false

diff --git a/deployment/runTestFromPkgOnEc2.yml b/deployment/runTestFromPkgOnEc2.yml
@@ -105,7 +105,7 @@ jobs:
         condition: ${{ contains(config.os_distrib, 'ubuntu') }}
 
       - script: sudo -E tox ${{ config.tox_operation }}
-                -- --cred=$(Build.SourcesDirectory)/cred.json --server=prod --artifacts_dir=$(Build.SourcesDirectory)/artifacts -rxs ${{ config.tox_extra_option }}
+                -- --cred=$(Build.SourcesDirectory)/cred.json --server=prod --artifacts_dir=$(Build.SourcesDirectory)/artifacts -ra ${{ config.tox_extra_option }}
         displayName: Run tests from package with Tox on ${{ config.os_distrib }}
         env:
           TOX_PARALLEL_NO_SPINNER: 1

diff --git a/deployment/runTestOnEc2.yml b/deployment/runTestOnEc2.yml
@@ -84,7 +84,7 @@ jobs:
         displayName: Create Accelize credentials file
 
       - script: sudo -E tox ${{ config.tox_operation }}
-                -- --cred=$(Build.SourcesDirectory)/cred.json --server=$(meteringServer) --artifacts_dir=$(Build.SourcesDirectory)/artifacts -rxs ${{ config.tox_extra_option }}
+                -- --cred=$(Build.SourcesDirectory)/cred.json --server=$(meteringServer) --artifacts_dir=$(Build.SourcesDirectory)/artifacts -ra ${{ config.tox_extra_option }}
         displayName: Run tests with Tox
         env:
           CODECOV_TOKEN: $(codecovToken)

diff --git a/tests/fpga_drivers/_xrt.py b/tests/fpga_drivers/_xrt.py
@@ -144,9 +144,8 @@ def _init_fpga(self):
         """
         Initialize FPGA handle with XRT and OpenCL libraries.
         """
-        image_name = splitext(self._fpga_image)[0]
         dev =cl.get_platforms()[0].get_devices()
-        binary = open(_join('/lib','firmware','xilinx',image_name,image_name+'.xclbin'), 'rb').read()
+        binary = open(self._fpga_image, 'rb').read()
         ctx = cl.Context(dev_type=cl.device_type.ALL)
         prg = cl.Program(ctx,dev,[binary])
         prg.build()

diff --git a/tests/refdesigns/versal/vck5000_setup_instructions.txt b/tests/refdesigns/versal/vck5000_setup_instructions.txt
@@ -4,10 +4,10 @@ sudo su
 # Update and install dependencies
 apt update
 apt install -y git make g++ libcurl4-openssl-dev libjsoncpp-dev cmake pkg-config python3-dev python3-pip python3-wheel python3-setuptools cython3 tox
-pip3 install pyopencl python-dateutil python-flask
+pip3 install pyopencl python-dateutil pytest-flask
 
 # Compile DRM library
-git clone --recursive https://github.com/Accelize/drm.git -b dev
+git clone --recursive https://github.com/Accelize/drm.git -b dev; cd drm
 
 source /opt/xilinx/xrt/setup.sh
 

diff --git a/tox.ini b/tox.ini
@@ -69,6 +69,7 @@ deps =
     flake8
     flask
     pytest
+    pytest-flask
     requests
     setuptools
     wheel