Merge branch 'main' into stree-to-sdfg

.github/workflows/fpga-ci.yml

@@ -2,38 +2,63 @@ name: FPGA Tests
 
 on:
   push:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
   pull_request:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
   merge_group:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
+
+env:
+  CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 jobs:
   test-fpga:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-ci') }}
     runs-on: [self-hosted, linux, intel-fpga, xilinx-fpga]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Install dependencies
       run: |
         rm -f ~/.dace.conf
         rm -rf .dacecache tests/.dacecache
-        . /opt/setupenv
+        python -m venv ~/.venv      # create venv so we can use pip
+        source ~/.venv/bin/activate # activate venv
         python -m pip install --upgrade pip
-        pip install pytest-xdist flake8 coverage
+        pip install pytest-xdist flake8 coverage click
         pip uninstall -y dace
         pip install -e ".[testing]"
         curl -Os https://uploader.codecov.io/latest/linux/codecov
         chmod +x codecov
 
     - name: Run FPGA Tests
       run: |
+        source ~/.venv/bin/activate # activate venv
         export COVERAGE_RCFILE=`pwd`/.coveragerc
+
+        # Xilinx setup
+        export PATH=/opt/Xilinx/Vitis/2022.1/bin:/opt/Xilinx/Vitis_HLS/2022.1/bin:/opt/Xilinx/Vivado/2022.1/bin:$PATH
+        export XILINX_XRT=/opt/xilinx/xrt
+        export LD_LIBRARY_PATH=$XILINX_XRT/lib:$LD_LIBRARY_PATH
+        export XILINX_VITIS=/opt/Xilinx/Vitis/2022.1
+        export DACE_compiler_xilinx_platform=xilinx_u250_gen3x16_xdma_4_1_202210_1
+
+        # Intel FPGA setup
+        export INTELFPGAOCLSDKROOT=/opt/intelFPGA_pro/19.1/hld
+        export ALTERAOCLSDKROOT=$INTELFPGAOCLSDKROOT
+        export AOCL_BOARD_PACKAGE_ROOT=/opt/intelFPGA_pro/19.1/hld/board/a10_ref
+        export PATH=$INTELFPGAOCLSDKROOT/bin:$PATH
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AOCL_BOARD_PACKAGE_ROOT/linux64/lib
+        export QUARTUS_ROOTDIR_OVERRIDE=/opt/intelFPGA_pro/19.1/quartus
+        export LD_PRELOAD=/lib/x86_64-linux-gnu/libstdc++.so.6   # Work around dependency issues
+
         # Due to an internal bug in the Xilinx tools, where the current datetime is passed as an integer
         # and overflowed in the year 2022, run the FPGA tests pretending like it's January 1st 2021.
-        faketime -f "@2021-01-01 00:00:00" pytest -n auto --cov-report=xml --cov=dace --tb=short -m "fpga"
+        # faketime -f "@2021-01-01 00:00:00" pytest -n auto --cov-report=xml --cov=dace --tb=short -m "fpga"
+        # Try running without faketime
+        pytest -n auto --cov-report=xml --cov=dace --tb=short -m "fpga"
+
         coverage report
         coverage xml
         reachable=0

.github/workflows/general-ci.yml

@@ -2,11 +2,11 @@ name: General Tests
 
 on:
   push:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
   pull_request:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
   merge_group:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
 
 jobs:
   test:
@@ -18,11 +18,11 @@ jobs:
         simplify: [0,1,autoopt]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -55,7 +55,7 @@ jobs:
         else
             export DACE_optimizer_automatic_simplification=${{ matrix.simplify }}
         fi
-        pytest -n auto --cov-report=xml --cov=dace --tb=short -m "not gpu and not verilator and not tensorflow and not mkl and not sve and not papi and not mlir and not lapack and not fpga and not mpi and not rtl_hardware and not scalapack and not datainstrument"
+        pytest -n auto --cov-report=xml --cov=dace --tb=short -m "not gpu and not verilator and not tensorflow and not mkl and not sve and not papi and not mlir and not lapack and not fpga and not mpi and not rtl_hardware and not scalapack and not datainstrument and not long"
         ./codecov
 
     - name: Test OpenBLAS LAPACK
@@ -85,4 +85,8 @@ jobs:
         ./tests/polybench_test.sh
         ./tests/xform_test.sh
         coverage combine .; coverage report; coverage xml
-        ./codecov
+
+    - uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        verbose: true

.github/workflows/gpu-ci.yml

@@ -2,56 +2,67 @@ name: GPU Tests
 
 on:
   push:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
   pull_request:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
   merge_group:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
+
+env:
+  CUDACXX: /usr/local/cuda/bin/nvcc
+  MKLROOT: /opt/intel/oneapi/mkl/latest/
+  CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
 
 jobs:
   test-gpu:
     if: "!contains(github.event.pull_request.labels.*.name, 'no-ci')"
-    runs-on: [self-hosted, linux, gpu]
+    runs-on: [self-hosted, gpu]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Install dependencies
       run: |
         rm -f ~/.dace.conf
         rm -rf .dacecache tests/.dacecache
