Skip to content

Commit

Permalink
ENH: Upgrade CUDA packaging CI to ITK v5.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Rit committed May 22, 2024
1 parent 034a3d1 commit eb8a8c2
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-test-cxx-cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: 'Build, Test RTK with CUDA'
on: [push,pull_request]

env:
itk-git-tag: "v5.4rc01"
itk-module-deps: "CudaCommon@09a964504bf9be9403189502cb7e790085a62708"
itk-git-tag: "v5.4.0"
itk-module-deps: "CudaCommon@c7c766a6b944124da21131c6eb689ee75e61bd6e"

jobs:
build-test-cxx:
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/build-test-package-python-cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ name: 'Package RTK with CUDA'
on: [push,pull_request]

env:
itk-wheel-tag: 'v5.4rc02'
itk-python-package-tag: '8b047b05ee19c01a1744af2b3ee36f7c893ee01e'
itk-wheel-tag: 'v5.4.0'
itk-python-package-tag: 'v5.4.0'
itk-python-package-org: 'InsightSoftwareConsortium'
itk-module-deps: "RTKConsortium/ITKCudaCommon@09a964504bf9be9403189502cb7e790085a62708"
itk-module-deps: "RTKConsortium/ITKCudaCommon@c7c766a6b944124da21131c6eb689ee75e61bd6e"

jobs:
build-linux-cuda-python-packages:
runs-on: self-hosted-linux
strategy:
max-parallel: 2
matrix:
python3-minor-version: ["8", "9", "10", "11"]
python3-minor-version: ["8","9","10","11"]
manylinux-platform: ["_2_28-x64","2014-x64"]
cuda-version: ["116","121"]

Expand Down Expand Up @@ -42,7 +42,6 @@ jobs:
CMAKE_OPTIONS="-DCUDACOMMON_CUDA_VERSION=${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCUDAToolkit_ROOT=/usr/lib64/cuda${CUDA_VERSION}"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CUDA_COMPILER=/usr/lib64/cuda${CUDA_VERSION}/bin/nvcc"
CMAKE_OPTIONS=(--cmake_options "${CMAKE_OPTIONS}")
# The first two are not library paths but are included to be mounted in the
# docker by dockcross-manylinux-build-module-wheels.sh
Expand All @@ -54,9 +53,11 @@ jobs:
fi
MANYLINUX_PLATFORM=${{ matrix.manylinux-platform }}
if [[ ${MANYLINUX_PLATFORM} == "_2_28-x64" ]]; then
if test ${MANYLINUX_PLATFORM} == "_2_28-x64" && test ${CUDA_VERSION} -lt 120; then
export IMAGE_TAG=20230106-1aeaea0
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DITK_USE_PYTHON_LIMITED_API=FALSE"
fi
CMAKE_OPTIONS=(--cmake_options "${CMAKE_OPTIONS}")
echo "Manylinux platform ${MANYLINUX_PLATFORM}"
rm -rf ITKPythonPackage
export MANYLINUX_VERSION=`(echo ${MANYLINUX_PLATFORM} | cut -d '-' -f 1)`
Expand Down Expand Up @@ -103,7 +104,7 @@ jobs:
cuda-version: ["116","121"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: "im"

Expand Down Expand Up @@ -168,7 +169,7 @@ jobs:
python -m twine check ${WHEEL_PATTERN}
- name: Publish Python package as GitHub Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: WindowsWheel3${{ matrix.python3-minor-version }}-cuda${{ matrix.cuda-version }}
path: dist/*.whl
Expand All @@ -181,7 +182,7 @@ jobs:

steps:
- name: Download Python Packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4

- name: Prepare packages for upload
run: |
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ on: [push,pull_request]

jobs:
cxx-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@2e36f0f73527ac1ac6cebe57248bae9ac2702be0
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@f675eac324601214287717c06dd8f77224689c76

python-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@2e36f0f73527ac1ac6cebe57248bae9ac2702be0
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@f675eac324601214287717c06dd8f77224689c76
with:
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"]'
itk-wheel-tag: 'v5.4.0'
itk-python-package-tag: 'v5.4.0'
itk-module-deps: "RTKConsortium/ITKCudaCommon@c7c766a6b944124da21131c6eb689ee75e61bd6e"
secrets:
pypi_password: ${{ secrets.pypi_password }}
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# Configure wheel name if CUDA is used
wheel_name='itk-rtk'
wheel_requirements=[r'itk>=5.4rc1']
wheel_requirements=[r'itk==5.4.0']

# Extract cuda version from the RTK_CUDA_VERSION cmake option
for arg in sys.argv:
Expand Down

0 comments on commit eb8a8c2

Please sign in to comment.