Merge branch 'master' of github.com:smistad/FAST

Author: smistad

.github/workflows/CI-ubuntu.yml

@@ -52,7 +52,7 @@ jobs:
           sudo apt install -y pkgconf libusb-1.0-0-dev # Needed for realsense
           sudo apt install -y python3 libpython3-dev python3-pip python3-setuptools
           sudo pip3 install --upgrade pip
-          pip3 install pylddwrap==1.2.0 twine wheel==0.37.1
+          pip3 install pylddwrap==1.2.0 wheel==0.37.1
 
           echo "===========> Install CUDA and TensorRT"
           
@@ -62,7 +62,7 @@ jobs:
           sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
           sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /"
           sudo apt-get update
-          sudo apt-get install -y cuda-toolkit-11-0 libcudnn8 libnvinfer-dev libnvonnxparsers-dev libnvparsers-dev
+          sudo apt-get install -y cuda-toolkit-11-0 libnvinfer-dev libnvonnxparsers-dev libnvparsers-dev
 
           echo "===========> Set work dir"
           
@@ -187,6 +187,7 @@ jobs:
     - name: Upload Python wheel to PyPi
       if: ${{ github.event_name == 'release' && !contains(github.ref, 'rc') }}
       run: |
+        pip3 install twine
         twine upload --username __token__ --password ${{ secrets.PYPI_API_TOKEN }} ${{github.workspace}}/build/pyFAST-*.whl
 
   test-python-wheel:

.github/workflows/CI-windows.yml

@@ -21,12 +21,7 @@ env:
 
 jobs:
   build:
-    # The CMake configure and build commands are platform agnostic and should work equally
-    # well on Windows or Mac.  You can convert this to a matrix build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: windows-2019
-
+    runs-on: windows-2022
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
@@ -231,7 +226,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.6', '3.10', '3.12']
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Download wheel artifact
         uses: actions/download-artifact@v4
@@ -262,7 +257,7 @@ jobs:
   test-python:
     name: Run Python Tests
     needs: [build]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -317,7 +312,7 @@ jobs:
 #  test-cpp:
 #    name: Run C++ Tests
 #    needs: [build]
-#    runs-on: windows-2019
+#    runs-on: windows-2022
 #    steps:
 #      - name: Download artifacts
 #        uses: actions/download-artifact@v4