-        . /opt/setupenv
+        python -m venv ~/.venv      # create venv so we can use pip
+        source ~/.venv/bin/activate # activate venv
         python -m pip install --upgrade pip
         pip install flake8 pytest-xdist coverage
         pip install mpi4py
+        pip install cupy
         pip uninstall -y dace
         pip install -e ".[testing]"
         curl -Os https://uploader.codecov.io/latest/linux/codecov
         chmod +x codecov
 
     - name: Test dependencies
       run: |
+        source ~/.venv/bin/activate # activate venv
         nvidia-smi
 
     - name: Run pytest GPU
       run: |
+        source ~/.venv/bin/activate # activate venv
         export DACE_cache=single
-        . /opt/setupenv
+        export PATH=$PATH:/usr/local/cuda/bin  # some test is calling cuobjdump, so it needs to be in path
+        echo "CUDACXX: $CUDACXX"
         pytest --cov-report=xml --cov=dace --tb=short -m "gpu"
 
     - name: Run extra GPU tests
       run: |
+        source ~/.venv/bin/activate # activate venv
         export NOSTATUSBAR=1
         export DACE_cache=single
         export COVERAGE_RCFILE=`pwd`/.coveragerc
         export PYTHON_BINARY="coverage run --source=dace --parallel-mode"
-        . /opt/setupenv
         ./tests/cuda_test.sh
 
     - name: Report overall coverage
       run: |
+        source ~/.venv/bin/activate # activate venv
         export COVERAGE_RCFILE=`pwd`/.coveragerc
-        . /opt/setupenv
         coverage combine . */; coverage report; coverage xml
         reachable=0
         ping -W 2 -c 1 codecov.io || reachable=$?

.github/workflows/hardware_test.yml

@@ -4,7 +4,7 @@ jobs:
   test-rtl:
     runs-on: [self-hosted, linux, xilinx-fpga]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Install dependencies

.github/workflows/heterogeneous-ci.yml

@@ -2,25 +2,32 @@ name: Heterogeneous Tests
 
 on:
   push:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
   pull_request:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
   merge_group:
-    branches: [ master, ci-fix ]
+    branches: [ main, ci-fix ]
+
+env:
+  CUDA_HOME: /usr/local/cuda
+  CUDACXX: nvcc
+  MKLROOT: /opt/intel/oneapi/mkl/latest/
+  CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 jobs:
   test-heterogeneous:
     if: "!contains(github.event.pull_request.labels.*.name, 'no-ci')"
     runs-on: [self-hosted, linux]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
     - name: Install dependencies
       run: |
         rm -f ~/.dace.conf
         rm -rf .dacecache tests/.dacecache
-        . /opt/setupenv
+        python -m venv ~/.venv      # create venv so we can use pip
+        source ~/.venv/bin/activate # activate venv
         python -m pip install --upgrade pip
         pip install flake8 pytest-xdist coverage
         pip install mpi4py pytest-mpi
@@ -35,8 +42,8 @@ jobs:
 
     - name: Run parallel pytest 
       run: |
+        source ~/.venv/bin/activate # activate venv
         export DACE_cache=unique
-        . /opt/setupenv
         pytest --cov-report=xml --cov=dace --tb=short -m "verilator or mkl or papi or datainstrument"
 
     - name: Run MPI tests
@@ -45,7 +52,7 @@ jobs:
         export DACE_cache=single
         export COVERAGE_RCFILE=`pwd`/.coveragerc
         export PYTHON_BINARY="coverage run --source=dace --parallel-mode"
-        . /opt/setupenv
+        source ~/.venv/bin/activate # activate venv
         ./tests/mpi_test.sh
 
         
@@ -55,6 +62,7 @@ jobs:
         export DACE_testing_serialization=1
         export DACE_testing_deserialize_exception=1
         export DACE_cache=unique
+        source ~/.venv/bin/activate # activate venv
         mpirun -n 2 coverage run --source=dace --parallel-mode -m pytest -x --with-mpi --tb=short -m "mpi"
     
     - name: Test ScaLAPACK PBLAS with pytest
@@ -64,6 +72,7 @@ jobs:
         export DACE_testing_deserialize_exception=1
         export DACE_cache=unique
         export DACE_library_pblas_default_implementation=ReferenceOpenMPI
+        source ~/.venv/bin/activate # activate venv
         for i in {1..4}
         do
           mpirun -n "$i" --oversubscribe coverage run --source=dace --parallel-mode -m pytest -x --with-mpi --tb=short -m "scalapack"
@@ -72,7 +81,7 @@ jobs:
     - name: Report overall coverage
       run: |
         export COVERAGE_RCFILE=`pwd`/.coveragerc
-        . /opt/setupenv
+        source ~/.venv/bin/activate # activate venv
         coverage combine . */; coverage report; coverage xml
         reachable=0
         ping -W 2 -c 1 codecov.io || reachable=$?