From e15a0bec4361bf655c404e234c1b2ca4847f3e37 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Sun, 9 Jul 2023 20:57:06 +0200 Subject: [PATCH 01/26] Add Python wheels CI --- .github/workflows/wheels.yml | 88 ++++++++++++++++++++++++++++++++++++ projects/vtk.cmake | 10 ++-- 2 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/wheels.yml diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml new file mode 100644 index 00000000..7a10be7d --- /dev/null +++ b/.github/workflows/wheels.yml @@ -0,0 +1,88 @@ +name: Python wheels + +on: [push, pull_request] + +jobs: + build_wheels: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-20.04, windows-2019, macOS-11] + + # fetch-depth: 0 is required to get the tags used to determine f3d version + steps: + - name: Checkout f3d-superbuild + uses: actions/checkout@v3 + with: + submodules: true + path: 'f3d-superbuild' + + - name: Checkout f3d + uses: actions/checkout@v3 + with: + repository: 'Meakk/f3d' + ref: 'python' + fetch-depth: 0 + path: 'f3d' + + - name: Recover VTK version to build + working-directory: ${{github.workspace}} + shell: bash + run: | + echo VTK_COMMIT_SHA=`cat ./f3d/.github/actions/vtk_commit_sha` >> $GITHUB_ENV + + - name: Setup Ninja Windows + if: runner.os == 'Windows' + shell: bash + run: | + choco install ninja + echo CMAKE_GENERATOR=Ninja >> $GITHUB_ENV + + - name: Setup MSVC Windows + if: runner.os == 'Windows' + uses: TheMrMilchmann/setup-msvc-dev@v2 + with: + arch: x64 + + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v2 + with: + platforms: all + + - name: Build wheels + uses: pypa/cibuildwheel@v2.13.1 + with: + package-dir: ${{github.workspace}}/f3d + output-dir: ${{github.workspace}}/wheelhouse + config-file: ${{github.workspace}}/f3d/pyproject.toml + env: + CIBW_ARCHS_LINUX: x86_64 aarch64 + CIBW_ARCHS_MACOS: x86_64 arm64 + CIBW_ARCHS_WINDOWS: AMD64 ARM64 + CIBW_ENVIRONMENT: CMAKE_PREFIX_PATH=../../../../f3d-superbuild-build/install + CIBW_ENVIRONMENT_PASS_LINUX: CMAKE_PREFIX_PATH + CIBW_BEFORE_ALL: > + cmake -S f3d-superbuild -B f3d-superbuild-build + -DCMAKE_BUILD_TYPE=Release + -DBUILD_SHARED_LIBS=OFF + -DENABLE_f3d=OFF + -DENABLE_alembic=ON + -DENABLE_assimp=ON + -DENABLE_draco=ON + -DENABLE_occt=ON + -DENABLE_openexr=ON + -DENABLE_ospray=OFF + -DENABLE_pybind11=ON + -DENABLE_tbb=OFF + -DENABLE_vtk=ON + -DOCCT_ENABLE_COLORING=OFF + -Dvtk_SOURCE_SELECTION=git + -Dvtk_GIT_TAG=${{ env.VTK_COMMIT_SHA }} && + cmake --build f3d-superbuild-build + + - uses: actions/upload-artifact@v3 + with: + name: ${{ runner.os }}-wheels + path: ./wheelhouse/*.whl diff --git a/projects/vtk.cmake b/projects/vtk.cmake index 45305e2e..701bff69 100644 --- a/projects/vtk.cmake +++ b/projects/vtk.cmake @@ -10,12 +10,12 @@ if (UNIX) endif () endif () -set(vtk_smp_type "STDThread") -set(vtk_smp_enable_stdthread OFF) +set(vtk_smp_type "Sequential") +set(vtk_smp_enable_sequential OFF) if (tbb_enabled) set(vtk_smp_type "TBB") else () - set(vtk_smp_enable_stdthread ON) + set(vtk_smp_enable_sequential ON) endif () superbuild_add_project(vtk @@ -58,8 +58,8 @@ superbuild_add_project(vtk -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2=YES -DVTK_MODULE_ENABLE_VTK_TestingCore=YES -DVTK_OPENGL_HAS_EGL=${egl_enabled} - -DVTK_SMP_ENABLE_SEQUENTIAL=OFF - -DVTK_SMP_ENABLE_STDTHREAD=${vtk_smp_enable_stdthread} + -DVTK_SMP_ENABLE_SEQUENTIAL=${vtk_smp_enable_sequential} + -DVTK_SMP_ENABLE_STDTHREAD=OFF -DVTK_SMP_ENABLE_TBB=${tbb_enabled} -DVTK_SMP_IMPLEMENTATION_TYPE=${vtk_smp_type} -DVTK_VERSIONED_INSTALL=OFF From 130822dd6594573a7e9a774e31a1cd4380e32790 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Mon, 10 Jul 2023 10:05:07 +0200 Subject: [PATCH 02/26] tweaks --- .github/workflows/wheels.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7a10be7d..f9911992 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -45,12 +45,6 @@ jobs: with: arch: x64 - - name: Set up QEMU - if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v2 - with: - platforms: all - - name: Build wheels uses: pypa/cibuildwheel@v2.13.1 with: @@ -58,11 +52,19 @@ jobs: output-dir: ${{github.workspace}}/wheelhouse config-file: ${{github.workspace}}/f3d/pyproject.toml env: - CIBW_ARCHS_LINUX: x86_64 aarch64 - CIBW_ARCHS_MACOS: x86_64 arm64 - CIBW_ARCHS_WINDOWS: AMD64 ARM64 - CIBW_ENVIRONMENT: CMAKE_PREFIX_PATH=../../../../f3d-superbuild-build/install - CIBW_ENVIRONMENT_PASS_LINUX: CMAKE_PREFIX_PATH + CIBW_ARCHS: native + CIBW_ENVIRONMENT: > + CMAKE_PREFIX_PATH=../../../../f3d-superbuild-build/install + F3D_PLUGIN_BUILD_ALEMBIC=ON + F3D_PLUGIN_BUILD_ASSIMP=ON + F3D_PLUGIN_BUILD_DRACO=ON + F3D_PLUGIN_BUILD_OCCT=ON + CIBW_ENVIRONMENT_PASS_LINUX: > + CMAKE_PREFIX_PATH + F3D_PLUGIN_BUILD_ALEMBIC + F3D_PLUGIN_BUILD_ASSIMP + F3D_PLUGIN_BUILD_DRACO + F3D_PLUGIN_BUILD_OCCT CIBW_BEFORE_ALL: > cmake -S f3d-superbuild -B f3d-superbuild-build -DCMAKE_BUILD_TYPE=Release From 484750d91686b96efc0a89151be66d23bfae1f81 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Mon, 10 Jul 2023 11:42:40 +0200 Subject: [PATCH 03/26] disable coloring --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f9911992..76da0b6b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -59,12 +59,14 @@ jobs: F3D_PLUGIN_BUILD_ASSIMP=ON F3D_PLUGIN_BUILD_DRACO=ON F3D_PLUGIN_BUILD_OCCT=ON + F3D_PLUGIN_OCCT_COLORING_SUPPORT=OFF CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH F3D_PLUGIN_BUILD_ALEMBIC F3D_PLUGIN_BUILD_ASSIMP F3D_PLUGIN_BUILD_DRACO F3D_PLUGIN_BUILD_OCCT + F3D_PLUGIN_OCCT_COLORING_SUPPORT CIBW_BEFORE_ALL: > cmake -S f3d-superbuild -B f3d-superbuild-build -DCMAKE_BUILD_TYPE=Release From 49f464523244e7eae131bbbcff81b06404431cf3 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Mon, 10 Jul 2023 16:13:31 +0200 Subject: [PATCH 04/26] disable musl and pypy --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 76da0b6b..dc3d3a1b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -52,6 +52,7 @@ jobs: output-dir: ${{github.workspace}}/wheelhouse config-file: ${{github.workspace}}/f3d/pyproject.toml env: + CIBW_SKIP: 'pp-* *-musl*' CIBW_ARCHS: native CIBW_ENVIRONMENT: > CMAKE_PREFIX_PATH=../../../../f3d-superbuild-build/install From 2772251ea003d11cc55a581d7716920004ae477e Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Thu, 13 Jul 2023 16:09:07 +0200 Subject: [PATCH 05/26] workdir --- .github/workflows/wheels.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index dc3d3a1b..6a3e49e4 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -55,11 +55,11 @@ jobs: CIBW_SKIP: 'pp-* *-musl*' CIBW_ARCHS: native CIBW_ENVIRONMENT: > - CMAKE_PREFIX_PATH=../../../../f3d-superbuild-build/install - F3D_PLUGIN_BUILD_ALEMBIC=ON - F3D_PLUGIN_BUILD_ASSIMP=ON - F3D_PLUGIN_BUILD_DRACO=ON - F3D_PLUGIN_BUILD_OCCT=ON + CMAKE_PREFIX_PATH=./f3d-superbuild-build/install + F3D_PLUGIN_BUILD_ALEMBIC=OFF + F3D_PLUGIN_BUILD_ASSIMP=OFF + F3D_PLUGIN_BUILD_DRACO=OFF + F3D_PLUGIN_BUILD_OCCT=OFF F3D_PLUGIN_OCCT_COLORING_SUPPORT=OFF CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH @@ -73,11 +73,11 @@ jobs: -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DENABLE_f3d=OFF - -DENABLE_alembic=ON - -DENABLE_assimp=ON - -DENABLE_draco=ON - -DENABLE_occt=ON - -DENABLE_openexr=ON + -DENABLE_alembic=OFF + -DENABLE_assimp=OFF + -DENABLE_draco=OFF + -DENABLE_occt=OFF + -DENABLE_openexr=OFF -DENABLE_ospray=OFF -DENABLE_pybind11=ON -DENABLE_tbb=OFF From 5a374a86df3f0add25bb9632c8246520c8ea8480 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Thu, 13 Jul 2023 17:08:45 +0200 Subject: [PATCH 06/26] fix path --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6a3e49e4..3831554f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -55,7 +55,7 @@ jobs: CIBW_SKIP: 'pp-* *-musl*' CIBW_ARCHS: native CIBW_ENVIRONMENT: > - CMAKE_PREFIX_PATH=./f3d-superbuild-build/install + CMAKE_PREFIX_PATH=../f3d-superbuild-build/install F3D_PLUGIN_BUILD_ALEMBIC=OFF F3D_PLUGIN_BUILD_ASSIMP=OFF F3D_PLUGIN_BUILD_DRACO=OFF From e9b3ad6a24c1892a776f5b809bb22430b9005d59 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Sun, 16 Jul 2023 19:08:20 +0200 Subject: [PATCH 07/26] change repo --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3831554f..a4b26d1b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v3 with: repository: 'Meakk/f3d' - ref: 'python' + ref: 'skbuild' fetch-depth: 0 path: 'f3d' From cf434fb3fcf01758a8de3d1e462dd37e4d4cbdca Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Tue, 18 Jul 2023 13:20:35 +0200 Subject: [PATCH 08/26] update --- .github/workflows/wheels.yml | 58 +++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a4b26d1b..4fd2f295 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,6 +1,32 @@ name: Python wheels -on: [push, pull_request] +on: + workflow_dispatch: + inputs: + f3d_version: + description: 'F3D version to build' + required: true + default: 'master' + enable_alembic: + type: boolean + description: 'Enable Alembic plugin' + default: true + enable_assimp: + type: boolean + description: 'Enable Assimp plugin' + default: true + enable_draco: + type: boolean + description: 'Enable Draco plugin' + default: true + enable_occt: + type: boolean + description: 'Enable OpenCASCADE plugin' + default: true + enable_exr: + type: boolean + description: 'Enable OpenEXR module' + default: true jobs: build_wheels: @@ -21,8 +47,8 @@ jobs: - name: Checkout f3d uses: actions/checkout@v3 with: - repository: 'Meakk/f3d' - ref: 'skbuild' + repository: 'f3d-app/f3d' + ref: ${{github.event.inputs.f3d_version}} fetch-depth: 0 path: 'f3d' @@ -56,11 +82,13 @@ jobs: CIBW_ARCHS: native CIBW_ENVIRONMENT: > CMAKE_PREFIX_PATH=../f3d-superbuild-build/install - F3D_PLUGIN_BUILD_ALEMBIC=OFF - F3D_PLUGIN_BUILD_ASSIMP=OFF - F3D_PLUGIN_BUILD_DRACO=OFF - F3D_PLUGIN_BUILD_OCCT=OFF - F3D_PLUGIN_OCCT_COLORING_SUPPORT=OFF + F3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }} + F3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }} + F3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }} + F3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }} + F3D_PLUGIN_OCCT_COLORING_SUPPORT=ON + F3D_MODULE_EXR=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }} + F3D_MODULE_EXTERNAL_RENDERING=ON CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH F3D_PLUGIN_BUILD_ALEMBIC @@ -68,21 +96,23 @@ jobs: F3D_PLUGIN_BUILD_DRACO F3D_PLUGIN_BUILD_OCCT F3D_PLUGIN_OCCT_COLORING_SUPPORT + F3D_MODULE_EXR + F3D_MODULE_EXTERNAL_RENDERING CIBW_BEFORE_ALL: > cmake -S f3d-superbuild -B f3d-superbuild-build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DENABLE_f3d=OFF - -DENABLE_alembic=OFF - -DENABLE_assimp=OFF - -DENABLE_draco=OFF - -DENABLE_occt=OFF - -DENABLE_openexr=OFF + -DENABLE_alembic=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }} + -DENABLE_assimp=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }} + -DENABLE_draco=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }} + -DENABLE_occt=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }} + -DENABLE_openexr=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }} -DENABLE_ospray=OFF -DENABLE_pybind11=ON -DENABLE_tbb=OFF -DENABLE_vtk=ON - -DOCCT_ENABLE_COLORING=OFF + -DOCCT_ENABLE_COLORING=ON -Dvtk_SOURCE_SELECTION=git -Dvtk_GIT_TAG=${{ env.VTK_COMMIT_SHA }} && cmake --build f3d-superbuild-build From 6de8e48823c189d26af032f18d89d9380b8e8d24 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Tue, 18 Jul 2023 19:24:05 +0200 Subject: [PATCH 09/26] plugins --- .github/workflows/wheels.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4fd2f295..c9399692 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -80,25 +80,21 @@ jobs: env: CIBW_SKIP: 'pp-* *-musl*' CIBW_ARCHS: native - CIBW_ENVIRONMENT: > - CMAKE_PREFIX_PATH=../f3d-superbuild-build/install - F3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }} - F3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }} - F3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }} - F3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }} - F3D_PLUGIN_OCCT_COLORING_SUPPORT=ON - F3D_MODULE_EXR=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }} - F3D_MODULE_EXTERNAL_RENDERING=ON + CIBW_ENVIRONMENT: "\ + CMAKE_PREFIX_PATH=../f3d-superbuild-build/install \ + SKBUILD_CMAKE_ARGS=\ + -DF3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }};\ + -DF3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }};\ + -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }};\ + -DF3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }};\ + -DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON;\ + -DF3D_MODULE_EXR=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }};\ + -DF3D_MODULE_EXTERNAL_RENDERING=ON" CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH - F3D_PLUGIN_BUILD_ALEMBIC - F3D_PLUGIN_BUILD_ASSIMP - F3D_PLUGIN_BUILD_DRACO - F3D_PLUGIN_BUILD_OCCT - F3D_PLUGIN_OCCT_COLORING_SUPPORT - F3D_MODULE_EXR - F3D_MODULE_EXTERNAL_RENDERING + SKBUILD_CMAKE_ARGS CIBW_BEFORE_ALL: > + echo $SKBUILD_CMAKE_ARGS && cmake -S f3d-superbuild -B f3d-superbuild-build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF From a6f9c573ecd5a70f3a420cb036dc7643571d5e02 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Tue, 18 Jul 2023 19:25:41 +0200 Subject: [PATCH 10/26] fix --- .github/workflows/wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c9399692..6d9c4882 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -82,14 +82,14 @@ jobs: CIBW_ARCHS: native CIBW_ENVIRONMENT: "\ CMAKE_PREFIX_PATH=../f3d-superbuild-build/install \ - SKBUILD_CMAKE_ARGS=\ + SKBUILD_CMAKE_ARGS=\"\ -DF3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON;\ -DF3D_MODULE_EXR=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }};\ - -DF3D_MODULE_EXTERNAL_RENDERING=ON" + -DF3D_MODULE_EXTERNAL_RENDERING=ON\"" CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH SKBUILD_CMAKE_ARGS From 6e600752049122c0b8096be9a44909b681e1b283 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Wed, 19 Jul 2023 10:33:04 +0200 Subject: [PATCH 11/26] fix zlib --- projects/assimp.cmake | 3 ++- projects/zlib.cmake | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 projects/zlib.cmake diff --git a/projects/assimp.cmake b/projects/assimp.cmake index c6cfe525..574a00f4 100644 --- a/projects/assimp.cmake +++ b/projects/assimp.cmake @@ -2,6 +2,7 @@ superbuild_add_project(assimp BUILD_SHARED_LIBS_INDEPENDENT LICENSE_FILES LICENSE + DEPENDS zlib CMAKE_ARGS -DASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF @@ -11,7 +12,7 @@ superbuild_add_project(assimp -DASSIMP_BUILD_OFF_IMPORTER=ON -DASSIMP_BUILD_SAMPLES=OFF -DASSIMP_BUILD_TESTS=OFF - -DASSIMP_BUILD_ZLIB=ON + -DASSIMP_BUILD_ZLIB=OFF -DASSIMP_NO_EXPORT=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DCMAKE_BUILD_TYPE=Release diff --git a/projects/zlib.cmake b/projects/zlib.cmake new file mode 100644 index 00000000..3ef131cf --- /dev/null +++ b/projects/zlib.cmake @@ -0,0 +1,7 @@ +superbuild_add_project(zlib + BUILD_SHARED_LIBS_INDEPENDENT + LICENSE_FILES + README + CMAKE_ARGS + -DCMAKE_MACOSX_RPATH:BOOL=FALSE + -DCMAKE_INSTALL_NAME_DIR:PATH=/lib) From 5c0805a2a681a13fb99daf49f98b5b4423386e89 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Fri, 28 Jul 2023 21:21:13 +0200 Subject: [PATCH 12/26] remove exr --- .github/workflows/wheels.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6d9c4882..d298b102 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -23,10 +23,6 @@ on: type: boolean description: 'Enable OpenCASCADE plugin' default: true - enable_exr: - type: boolean - description: 'Enable OpenEXR module' - default: true jobs: build_wheels: @@ -88,16 +84,14 @@ jobs: -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON;\ - -DF3D_MODULE_EXR=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }};\ -DF3D_MODULE_EXTERNAL_RENDERING=ON\"" CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH SKBUILD_CMAKE_ARGS + CIBW_REPAIR_WHEEL_COMMAND: '' CIBW_BEFORE_ALL: > - echo $SKBUILD_CMAKE_ARGS && cmake -S f3d-superbuild -B f3d-superbuild-build -DCMAKE_BUILD_TYPE=Release - -DBUILD_SHARED_LIBS=OFF -DENABLE_f3d=OFF -DENABLE_alembic=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }} -DENABLE_assimp=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }} From 7362d4846dffd6b70ed4150996eb4e59abf95855 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Fri, 28 Jul 2023 21:30:03 +0200 Subject: [PATCH 13/26] static --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d298b102..b401decb 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -91,6 +91,7 @@ jobs: CIBW_REPAIR_WHEEL_COMMAND: '' CIBW_BEFORE_ALL: > cmake -S f3d-superbuild -B f3d-superbuild-build + -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_f3d=OFF -DENABLE_alembic=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }} From baa5eea6e160da4551768464eff9726c67112a7c Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Mon, 31 Jul 2023 21:56:38 +0200 Subject: [PATCH 14/26] try deps --- .github/workflows/wheels.yml | 6 ++++-- CMakeLists.txt | 2 +- projects/zlib.cmake | 7 ------- 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 projects/zlib.cmake diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b401decb..02135636 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -43,8 +43,10 @@ jobs: - name: Checkout f3d uses: actions/checkout@v3 with: - repository: 'f3d-app/f3d' - ref: ${{github.event.inputs.f3d_version}} + #repository: 'f3d-app/f3d' + repository: 'Meakk/f3d' + #ref: ${{github.event.inputs.f3d_version}} + ref: 'deps' fetch-depth: 0 path: 'f3d' diff --git a/CMakeLists.txt b/CMakeLists.txt index d315d059..15f55797 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.21) project(f3d-superbuild) diff --git a/projects/zlib.cmake b/projects/zlib.cmake deleted file mode 100644 index 3ef131cf..00000000 --- a/projects/zlib.cmake +++ /dev/null @@ -1,7 +0,0 @@ -superbuild_add_project(zlib - BUILD_SHARED_LIBS_INDEPENDENT - LICENSE_FILES - README - CMAKE_ARGS - -DCMAKE_MACOSX_RPATH:BOOL=FALSE - -DCMAKE_INSTALL_NAME_DIR:PATH=/lib) From e000bfd70244f92cde9b895bebd126f4658964c4 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Tue, 1 Aug 2023 09:41:38 +0200 Subject: [PATCH 15/26] remove cmake bump --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15f55797..d315d059 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.21) +cmake_minimum_required(VERSION 3.12) project(f3d-superbuild) From acbee88a62cabaf4ae14b8bce268a80fb0803046 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Tue, 1 Aug 2023 13:19:53 +0200 Subject: [PATCH 16/26] deps dir --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 02135636..f29504cb 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -81,6 +81,7 @@ jobs: CIBW_ENVIRONMENT: "\ CMAKE_PREFIX_PATH=../f3d-superbuild-build/install \ SKBUILD_CMAKE_ARGS=\"\ + -DF3D_DEPENDENCIES_DIR=${{github.workspace}}/f3d-superbuild-build/install;\ -DF3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }};\ From c1743460cf71a6192c18e9a995fd9255dee660e0 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Tue, 1 Aug 2023 15:14:03 +0200 Subject: [PATCH 17/26] bin --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f29504cb..e1edc577 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -81,7 +81,7 @@ jobs: CIBW_ENVIRONMENT: "\ CMAKE_PREFIX_PATH=../f3d-superbuild-build/install \ SKBUILD_CMAKE_ARGS=\"\ - -DF3D_DEPENDENCIES_DIR=${{github.workspace}}/f3d-superbuild-build/install;\ + -DF3D_DEPENDENCIES_DIR=${{github.workspace}}/f3d-superbuild-build/install/bin;\ -DF3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }};\ -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }};\ From a92648741b55aef871a9f8892ba69e580ea8a119 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Tue, 1 Aug 2023 23:32:43 +0200 Subject: [PATCH 18/26] yml --- .github/workflows/wheels.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e1edc577..28d92d1d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -78,16 +78,16 @@ jobs: env: CIBW_SKIP: 'pp-* *-musl*' CIBW_ARCHS: native - CIBW_ENVIRONMENT: "\ - CMAKE_PREFIX_PATH=../f3d-superbuild-build/install \ - SKBUILD_CMAKE_ARGS=\"\ - -DF3D_DEPENDENCIES_DIR=${{github.workspace}}/f3d-superbuild-build/install/bin;\ - -DF3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }};\ - -DF3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }};\ - -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }};\ - -DF3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }};\ - -DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON;\ - -DF3D_MODULE_EXTERNAL_RENDERING=ON\"" + CIBW_ENVIRONMENT: > + CMAKE_PREFIX_PATH=../f3d-superbuild-build/install + SKBUILD_CMAKE_ARGS=" + -DF3D_DEPENDENCIES_DIR=${{github.workspace}}/f3d-superbuild-build/install/bin; + -DF3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }}; + -DF3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }}; + -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }}; + -DF3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }}; + -DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON; + -DF3D_MODULE_EXTERNAL_RENDERING=ON" CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH SKBUILD_CMAKE_ARGS From 421a6091815c6bbe8b64e9c907f4dd4bef5ddb59 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Wed, 2 Aug 2023 08:37:50 +0200 Subject: [PATCH 19/26] fix --- .github/workflows/wheels.yml | 9 +++++++-- yo | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 yo diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 28d92d1d..6969be5f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -69,6 +69,11 @@ jobs: with: arch: x64 + - name: Escaping backslashes Windows + if: runner.os == 'Windows' + shell: bash + run: echo "ESCAPED_WS=${{github.workspace}}" | tr '\\' '/' >> $GITHUB_ENV + - name: Build wheels uses: pypa/cibuildwheel@v2.13.1 with: @@ -79,9 +84,9 @@ jobs: CIBW_SKIP: 'pp-* *-musl*' CIBW_ARCHS: native CIBW_ENVIRONMENT: > - CMAKE_PREFIX_PATH=../f3d-superbuild-build/install + CMAKE_PREFIX_PATH=../f3d-superbuild-build/install SKBUILD_CMAKE_ARGS=" - -DF3D_DEPENDENCIES_DIR=${{github.workspace}}/f3d-superbuild-build/install/bin; + -DF3D_DEPENDENCIES_DIR=${{ env.ESCAPED_WS }}/f3d-superbuild-build/install/bin; -DF3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }}; -DF3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }}; -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }}; diff --git a/yo b/yo new file mode 100644 index 00000000..f169bc56 --- /dev/null +++ b/yo @@ -0,0 +1 @@ +d:/a/b From e580f4e9b2ff8cc78f5eb23346ed5bfe0f202755 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Wed, 2 Aug 2023 12:50:26 +0200 Subject: [PATCH 20/26] test --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6969be5f..c10b989e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -75,6 +75,7 @@ jobs: run: echo "ESCAPED_WS=${{github.workspace}}" | tr '\\' '/' >> $GITHUB_ENV - name: Build wheels + if: runner.os == 'Linux' uses: pypa/cibuildwheel@v2.13.1 with: package-dir: ${{github.workspace}}/f3d From 985ddd9815e485433f8e66545a3001c24f5a208d Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Wed, 2 Aug 2023 15:14:29 +0200 Subject: [PATCH 21/26] fix --- .github/workflows/wheels.yml | 5 +++++ yo | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 yo diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c10b989e..f5ac6c0a 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -23,6 +23,10 @@ on: type: boolean description: 'Enable OpenCASCADE plugin' default: true + enable_exr: + type: boolean + description: 'Enable OpenEXR plugin' + default: true jobs: build_wheels: @@ -93,6 +97,7 @@ jobs: -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }}; -DF3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }}; -DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON; + -DF3D_MODULE_EXR=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }}; -DF3D_MODULE_EXTERNAL_RENDERING=ON" CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH diff --git a/yo b/yo deleted file mode 100644 index f169bc56..00000000 --- a/yo +++ /dev/null @@ -1 +0,0 @@ -d:/a/b From 6b07d42ba7736c849f4f8dcc5d4e3abbf0ab876a Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Wed, 2 Aug 2023 16:48:22 +0200 Subject: [PATCH 22/26] verbose --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f5ac6c0a..8490aa31 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -88,6 +88,7 @@ jobs: env: CIBW_SKIP: 'pp-* *-musl*' CIBW_ARCHS: native + CIBW_BUILD_VERBOSITY: 1 CIBW_ENVIRONMENT: > CMAKE_PREFIX_PATH=../f3d-superbuild-build/install SKBUILD_CMAKE_ARGS=" From dea63d5c4beafbd2d7a323570132f392048da9e9 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Thu, 3 Aug 2023 08:48:28 +0200 Subject: [PATCH 23/26] enable --- .github/workflows/wheels.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 8490aa31..55a14065 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -79,7 +79,6 @@ jobs: run: echo "ESCAPED_WS=${{github.workspace}}" | tr '\\' '/' >> $GITHUB_ENV - name: Build wheels - if: runner.os == 'Linux' uses: pypa/cibuildwheel@v2.13.1 with: package-dir: ${{github.workspace}}/f3d From 3e8fad3d19fb64a0a39f99535564e6bbaac8c4cb Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Thu, 3 Aug 2023 18:44:28 +0200 Subject: [PATCH 24/26] restore --- .github/workflows/wheels.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 55a14065..d039801f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -47,10 +47,8 @@ jobs: - name: Checkout f3d uses: actions/checkout@v3 with: - #repository: 'f3d-app/f3d' - repository: 'Meakk/f3d' - #ref: ${{github.event.inputs.f3d_version}} - ref: 'deps' + repository: 'f3d-app/f3d' + ref: ${{github.event.inputs.f3d_version}} fetch-depth: 0 path: 'f3d' From 3ba20d59e8912613da5687ac0f0fa2ae0130bc43 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Fri, 4 Aug 2023 11:19:40 +0200 Subject: [PATCH 25/26] automatic ci, latest os, remove inputs, enable pypy/musl, enable tbb --- .github/workflows/wheels.yml | 60 ++++++++++++------------------------ 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d039801f..add68403 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,32 +1,11 @@ name: Python wheels +# TODO: use sscache to speed up this workflow on: - workflow_dispatch: - inputs: - f3d_version: - description: 'F3D version to build' - required: true - default: 'master' - enable_alembic: - type: boolean - description: 'Enable Alembic plugin' - default: true - enable_assimp: - type: boolean - description: 'Enable Assimp plugin' - default: true - enable_draco: - type: boolean - description: 'Enable Draco plugin' - default: true - enable_occt: - type: boolean - description: 'Enable OpenCASCADE plugin' - default: true - enable_exr: - type: boolean - description: 'Enable OpenEXR plugin' - default: true + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] jobs: build_wheels: @@ -34,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macOS-11] + os: [ubuntu-latest, windows-latest, macOS-latest] # fetch-depth: 0 is required to get the tags used to determine f3d version steps: @@ -44,11 +23,12 @@ jobs: submodules: true path: 'f3d-superbuild' + # TODO: We are currently building wheels for master, it should be possible to select a tag - name: Checkout f3d uses: actions/checkout@v3 with: repository: 'f3d-app/f3d' - ref: ${{github.event.inputs.f3d_version}} + ref: 'master' fetch-depth: 0 path: 'f3d' @@ -83,19 +63,19 @@ jobs: output-dir: ${{github.workspace}}/wheelhouse config-file: ${{github.workspace}}/f3d/pyproject.toml env: - CIBW_SKIP: 'pp-* *-musl*' + # TODO: cross-compile ARM too CIBW_ARCHS: native CIBW_BUILD_VERBOSITY: 1 CIBW_ENVIRONMENT: > CMAKE_PREFIX_PATH=../f3d-superbuild-build/install SKBUILD_CMAKE_ARGS=" -DF3D_DEPENDENCIES_DIR=${{ env.ESCAPED_WS }}/f3d-superbuild-build/install/bin; - -DF3D_PLUGIN_BUILD_ALEMBIC=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }}; - -DF3D_PLUGIN_BUILD_ASSIMP=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }}; - -DF3D_PLUGIN_BUILD_DRACO=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }}; - -DF3D_PLUGIN_BUILD_OCCT=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }}; + -DF3D_PLUGIN_BUILD_ALEMBIC=ON; + -DF3D_PLUGIN_BUILD_ASSIMP=ON; + -DF3D_PLUGIN_BUILD_DRACO=ON; + -DF3D_PLUGIN_BUILD_OCCT=ON; -DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON; - -DF3D_MODULE_EXR=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }}; + -DF3D_MODULE_EXR=ON; -DF3D_MODULE_EXTERNAL_RENDERING=ON" CIBW_ENVIRONMENT_PASS_LINUX: > CMAKE_PREFIX_PATH @@ -106,14 +86,14 @@ jobs: -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_f3d=OFF - -DENABLE_alembic=${{ github.event.inputs.enable_alembic == 'true' && 'ON' || 'OFF' }} - -DENABLE_assimp=${{ github.event.inputs.enable_assimp == 'true' && 'ON' || 'OFF' }} - -DENABLE_draco=${{ github.event.inputs.enable_draco == 'true' && 'ON' || 'OFF' }} - -DENABLE_occt=${{ github.event.inputs.enable_occt == 'true' && 'ON' || 'OFF' }} - -DENABLE_openexr=${{ github.event.inputs.enable_exr == 'true' && 'ON' || 'OFF' }} + -DENABLE_alembic=ON + -DENABLE_assimp=ON + -DENABLE_draco=ON + -DENABLE_occt=ON + -DENABLE_openexr=ON -DENABLE_ospray=OFF -DENABLE_pybind11=ON - -DENABLE_tbb=OFF + -DENABLE_tbb=ON -DENABLE_vtk=ON -DOCCT_ENABLE_COLORING=ON -Dvtk_SOURCE_SELECTION=git From 91a3226af841fa9b3307356b54ecc88647e26ed3 Mon Sep 17 00:00:00 2001 From: Michael Migliore Date: Fri, 4 Aug 2023 13:57:44 +0200 Subject: [PATCH 26/26] remove musl --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index add68403..6aecc63b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -63,6 +63,7 @@ jobs: output-dir: ${{github.workspace}}/wheelhouse config-file: ${{github.workspace}}/f3d/pyproject.toml env: + CIBW_SKIP: '*-musl*' # TODO: cross-compile ARM too CIBW_ARCHS: native CIBW_BUILD_VERBOSITY: 1