From 52c5d9ff61ec7e705edb98aa963162528a7ab245 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Wed, 21 Feb 2024 16:24:25 +0100 Subject: [PATCH] COMP: Upgrade GitHub actions for building wheels against ITK v5.4rc02 --- .github/workflows/build-test-cxx-cuda.yml | 2 +- .../build-test-package-python-cuda.yml | 26 ++++++++++++------- .github/workflows/build-test-package.yml | 9 ++++--- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-test-cxx-cuda.yml b/.github/workflows/build-test-cxx-cuda.yml index 6ec632aa0..dc314a68c 100644 --- a/.github/workflows/build-test-cxx-cuda.yml +++ b/.github/workflows/build-test-cxx-cuda.yml @@ -4,7 +4,7 @@ on: [push,pull_request] env: itk-git-tag: "v5.4rc01" - itk-module-deps: "CudaCommon@v1.0.1" + itk-module-deps: "CudaCommon@09a964504bf9be9403189502cb7e790085a62708" jobs: build-test-cxx: diff --git a/.github/workflows/build-test-package-python-cuda.yml b/.github/workflows/build-test-package-python-cuda.yml index 9e86bfc6b..be400f683 100644 --- a/.github/workflows/build-test-package-python-cuda.yml +++ b/.github/workflows/build-test-package-python-cuda.yml @@ -4,10 +4,10 @@ on: [push,pull_request] env: cmake-options: '-DRTK_BUILD_APPLICATIONS:BOOL=OFF -DRTK_CUDA_VERSION=11.6' - itk-wheel-tag: 'v5.4rc01' - itk-python-package-tag: '5ad02309321621cdc7269b9b68a35013c912271c' + itk-wheel-tag: 'v5.4rc02' + itk-python-package-tag: '8b047b05ee19c01a1744af2b3ee36f7c893ee01e' itk-python-package-org: 'InsightSoftwareConsortium' - itk-module-deps: "RTKConsortium/ITKCudaCommon@b4f15f28fe7547f43de543b229d1a962df828e7f" + itk-module-deps: "RTKConsortium/ITKCudaCommon@09a964504bf9be9403189502cb7e790085a62708" jobs: build-linux-cuda-python-packages: @@ -15,7 +15,7 @@ jobs: strategy: max-parallel: 2 matrix: - python3-minor-versions: ["7", "8", "9", "10", "11"] + python3-minor-version: ["8", "9", "10", "11"] manylinux-platform: ["_2_28-x64","2014-x64"] steps: @@ -32,17 +32,25 @@ jobs: shell: bash run: | rm -rf dist - export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }} export ITKPYTHONPACKAGE_TAG=${{ env.itk-python-package-tag }} export ITKPYTHONPACKAGE_ORG=${{ env.itk-python-package-org }} export ITK_MODULE_PREQ=${{ env.itk-module-deps }} CMAKE_OPTIONS=(--cmake_options "${{ env.cmake-options }} -DCUDAToolkit_ROOT=/usr/lib64/cuda116 -DCMAKE_CUDA_COMPILER=/usr/lib64/cuda116/bin/nvcc") - export LD_LIBRARY_PATH="/home/srit/Downloads/cuda116:/home/srit/Downloads/cuda116/targets/x86_64-linux/lib:/home/srit/Downloads/cuda116/lib64/stubs" + + # The first two are not library paths but are included to be mounted in the + # docker by dockcross-manylinux-build-module-wheels.sh + export LD_LIBRARY_PATH="/home/srit/Downloads/cuda116" + export LD_LIBRARY_PATH="/usr/lib64/libcuda.so.1:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="/home/srit/Downloads/cuda116/targets/x86_64-linux/lib::$LD_LIBRARY_PATH" if test -e ../../ITKPythonBuilds-linux-manylinux2014.tar.zst ; then mv ../../*zst . fi + MANYLINUX_PLATFORM=${{ matrix.manylinux-platform }} + if [[ ${MANYLINUX_PLATFORM} == "_2_28-x64" ]]; then + export IMAGE_TAG=20230106-1aeaea0 + fi echo "Manylinux platform ${MANYLINUX_PLATFORM}" rm -rf ITKPythonPackage export MANYLINUX_VERSION=`(echo ${MANYLINUX_PLATFORM} | cut -d '-' -f 1)` @@ -50,7 +58,7 @@ jobs: export ITK_MODULE_NO_CLEANUP=TRUE echo "Building for manylinux specialization ${MANYLINUX_VERSION} and target architecture ${TARGET_ARCH}" - ./dockcross-manylinux-download-cache-and-build-module-wheels.sh "${CMAKE_OPTIONS[@]}" -x "libcuda.so;libcuda.so.1;libcudart.so;libcudart.so.11.0;libcublas.so;libcublas.so.11;libcublasLt.so;libcublasLt.so.11;libcufft.so;libcufft.so.10" cp3${{ matrix.python3-minor-versions }} + ./dockcross-manylinux-download-cache-and-build-module-wheels.sh "${CMAKE_OPTIONS[@]}" -x "libcuda.so.1;libcudart.so.11.0;libcublas.so.11;libcublasLt.so.11;libcufft.so.10" cp3${{ matrix.python3-minor-version }} mv *zst ../.. - name: Validate build output @@ -73,7 +81,7 @@ jobs: - name: Publish Python package as GitHub Artifact uses: actions/upload-artifact@v3 with: - name: LinuxWheel3${{ matrix.python3-minor-versions }}-cuda116 + name: LinuxWheel3${{ matrix.python3-minor-version }}-cuda116 path: dist/*.whl build-windows-cuda-python-packages: @@ -81,7 +89,7 @@ jobs: strategy: max-parallel: 2 matrix: - python3-minor-version: ["7", "8", "9", "10", "11"] + python3-minor-version: ["8", "9", "10", "11"] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 944331b25..333fedf71 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -4,12 +4,15 @@ on: [push,pull_request] jobs: cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@2e36f0f73527ac1ac6cebe57248bae9ac2702be0 python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@2e36f0f73527ac1ac6cebe57248bae9ac2702be0 with: - manylinux-platforms: '["_2_28-x64","2014-x64"]' cmake-options: '-DRTK_BUILD_APPLICATIONS:BOOL=OFF' + itk-wheel-tag: 'v5.4rc02' + itk-python-package-tag: '8b047b05ee19c01a1744af2b3ee36f7c893ee01e' + itk-module-deps: "RTKConsortium/ITKCudaCommon@09a964504bf9be9403189502cb7e790085a62708" + manylinux-platforms: '["_2_28-x64","2014-x64"]' secrets: pypi_password: ${{ secrets.pypi_password }}