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: require Scanco module for ISQ file support #37

Merged
merged 2 commits into from Apr 5, 2021
Merged

ENH: require Scanco module for ISQ file support #37

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
0b876b3
ENH: require Scanco module for ISQ file support
dzenanz Apr 2, 2021
1d90a2d
ENH: update CI Python build script to follow Ultrasound module
dzenanz Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 8 additions & 15 deletions .github/workflows/build-test-package.yml
View file
Open in desktop
Expand Up @@ -60,12 +60,7 @@ jobs:
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
cd ..
mkdir ITKBoneEnhancement-build
cd ITKBoneEnhancement-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 -DITK_DIR=../ITK-build ../ITKBoneEnhancement
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 -DModule_BoneEnhancement:BOOL=ON -DModule_IOScanco:BOOL=ON -GNinja ../ITK
ninja

- name: Build ITK
Expand All @@ -75,12 +70,7 @@ jobs:
mkdir ITK-build
cd ITK-build
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
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
cd ..
mkdir ITKBoneEnhancement-build
cd ITKBoneEnhancement-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 -DITK_DIR=../ITK-build ../ITKBoneEnhancement
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 -DModule_BoneEnhancement:BOOL=ON -DModule_IOScanco:BOOL=ON -GNinja ../ITK
ninja
shell: cmd

Expand Down Expand Up @@ -214,8 +204,10 @@ jobs:
./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
popd
cp ITKBoneEnhancement/include/* include/
ln -s $(pwd)/ITKBoneEnhancement/ITKPythonPackage .
ln -s $(pwd)/ITKBoneEnhancement/tools .
rm ./ITKBoneEnhancement/doxygen-1.8.11.linux.bin.tar.gz
rm ./ITKBoneEnhancement/ITKPythonBuilds-linux.tar.zst
mv ./ITKBoneEnhancement/ITKPythonPackage .
mv ./ITKBoneEnhancement/tools .
./ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh cp${{ matrix.python-version }}

- name: Publish Python package as GitHub Artifact
Expand Down Expand Up @@ -258,7 +250,8 @@ jobs:
./macpython-download-cache-and-build-module-wheels.sh
popd
cp ITKBoneEnhancement/include/* include/
./ITKPythonPackage/scripts/macpython-build-module-wheels.sh
rm ./ITKBoneEnhancement/ITKPythonBuilds-macosx.tar.zst
/Users/svc-dashboard/D/P/ITKPythonPackage/scripts/macpython-build-module-wheels.sh

- name: Publish Python package as GitHub Artifact
uses: actions/upload-artifact@v1
Expand Down
1 change: 1 addition & 0 deletions examples/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@ find_package(ITK 5 REQUIRED
ITKSpatialObjects
BoneEnhancement
Cuberille
IOScanco
ITKMesh
ITKIOMeshBase
ITKIOMeta
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -45,6 +45,7 @@
url=r'https://itk.org/',
install_requires=[
r'itk>=5.2rc1',
r'itk-boneenhancement'
r'itk-boneenhancement',
r'itk-ioscanco',
]
)