Skip to content

Commit

Permalink
Merge pull request #1108 from thewtex/arm-native-packages
Browse files Browse the repository at this point in the history
arm native packages
  • Loading branch information
thewtex authored Apr 13, 2024
2 parents ae66f92 + a60d3a0 commit 07323cc
Show file tree
Hide file tree
Showing 21 changed files with 131 additions and 64 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/cxx-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ env:

jobs:
cxx-build-workflow:
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@e7c959441f1e513e8dedf380202e553f3aacf124
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4rc03-arm-wheels
with:
itk-git-tag: 877acbac082d5d8132e3d66f13732914b6408ef7
itk-module-deps: 'MeshToPolyData@v0.11rc02'
itk-module-deps: 'MeshToPolyData@v0.11rc03'
ctest-options: '-E itkPipelineTest'

python-build-workflow:
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@e7c959441f1e513e8dedf380202e553f3aacf124
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4rc03-arm-wheels
with:
itk-module-deps: 'InsightSoftwareConsortium/ITKMeshToPolyData@v0.11rc02'
itk-python-package-tag: e80c3754b472f16e61756f3988cf876c2a7bf097
itk-module-deps: 'InsightSoftwareConsortium/ITKMeshToPolyData@v0.11rc03'
secrets:
pypi_password: ${{ secrets.pypi_password }}
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ endif()

# Uses newer CMake
set(RapidJSON_GIT_REPOSITORY "https://github.com/thewtex/rapidjson.git")
set(RapidJSON_GIT_TAG "0f4a1318287791446652209ab94edeef5a8b68b9")
set(RapidJSON_GIT_TAG "3c70d501767f5cb37bf0ccaff0f784ddd0961752")
set(RAPIDJSON_BUILD_CXX17 ON)
set(RAPIDJSON_BUILD_DOC OFF)
set(RAPIDJSON_BUILD_EXAMPLES OFF)
Expand Down Expand Up @@ -74,8 +74,9 @@ FetchContent_Declare(

set(libcbor_GIT_REPOSITORY "https://github.com/PJK/libcbor")
set(libcbor_GIT_REPOSITORY "https://github.com/thewtex/libcbor")
# 2022-12-17 master + CMake + WASI + target_include_directory + GCC | operator warning
set(libcbor_GIT_TAG "702568cd2d60f3b9fb2d491c274ab03b8c1b1bf9")
# 2024-04-12 master + CMake + WASI + target_include_directory + GCC | operator
# warning + GCC|Clang|MSVC Return type warning
set(libcbor_GIT_TAG "00003e202293544d00e2b2484b781cb974898d8b")
FetchContent_Declare(
libcbor
GIT_REPOSITORY ${libcbor_GIT_REPOSITORY}
Expand Down
5 changes: 5 additions & 0 deletions docs/itk-webassemblyinterface-description.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# itk-webassemblyinterface

This Python package provides native binary interfaces to the [ITK-Wasm file formats](https://wasm.itk.org/en/latest/introduction/file_formats/index.html) that can be used with `itk.imread`, `itk.meshread`, `itk.transformread`, `itk.imwrite`, etc.

For execution of [ITK-Wasm](https://wasm.itk.org) WASI binaries, which contain support for the ITK-Wasm file formats and other file formats, see the `itkwasm-image-io`, `itkwasm-mesh-io`, and `itkwasm-transform-io` packages.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const defaultImageTag = '20240408-db9afd60'
const defaultImageTag = '20240413-b75cd2b9'
export default defaultImageTag

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

109 changes: 109 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
[build-system]
requires = ["scikit-build-core"]
build-backend = "scikit_build_core.build"

[project]
name = "itk-webassemblyinterface"
version = "1.0b171"
description = "IO with the itk-wasm file formats"
readme = "docs/itk-webassemblyinterface-description.md"
license = {file = "LICENSE"}
authors = [
{ name = "Matthew M. McCormick", email = "matt.mccormick@kitware.com" },
]
keywords = [
"itk",
]
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.4rc3",
"itk-meshtopolydata>=0.11rc3",
]

[project.urls]
Download = "https://github.com/InsightSoftwareConsortium/itk-wasm"
Homepage = "https://github.com/InsightSoftwareConsortium/itk-wasm"

[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"

# 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 backward compatibility.
minimum-version = "0.8.2"

# The build directory. Defaults to a temporary directory, but can be set.
build-dir = "build/{wheel_tag}"
49 changes: 0 additions & 49 deletions setup.py

This file was deleted.

3 changes: 3 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ set(WebAssemblyInterface_SRCS
)
itk_module_add_library(WebAssemblyInterface ${WebAssemblyInterface_SRCS})
target_link_libraries(WebAssemblyInterface LINK_PUBLIC cbor cpp-base64)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
target_compile_options(WebAssemblyInterface PRIVATE "-Wno-unused-result")
endif()

if(BUILD_ITK_WASM_IO_MODULES)

Expand Down

0 comments on commit 07323cc

Please sign in to comment.