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.

Sign up for GitHub

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

Jump to bottom

ENH: Bump CI to ITK 5.2 RC 2 #101

Closed
wants to merge 2 commits into from
Closed

ENH: Bump CI to ITK 5.2 RC 2 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1233fa0
ENH: Bump CI to ITK 5.2 RC 2
thewtex Feb 12, 2021
a609e02
COMP: Update Linux OpenCL wheel builds for manylinux2014
thewtex Feb 12, 2021
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
18 changes: 9 additions & 9 deletions .github/workflows/build-test-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:
- os: ubuntu-18.04
c-compiler: "gcc"
cxx-compiler: "g++"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
itk-git-tag: "v5.2rc02"
cmake-build-type: "MinSizeRel"
- os: windows-2019
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
itk-git-tag: "v5.2rc02"
cmake-build-type: "Release"
- os: macos-10.15
c-compiler: "clang"
cxx-compiler: "clang++"
itk-git-tag: "abd38d5a0040b9a8fbb0ad3127089dbb72a93342"
itk-git-tag: "v5.2rc02"
cmake-build-type: "MinSizeRel"

steps:
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
matrix:
python-version: [36, 37, 38, 39]
include:
- itk-python-git-tag: "v5.2rc01"
- itk-python-git-tag: "v5.2rc02"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.2rc01"
- itk-python-git-tag: "v5.2rc02"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
matrix:
python-version-minor: [6, 7, 8, 9]
include:
- itk-python-git-tag: "v5.2rc01"
- itk-python-git-tag: "v5.2rc02"

steps:
- name: Get specific version of CMake, Ninja
Expand Down Expand Up @@ -258,9 +258,9 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: [36, 37, 38]
python-version: [36, 37, 38, 39]
include:
- itk-python-git-tag: "v5.1.2"
- itk-python-git-tag: "v5.2rc2"

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
max-parallel: 2
matrix:
include:
- itk-python-git-tag: "v5.1.2"
- itk-python-git-tag: "v5.2rc2"

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@
keywords='ITK InsightToolkit',
url=r'https://itk.org/',
install_requires=[
r'itk>=5.2rc1'
r'itk>=5.2rc2'
]
)
6 changes: 3 additions & 3 deletions wrapping/dockcross-manylinux-build-module-wheels-opencl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
# Versions can be restricted by passing them in as arguments to the script
# For example,
#
# scripts/dockcross-manylinux-build-module-wheels.sh cp27mu cp35
# scripts/dockcross-manylinux-build-module-wheels.sh cp39

# Generate dockcross scripts
docker run --rm dockcross/manylinux1-x64:20200416-a6b6635 > /tmp/dockcross-manylinux-x64
docker run --rm dockcross/manylinux2014-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
chmod u+x /tmp/dockcross-manylinux-x64

script_dir=$(cd $(dirname $0) || exit 1; pwd)
Expand All @@ -35,7 +35,7 @@ fi

# Build wheels
mkdir -p dist
DOCKER_ARGS="-e ELASTIX_USE_OPENCL=1 -v $(pwd)/dist:/work/dist/ -v $(pwd)/ITKPythonPackage:/ITKPythonPackage -v $(pwd)/tools:/tools -v $(pwd)/OpenCL-ICD-Loader/inc/CL:/usr/include/CL -v $(pwd)/OpenCL-ICD-Loader-build/libOpenCL.so.1.2:/usr/lib64/libOpenCL.so.1 -v $(pwd)/OpenCL-ICD-Loader-build/libOpenCL.so.1.2:/usr/lib64/libOpenCL.so"
DOCKER_ARGS="-e ELASTIX_USE_OPENCL=1 -v $(pwd)/dist:/work/dist/ -v $script_dir/..:/ITKPythonPackage -v $(pwd)/tools:/tools -v $(pwd)/OpenCL-ICD-Loader/inc/CL:/usr/include/CL -v $(pwd)/OpenCL-ICD-Loader-build/libOpenCL.so.1.2:/usr/lib64/libOpenCL.so.1 -v $(pwd)/OpenCL-ICD-Loader-build/libOpenCL.so.1.2:/usr/lib64/libOpenCL.so"
/tmp/dockcross-manylinux-x64 \
-a "$DOCKER_ARGS" \
"/ITKPythonPackage/scripts/internal/manylinux-build-module-wheels.sh" "$@"