Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: Bump ITK to v5.3rc04.post3 #43

Merged
merged 1 commit into from
Oct 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Build, test, package
on: [push,pull_request]

env:
itk-git-tag: "835dc01388d22c4b4c9a46b01dbdfe394ec23511"
itk-wheel-tag: "v5.3rc04.post2"
itk-git-tag: "171fb2ba33a87041f99328a2f26612ff33aa9cc8"
itk-wheel-tag: "v5.3rc04.post3"
opencl-icd-loader-git-tag: "v2021.04.29"
opencl-headers-git-tag: "v2021.04.29"

Expand All @@ -14,9 +14,9 @@ jobs:
strategy:
max-parallel: 3
matrix:
os: [ubuntu-18.04, windows-2019, macos-11]
os: [ubuntu-20.04, windows-2019, macos-11]
include:
- os: ubuntu-18.04
- os: ubuntu-20.04
c-compiler: "gcc"
cxx-compiler: "g++"
cmake-build-type: "MinSizeRel"
Expand Down Expand Up @@ -279,7 +279,7 @@ jobs:
path: ../../im/dist

build-linux-opencl-python-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
max-parallel: 2
matrix:
Expand All @@ -300,6 +300,7 @@ jobs:
- name: 'Build 🐍 Python 📦 package'
run: |
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
export TARBALL_SPECIALIZATION="-manylinux_2_28"
./wrapping/dockcross-manylinux-download-cache.sh
./wrapping/dockcross-manylinux-build-module-wheels-opencl.sh cp${{ matrix.python-version }}

Expand All @@ -319,7 +320,7 @@ jobs:

- name: 'Specific XCode version'
run: |
sudo xcode-select -s "/Applications/Xcode_11.7.app"
sudo xcode-select -s "/Applications/Xcode_13.2.1.app"

- name: Get specific version of CMake, Ninja
uses: lukka/[email protected]
Expand All @@ -346,7 +347,7 @@ jobs:
- build-linux-opencl-python-packages
- build-macos-opencl-python-packages
- build-windows-python-packages
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- name: Download Python Packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test GPU
on: [pull_request]

env:
itk-git-tag: "835dc01388d22c4b4c9a46b01dbdfe394ec23511"
itk-git-tag: "171fb2ba33a87041f99328a2f26612ff33aa9cc8"
opencl-icd-loader-git-tag: "v2021.04.29"
opencl-headers-git-tag: "v2021.04.29"

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setup(
name='itk-clesperanto',
version='0.2.1',
version='0.2.2',
author='NumFOCUS',
author_email='[email protected]',
packages=['itk'],
Expand Down Expand Up @@ -44,6 +44,6 @@
keywords='ITK InsightToolkit',
url=r'https://itk.org/',
install_requires=[
r'itk>=5.3rc04.post2'
r'itk>=5.3rc04.post3'
]
)
8 changes: 5 additions & 3 deletions wrapping/dockcross-manylinux-download-cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ curl https://data.kitware.com/api/v1/file/592dd8068d777f16d01e1a92/download -o z
gunzip -d zstd-1.2.0-linux.tar.gz
tar xf zstd-1.2.0-linux.tar

curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.3rc04.post2}/ITKPythonBuilds-linux.tar.zst -O
./zstd-1.2.0-linux/bin/unzstd ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar
TARBALL_NAME="ITKPythonBuilds-linux${TARBALL_SPECIALIZATION}.tar"
curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.3rc04.post3}/${TARBALL_NAME}.zst -O
./zstd-1.2.0-linux/bin/unzstd ${TARBALL_NAME}.zst -o ${TARBALL_NAME}
echo "Extracting all files"
tar xf ITKPythonBuilds-linux.tar
tar xf ${TARBALL_NAME}
rm ${TARBALL_NAME}

mkdir tools
curl https://data.kitware.com/api/v1/file/5c0aa4b18d777f2179dd0a71/download -o doxygen-1.8.11.linux.bin.tar.gz
Expand Down