diff --git a/.github/workflows/apply-clang-format.yml b/.github/workflows/apply-clang-format.yml deleted file mode 100644 index 5d0389b7e..000000000 --- a/.github/workflows/apply-clang-format.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Apply clang-format to PR - -on: - pull_request: - types: [labeled] - -jobs: - clang-format: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - uses: InsightSoftwareConsortium/ITKApplyClangFormatAction@testing - with: - github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/build-test-cxx-cuda.yml b/.github/workflows/build-test-cxx-cuda.yml deleted file mode 100644 index cb88feba4..000000000 --- a/.github/workflows/build-test-cxx-cuda.yml +++ /dev/null @@ -1,165 +0,0 @@ -name: 'Build, Test RTK with CUDA' - -on: [push,pull_request] - -env: - itk-git-tag: "v5.4.0" - itk-module-deps: "CudaCommon@v1.1.0" - -jobs: - build-test-cxx: - runs-on: ${{ matrix.os }} - strategy: - max-parallel: 3 - matrix: - os: [self-hosted-linux, self-hosted-windows] - include: - - os: self-hosted-linux - c-compiler: "gcc" - cxx-compiler: "g++" - cmake-build-type: "MinSizeRel" - - os: self-hosted-windows - c-compiler: "cl.exe" - cxx-compiler: "cl.exe" - cmake-build-type: "Release" - - steps: - - uses: actions/checkout@v3 - - - name: Install build dependencies - run: | - python -m pip install --upgrade pip - python -m pip install ninja - - - name: Get specific version of CMake, Ninja - uses: lukka/get-cmake@v3.24.2 - - - name: self-hosted cleanup - shell: bash - run: | - rm -fr ../ITK - rm -fr ../ITK-build - rm -fr ../build - - - name: Download ITK - run: | - cd .. - git clone https://github.com/InsightSoftwareConsortium/ITK.git - cd ITK - git checkout ${{ env.itk-git-tag }} - - - name: Build ITK - if: matrix.os != 'self-hosted-windows' - shell: bash - run: | - cd .. - mkdir ITK-build - cd ITK-build - MODULE_ARGS="" - MODULE_DEPS=${{ env.itk-module-deps }} - for MODULE_INFO in ${MODULE_DEPS//:/ }; do - MODULE_NAME=`(echo ${MODULE_INFO} | cut -d'@' -f 1)` - MODULE_ARGS="${MODULE_ARGS} -DModule_${MODULE_NAME}:BOOL=ON" - MODULE_TAG=`(echo ${MODULE_INFO} | cut -d'@' -f 2)` - if [[ -n ${MODULE_TAG} ]]; then - MODULE_ARGS+=" -DModule_${MODULE_NAME}_GIT_TAG:STRING=${MODULE_TAG}" - fi - done - if [[ -n $MODULE_ARGS ]]; then - echo "Building with modules: $MODULE_ARGS" - fi - - 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 ${{ env.itk-cmake-options }} ${MODULE_ARGS} -GNinja ../ITK - ninja - - - name: Build ITK - if: matrix.os == 'self-hosted-windows' - shell: pwsh - run: | - Set-PSDebug -Trace 1 - cd .. - & "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation - mkdir ITK-build - cd ITK-build - - $MODULE_ARGS="" - $MODULE_DEPS="${{ env.itk-module-deps }}" - $MODULES_LIST = $MODULE_DEPS.split(":") - foreach($MODULE_INFO in $MODULES_LIST) { - if($MODULE_ARGS) { $MODULE_ARGS += " " } - $MODULE_NAME = $MODULE_INFO.split("@")[0] - $MODULE_ARGS += "-DModule_$MODULE_NAME`:BOOL=ON" - $MODULE_TAG = $MODULE_INFO.split("@")[1] - if($MODULE_TAG) { - $MODULE_ARGS += " -DModule_$MODULE_NAME`_GIT_TAG:STRING=$MODULE_TAG" - } - } - - if($MODULE_ARGS) { - echo "Building with parameters: ${{ env.itk-cmake-options }} $MODULE_ARGS" - } - - 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 ${{ env.itk-cmake-options }} $MODULE_ARGS.split(" ") -GNinja ../ITK - ninja - - - name: Fetch CTest driver script - run: | - curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITK/dashboard/itk_common.cmake -O - - - name: Configure CTest script - shell: bash - run: | - operating_system="${{ matrix.os }}" - cat > dashboard.cmake << EOF - set(CTEST_SITE "GitHubActions") - file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT) - file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY) - file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY) - set(dashboard_source_name "${GITHUB_REPOSITORY}") - if((ENV{GITHUB_REF_NAME} MATCHES "master" OR ENV{GITHUB_REF_NAME} MATCHES "main")) - set(branch "-master") - set(dashboard_model "Continuous") - else() - set(branch "-${GITHUB_REF}") - set(dashboard_model "Experimental") - endif() - set(CTEST_BUILD_NAME "${GITHUB_REPOSITORY}-${operating_system}-\${branch}") - set(CTEST_UPDATE_VERSION_ONLY 1) - set(CTEST_TEST_ARGS \${CTEST_TEST_ARGS} PARALLEL_LEVEL \${PARALLEL_LEVEL}) - set(CTEST_BUILD_CONFIGURATION "Release") - set(CTEST_CMAKE_GENERATOR "Ninja") - set(CTEST_CUSTOM_WARNING_EXCEPTION - \${CTEST_CUSTOM_WARNING_EXCEPTION} - # macOS Azure VM Warning - "ld: warning: text-based stub file" - ${{ env.warnings-to-ignore }} - ) - set(dashboard_no_clean 1) - set(ENV{CC} ${{ matrix.c-compiler }}) - set(ENV{CXX} ${{ matrix.cxx-compiler }}) - if(WIN32) - set(ENV{PATH} "\${CTEST_DASHBOARD_ROOT}/ITK-build/bin;\$ENV{PATH}") - endif() - set(dashboard_cache " - ITK_DIR:PATH=\${CTEST_DASHBOARD_ROOT}/ITK-build - BUILD_TESTING:BOOL=ON - ${{ env.cmake-options }} - ") - string(TIMESTAMP build_date "%Y-%m-%d") - message("CDash Build Identifier: \${build_date} \${CTEST_BUILD_NAME}") - message("CTEST_SITE = \${CTEST_SITE}") - include(\${CTEST_SCRIPT_DIRECTORY}/itk_common.cmake) - EOF - cat dashboard.cmake - - - name: Build and test - if: matrix.os != 'self-hosted-windows' - run: | - ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ env.ctest-options }} - - - name: Build and test - if: matrix.os == 'self-hosted-windows' - shell: pwsh - run: | - & "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation - ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ env.ctest-options }} diff --git a/.github/workflows/build-test-package-python-cuda.yml b/.github/workflows/build-test-package-python-cuda.yml index ea42b1356..c81667240 100644 --- a/.github/workflows/build-test-package-python-cuda.yml +++ b/.github/workflows/build-test-package-python-cuda.yml @@ -4,7 +4,7 @@ on: [push,pull_request] env: itk-wheel-tag: 'v5.4.0' - itk-python-package-tag: 'v5.4.0' + itk-python-package-tag: 'f38e8b0f38580807809b0412235fb2ba0946deba' itk-python-package-org: 'InsightSoftwareConsortium' itk-module-deps: "RTKConsortium/ITKCudaCommon@v1.1.0" @@ -14,9 +14,9 @@ jobs: strategy: max-parallel: 2 matrix: - python3-minor-version: ["8","9","10","11"] - manylinux-platform: ["_2_28-x64","2014-x64"] - cuda-version: ["116","121"] + python3-minor-version: ["11"] + manylinux-platform: ["_2_28-x64"] + cuda-version: ["121"] steps: - uses: actions/checkout@v3 @@ -68,6 +68,8 @@ jobs: LIBCUBLAS=`basename /home/srit/Downloads/cuda${CUDA_VERSION}/targets/x86_64-linux/lib/libcublas.so.${CUDA_VERSION_MAJOR}*` LIBCUBLASLT=`basename /home/srit/Downloads/cuda${CUDA_VERSION}/targets/x86_64-linux/lib/libcublasLt.so.${CUDA_VERSION_MAJOR}*` LIBCUFFT=`basename /home/srit/Downloads/cuda${CUDA_VERSION}/targets/x86_64-linux/lib/libcufft.so.$((${CUDA_VERSION_MAJOR}-1))*` + sed -i "s/dependencies = \[/dependencies = [ \"itk-cudacommon-cuda${CUDA_VERSION} == 1.1.*\",/g" pyproject.toml + sed -i "s/itk-rtk/itk-rtk-cuda${CUDA_VERSION}/g" pyproject.toml ./dockcross-manylinux-download-cache-and-build-module-wheels.sh "${CMAKE_OPTIONS[@]}" -x "libcuda.so.1;${LIBCUDART};${LIBCUBLAS};${LIBCUBLASLT};${LIBCUFFT}" cp3${{ matrix.python3-minor-version }} mv *zst ../.. @@ -95,89 +97,9 @@ jobs: name: LinuxWheel3${{ matrix.python3-minor-version }}${{ matrix.manylinux-platform }}-cuda${{ matrix.cuda-version }} path: dist/*.whl - build-windows-cuda-python-packages: - runs-on: self-hosted-windows - strategy: - max-parallel: 2 - matrix: - python3-minor-version: ["8","9","10","11"] - cuda-version: ["116","121"] - - steps: - - uses: actions/checkout@v4 - with: - path: "im" - - - name: 'Reduce source path length' - shell: bash - run: | - # Move ITKPythonBuilds archive to the checked-out source - if test -f ../../im/ITKPythonBuilds-windows.zip; then - mv ../../im/*.zip im - fi - rm -fr ../../im - - # Move checked-out source to a shorter path to avoid Windows path length issues - mv im ../../ - - - name: 'Fetch build script' - shell: pwsh - run: | - cd ../../im - $ITKPYTHONPACKAGE_TAG = "${{ env.itk-python-package-tag }}" - $ITKPYTHONPACKAGE_ORG = "${{ env.itk-python-package-org }}" - $SCRIPT_UPSTREAM = "https://raw.githubusercontent.com/$ITKPYTHONPACKAGE_ORG/ITKPythonPackage/$ITKPYTHONPACKAGE_TAG/scripts/windows-download-cache-and-build-module-wheels.ps1" - echo "Fetching $SCRIPT_UPSTREAM" - (new-object net.webclient).DownloadString($SCRIPT_UPSTREAM) > windows-download-cache-and-build-module-wheels.ps1 - - - name: 'Build 🐍 Python 📦 package' - shell: pwsh - run: | - if (Test-Path dist) { rm dist -r -fo } - - cd ../../im - & "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -SkipAutomaticLocation - $env:CC="cl.exe" - $env:CXX="cl.exe" - $env:ITK_PACKAGE_VERSION = "${{ env.itk-wheel-tag }}" - $env:ITKPYTHONPACKAGE_TAG = "${{ env.itk-python-package-tag }}" - $env:ITKPYTHONPACKAGE_ORG = "${{ env.itk-python-package-org }}" - $env:ITK_MODULE_PREQ = "${{ env.itk-module-deps }}" - $CUDA_VERSION = "${{ matrix.cuda-version }}" - $CUDA_VERSION_MAJOR=$CUDA_VERSION.substring(0,2) - $CUDA_VERSION_MINOR=$CUDA_VERSION.substring(2,$CUDA_VERSION.Length-2) - $env:CUDA_PATH = "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}" - $env:Path = "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}\bin;" + $env:Path - $LIBCUDART= (Get-Item "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}\bin\cudart64*dll" ).Name - $LIBCUBLAS= (Get-Item "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}\bin\cublas64*dll" ).Name - $LIBCUBLASLT= (Get-Item "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}\bin\cublasLt64*dll" ).Name - $LIBCUFFT= (Get-Item "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}\bin\cufft64*dll" ).Name - ./windows-download-cache-and-build-module-wheels.ps1 "${{ matrix.python3-minor-version }}" -setup_options "--lib-paths ""C:/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}/bin"" --exclude-libs ""nvcuda.dll;concrt140.dll;${LIBCUDART};${LIBCUBLAS};${LIBCUBLASLT};${LIBCUFFT}""" -cmake_options "-DRTK_CUDA_VERSION=${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}" - - mkdir -p '${{ github.workspace }}\dist' - cp 'dist\*.whl' '${{ github.workspace }}\dist' - - - name: Validate build output - shell: pwsh - run: | - python -m pip install twine - ls dist/ - - $WHEEL_PATTERN = "dist/itk_*cp3${{ matrix.python3-minor-version }}*win*.whl" - echo "Searching for wheels matching pattern ${WHEEL_PATTERN}" - - python -m twine check ${WHEEL_PATTERN} - - - name: Publish Python package as GitHub Artifact - uses: actions/upload-artifact@v4 - with: - name: WindowsWheel3${{ matrix.python3-minor-version }}-cuda${{ matrix.cuda-version }} - path: dist/*.whl - publish-python-packages-to-pypi: needs: - build-linux-cuda-python-packages - - build-windows-cuda-python-packages runs-on: ubuntu-22.04 steps: diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index d3143cea5..03fa97c04 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -7,11 +7,10 @@ jobs: uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@main python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@main + uses: SimonRit/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@4ead98d367e8d7065c93672abfaec553360db86f with: cmake-options: '-DRTK_BUILD_APPLICATIONS:BOOL=OFF' - itk-wheel-tag: 'v5.4.0' - itk-python-package-tag: 'v5.4.0' + itk-python-package-tag: 'f38e8b0f38580807809b0412235fb2ba0946deba' itk-module-deps: "RTKConsortium/ITKCudaCommon@v1.1.0" secrets: pypi_password: ${{ secrets.pypi_password }} diff --git a/.github/workflows/clang-format-linter.yml b/.github/workflows/clang-format-linter.yml deleted file mode 100644 index 899d579ef..000000000 --- a/.github/workflows/clang-format-linter.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: clang-format linter - -on: [push,pull_request] - -jobs: - lint: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master diff --git a/CMakeLists.txt b/CMakeLists.txt index 855649401..415c1e3fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,16 +280,6 @@ option(RTK_BUILD_APPLICATIONS "Build RTK applications" ON) if(RTK_BUILD_APPLICATIONS) add_subdirectory(applications) endif() -if(ITK_WRAP_PYTHON) - # Install Python application - install(FILES applications/rtkconjugategradient/rtkconjugategradient.py - applications/rtkelektasynergygeometry/rtkelektasynergygeometry.py - applications/rtkorageometry/rtkorageometry.py - applications/rtksimulatedgeometry/rtksimulatedgeometry.py - applications/rtkvarianobigeometry/rtkvarianobigeometry.py - DESTINATION ${RTK_INSTALL_LIB_DIR} - COMPONENT PythonWheelRuntimeLibraries) -endif() # -------------------------------------------------------- # Setup KWStyle from ITK diff --git a/applications/rtkconjugategradient/rtkconjugategradient.py b/applications/rtkconjugategradient/rtkconjugategradient.py index c9511edff..8d05eadfa 100755 --- a/applications/rtkconjugategradient/rtkconjugategradient.py +++ b/applications/rtkconjugategradient/rtkconjugategradient.py @@ -17,7 +17,7 @@ def GetCudaImageFromImage(img): else: return img -if __name__ == '__main__': +def main(): # argument parsing parser = argparse.ArgumentParser(description= 'Reconstructs a 3D volume from a sequence of projections with a conjugate gradient technique', @@ -131,3 +131,6 @@ def GetCudaImageFromImage(img): writer.SetFileName(args_info.output) writer.SetInput(conjugategradient.GetOutput()) writer.Update() + +if __name__ == '__main__': + main() diff --git a/applications/rtkelektasynergygeometry/rtkelektasynergygeometry.py b/applications/rtkelektasynergygeometry/rtkelektasynergygeometry.py index 607d91123..b9a919f79 100755 --- a/applications/rtkelektasynergygeometry/rtkelektasynergygeometry.py +++ b/applications/rtkelektasynergygeometry/rtkelektasynergygeometry.py @@ -4,7 +4,7 @@ import itk from itk import RTK as rtk -if __name__ == '__main__': +def main(): # Argument parsing parser = argparse.ArgumentParser(description= "Creates an RTK geometry file from an Elekta Synergy acquisition.") @@ -27,3 +27,6 @@ xmlWriter.SetFilename(args.output) xmlWriter.SetObject(reader.GetGeometry()) xmlWriter.WriteFile() + +if __name__ == '__main__': + main() diff --git a/applications/rtkorageometry/rtkorageometry.py b/applications/rtkorageometry/rtkorageometry.py index 914f8a7d3..f50618860 100644 --- a/applications/rtkorageometry/rtkorageometry.py +++ b/applications/rtkorageometry/rtkorageometry.py @@ -3,7 +3,7 @@ import itk from itk import RTK as rtk -if __name__ == '__main__': +def main(): # Argument parsing parser = argparse.ArgumentParser(description= "Creates an RTK geometry file from a Varian OBI acquisition.") @@ -37,3 +37,6 @@ xmlWriter.SetFilename(args.output) xmlWriter.SetObject(reader.GetGeometry()) xmlWriter.WriteFile() + +if __name__ == '__main__': + main() diff --git a/applications/rtksimulatedgeometry/rtksimulatedgeometry.py b/applications/rtksimulatedgeometry/rtksimulatedgeometry.py index 313723626..b3c3a249d 100644 --- a/applications/rtksimulatedgeometry/rtksimulatedgeometry.py +++ b/applications/rtksimulatedgeometry/rtksimulatedgeometry.py @@ -3,7 +3,7 @@ import sys from itk import RTK as rtk -if __name__ == '__main__': +def main(): # Argument parsing parser = argparse.ArgumentParser(description= "Creates an RTK geometry file from simulated/regular trajectory. See https://www.openrtk.org/Doxygen/DocGeo3D.html for more information.") @@ -51,3 +51,6 @@ writer.SetFilename(args.output) writer.SetObject(geometry) writer.WriteFile() + +if __name__ == '__main__': + main() diff --git a/applications/rtkvarianobigeometry/rtkvarianobigeometry.py b/applications/rtkvarianobigeometry/rtkvarianobigeometry.py index 02fd74882..fc34b5267 100644 --- a/applications/rtkvarianobigeometry/rtkvarianobigeometry.py +++ b/applications/rtkvarianobigeometry/rtkvarianobigeometry.py @@ -4,7 +4,7 @@ import itk from itk import RTK as rtk -if __name__ == '__main__': +def main(): # Argument parsing parser = argparse.ArgumentParser(description= "Creates an RTK geometry file from a Varian OBI acquisition.") @@ -34,3 +34,6 @@ xmlWriter.SetFilename(args.output) xmlWriter.SetObject(reader.GetGeometry()) xmlWriter.WriteFile() + +if __name__ == '__main__': + main() diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..9e06a93da --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,116 @@ +[build-system] +requires = ["scikit-build-core"] +build-backend = "scikit_build_core.build" + +[project] +name = "itk-rtk" +version = "2.5.0" +description = "The Reconstruction Toolkit (RTK) for fast circular cone-beam CT reconstruction" +readme = "README.md" +license = {file = "LICENSE.TXT"} +authors = [ + { name = "RTK Consortium", email = "simon.rit@creatis.insa-lyon.fr" }, +] +keywords = [ + "itk", + "rtk", +] +classifiers = [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "Intended Audience :: Healthcare Industry", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: Apache Software License", + "Operating System :: Android", + "Operating System :: MacOS", + "Operating System :: Microsoft :: Windows", + "Operating System :: POSIX", + "Operating System :: Unix", + "Programming Language :: C++", + "Programming Language :: Python", + "Topic :: Scientific/Engineering", + "Topic :: Scientific/Engineering :: Information Analysis", + "Topic :: Scientific/Engineering :: Medical Science Apps.", + "Topic :: Software Development :: Libraries", +] +requires-python = ">=3.8" +dependencies = [ + "itk == 5.4.*", +] + +[project.scripts] +rtkconjugategradient = "itk.rtkconjugategradient:main" +rtkelektasynergygeometry = "itk.rtkelektasynergygeometry:main" +rtkorageometry = "itk.rtkorageometry:main" +rtksimulatedgeometry = "itk.rtksimulatedgeometry:main" +rtkvarianobigeometry = "itk.rtkvarianobigeometry:main" + +[project.urls] +Download = "https://github.com/RTKConsortium/RTK" +Homepage = "https://www.openrtk.org" + +[tool.scikit-build] +# The versions of CMake to allow. If CMake is not present on the system or does +# not pass this specifier, it will be downloaded via PyPI if possible. An empty +# string will disable this check. +cmake.version = ">=3.16.3" + +# A list of args to pass to CMake when configuring the project. Setting this in +# config or envvar will override toml. See also ``cmake.define``. +cmake.args = [] + +# A table of defines to pass to CMake when configuring the project. Additive. +cmake.define = {} + +# Verbose printout when building. +cmake.verbose = true + +# The build type to use when building the project. Valid options are: "Debug", +# "Release", "RelWithDebInfo", "MinSizeRel", "", etc. +cmake.build-type = "Release" + +# The source directory to use when building the project. Currently only affects +# the native builder (not the setuptools plugin). +cmake.source-dir = "." + +# The versions of Ninja to allow. If Ninja is not present on the system or does +# not pass this specifier, it will be downloaded via PyPI if possible. An empty +# string will disable this check. +ninja.version = ">=1.11" + +# The logging level to display, "DEBUG", "INFO", "WARNING", and "ERROR" are +# possible options. +logging.level = "INFO" + +# Files to include in the SDist even if they are skipped by default. Supports +# gitignore syntax. +sdist.include = [] + +# Files to exclude from the SDist even if they are included by default. Supports +# gitignore syntax. +sdist.exclude = [] + +# A list of license files to include in the wheel. Supports glob patterns. +wheel.license-files = ["LICEN[CS]E*",] + +# Target the platlib or the purelib. If not set, the default is to target the +# platlib if wheel.cmake is true, and the purelib otherwise. +wheel.platlib = "false" + +# If CMake is less than this value, backport a copy of FindPython. Set to 0 +# disable this, or the empty string. +backport.find-python = "3.26.1" + +# Select the editable mode to use. Can be "redirect" (default) or "inplace". +editable.mode = "redirect" + +# Rebuild the project when the package is imported. The build-directory must be +# set. +editable.rebuild = false + +# If set, this will provide a method for scikit-build-core backward compatibility. +minimum-version = "0.8.2" + +# The build directory. Defaults to a temporary directory, but can be set. +build-dir = "build/{wheel_tag}" diff --git a/setup.py b/setup.py deleted file mode 100755 index dbea42bf0..000000000 --- a/setup.py +++ /dev/null @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- -from os import sys - -try: - from skbuild import setup -except ImportError: - print('scikit-build is required to build from source.', file=sys.stderr) - print('Please run:', file=sys.stderr) - print('', file=sys.stderr) - print(' python -m pip install scikit-build') - sys.exit(1) - -# Configure wheel name if CUDA is used -wheel_name='itk-rtk' -wheel_requirements=[r'itk==5.4.*'] - -# Extract cuda version from the RTK_CUDA_VERSION cmake option -for arg in sys.argv: - if "RTK_CUDA_VERSION" in str(arg): - cuda_version = arg.rsplit('RTK_CUDA_VERSION=', 1)[-1] - wheel_name += '-cuda' + cuda_version.replace('.', '') - cudacommon_wheel_name = wheel_name.replace('rtk', 'cudacommon') - wheel_requirements.append(fr'{cudacommon_wheel_name}') - -setup( - name=wheel_name, - version='2.5.0', - author='RTK Consortium', - author_email='rtk-users@openrtk.org', - packages=['itk'], - package_dir={'itk': 'itk'}, - download_url=r'https://github.com/RTKConsortium/RTK', - description=r'The Reconstruction Toolkit (RTK) for fast circular cone-beam CT reconstruction.', - long_description='Based on the Insight Toolkit ITK, RTK provides: basic operators for reconstruction (e.g. filtering, forward, projection and backprojection), multithreaded CPU and GPU versions, tools for respiratory motion correction, I/O for several scanners, preprocessing of raw data for scatter correction.', - classifiers=[ - "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python", - "Programming Language :: C++", - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "Intended Audience :: Education", - "Intended Audience :: Healthcare Industry", - "Intended Audience :: Science/Research", - "Topic :: Scientific/Engineering", - "Topic :: Scientific/Engineering :: Medical Science Apps.", - "Topic :: Scientific/Engineering :: Information Analysis", - "Topic :: Software Development :: Libraries", - "Operating System :: Android", - "Operating System :: Microsoft :: Windows", - "Operating System :: POSIX", - "Operating System :: Unix", - "Operating System :: MacOS" - ], - scripts=[ - "lib/rtkconjugategradient.py", - "lib/rtkelektasynergygeometry.py", - "lib/rtkorageometry.py", - "lib/rtksimulatedgeometry.py", - "lib/rtkvarianobigeometry.py" - ], - license='Apache', - keywords='RTK Reconstruction Toolkit', - url=r'https://www.openrtk.org/', - install_requires=wheel_requirements - ) diff --git a/wrapping/CMakeLists.txt b/wrapping/CMakeLists.txt index 44ad3bc7a..83afdc330 100644 --- a/wrapping/CMakeLists.txt +++ b/wrapping/CMakeLists.txt @@ -32,4 +32,10 @@ wrap_itk_python_bindings_install(/itk "RTK" ${RTK_SOURCE_DIR}/applications/rtk3Doutputimage_group.py ${RTK_SOURCE_DIR}/applications/rtkinputprojections_group.py ${RTK_SOURCE_DIR}/applications/rtkiterations_group.py - ${RTK_SOURCE_DIR}/applications/rtkprojectors_group.py) + ${RTK_SOURCE_DIR}/applications/rtkprojectors_group.py + ${RTK_SOURCE_DIR}/applications/rtkconjugategradient/rtkconjugategradient.py + ${RTK_SOURCE_DIR}/applications/rtkelektasynergygeometry/rtkelektasynergygeometry.py + ${RTK_SOURCE_DIR}/applications/rtkorageometry/rtkorageometry.py + ${RTK_SOURCE_DIR}/applications/rtksimulatedgeometry/rtksimulatedgeometry.py + ${RTK_SOURCE_DIR}/applications/rtkvarianobigeometry/rtkvarianobigeometry.py +)