Skip to content

Commit

Permalink
COMP: Bump CI images to latest versions
Browse files Browse the repository at this point in the history 
- windows-2022
- ubuntu-22.04
- macos-12

And other Action dependencies.
  • Loading branch information
@thewtex
thewtex committed Dec 5, 2022
1 parent a428ef2 commit c0c0fc3
Show file tree
Hide file tree
Showing 4 changed files with 1,529 additions and 1,061 deletions.
66 changes: 33 additions & 33 deletions .github/workflows/build-test-publish.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
strategy:
max-parallel: 3
matrix:
os: [ubuntu-20.04, windows-2019, macos-11]
os: [ubuntu-22.04, windows-2022, macos-12]
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
c-compiler: "gcc"
cxx-compiler: "g++"
cmake-build-type: "MinSizeRel"
- os: windows-2019
- os: windows-2022
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
cmake-build-type: "Release"
- os: macos-11
- os: macos-12
c-compiler: "clang"
cxx-compiler: "clang++"
cmake-build-type: "MinSizeRel"
Expand All @@ -31,10 +31,10 @@ jobs:
with:
path: Ex

- name: Set up Python 3.7
- name: Set up Python 3.9
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: 3.9

- name: Install build dependencies
run: |
Expand All @@ -52,20 +52,20 @@ jobs:
git checkout ${{ env.itk-git-tag }}
- name: Build ITK
if: matrix.os != 'windows-2019'
if: matrix.os != 'windows-2022'
run: |
cd ..
mkdir ITK-build
cd ITK-build
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK
ninja
- name: Build ITK
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-2022'
run: |
cd ..
mkdir ITK-build
cd ITK-build
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -GNinja ../ITK
ninja
shell: cmd
Expand Down Expand Up @@ -115,13 +115,13 @@ jobs:
EOF
cat dashboard.cmake
- name: Build and test
if: matrix.os != 'windows-2019'
if: matrix.os != 'windows-2022'
run: |
ctest -j 2 -VV -S dashboard.cmake
- name: Build and test
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-2022'
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
ctest -j 2 -VV -S dashboard.cmake
shell: cmd

Expand All @@ -130,17 +130,17 @@ jobs:
strategy:
max-parallel: 3
matrix:
os: [ubuntu-20.04, windows-2019, macos-11]
os: [ubuntu-22.04, windows-2022, macos-12]
include:
- os: ubuntu-20.04
c-compiler: "gcc"
cxx-compiler: "g++"
cmake-build-type: "MinSizeRel"
- os: windows-2019
- os: windows-2022
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
cmake-build-type: "Release"
- os: macos-11
- os: macos-12
c-compiler: "clang"
cxx-compiler: "clang++"
cmake-build-type: "MinSizeRel"
Expand All @@ -150,10 +150,10 @@ jobs:
with:
path: Ex

- name: Set up Python 3.7
uses: actions/setup-python@v1
- name: Set up Python 3.9
uses: actions/setup-python@v3
with:
python-version: 3.7
python-version: 3.9

- name: Install build dependencies
run: |
Expand Down Expand Up @@ -213,14 +213,14 @@ jobs:
cat dashboard.cmake
- name: Build and test
if: matrix.os != 'windows-2019'
if: matrix.os != 'windows-2022'
run: |
ctest -j 2 -VV -S dashboard.cmake
- name: Build and test
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-2022'
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
ctest -j 2 -VV -S dashboard.cmake
shell: cmd

Expand All @@ -229,20 +229,20 @@ jobs:
strategy:
max-parallel: 3
matrix:
os: [ubuntu-20.04, windows-2019, macos-11]
os: [ubuntu-22.04, windows-2022, macos-12]

steps:
- uses: actions/checkout@v1
- name: Set up Python 3.7
uses: actions/setup-python@v1
- uses: actions/checkout@v3
- name: Set up Python 3.9
uses: actions/setup-python@v3
with:
python-version: 3.7
python-version: 3.9

- name: Install build dependencies
run: |
python -m pip install --upgrade pip
python -m pip install ninja
python -m pip install itk>=5.2.0.post2
python -m pip install itk>=5.3.0
python -m pip install matplotlib
python -m pip install itkwidgets
Expand All @@ -254,23 +254,23 @@ jobs:
strategy:
max-parallel: 3
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04]
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
c-compiler: "gcc"
cxx-compiler: "g++"
cmake-build-type: "Release"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
path: Ex
submodules: recursive

- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3.9
uses: actions/setup-python@v3
with:
python-version: 3.8
python-version: 3.9

- name: Get specific version of CMake, Ninja
uses: lukka/[email protected]
Expand Down
1,908 changes: 1,046 additions & 862 deletions src/Core/Transform/MutualInformationAffine/MutualInformationAffine.ipynb
View file

Large diffs are not rendered by default.

202 changes: 152 additions & 50 deletions src/Numerics/Optimizers/ExhaustiveOptimizer/PlotExhaustiveOptimizer.ipynb
View file

Large diffs are not rendered by default.

414 changes: 298 additions & 116 deletions src/Registration/Common/MutualInformation/MutualInformation.ipynb
View file

Large diffs are not rendered by default.

0 comments on commit c0c0fc3

Please sign in to comment.