Merge pull request #171 from tataratat/ft-gustaf

gustaf - Flip dependency

Author: j042

.github/workflows/docs.yml

@@ -29,7 +29,7 @@ jobs:
     - name: build docs
       run: |
         pip install -r ./docs/requirements.txt
-        sphinx-build -W -b html docs/source docs/build
+        sphinx-build -W -b html docs/source docs/build -j auto
 
     - name: deploy docs only if it is pushed to main
       uses: peaceiris/actions-gh-pages@v3

.github/workflows/main.yml

@@ -5,24 +5,76 @@ on:
     branches: ["main"]
 
 jobs:
-  wheel_build_full:
-    runs-on: ${{ matrix.os }}
+  macos_wheel:
+    runs-on: macos-latest
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        arch: [x86_64, arm64]
+        cw_build: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*"]
 
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
-    - name:  build wheels
-      uses: pypa/cibuildwheel@v2.12.1
+    - name: build wheels
+      uses: pypa/cibuildwheel@v2.13.1
       env:
+        CIBW_ARCHS: ${{ matrix.arch }}
+        CIBW_BUILD: ${{ matrix.cw_build }}
+        CIBW_TEST_SKIP: "*-macosx_arm64"
         SPLINEPY_GITHUB_ACTIONS_BUILD: True
 
     - uses: actions/upload-artifact@v3
       with:
         path: ./wheelhouse/*.whl
+        retention-days: 2
+
+  linux_wheel:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [x86_64]
+        cw_build: ["cp36*many*", "cp37*many*", "cp38*many*", "cp39*many*", "cp310*many*", "cp311*many*"]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - name: build wheels
+      uses: pypa/[email protected]
+      env:
+        CIBW_ARCHS: ${{ matrix.arch }}
+        CIBW_BUILD: ${{ matrix.cw_build }}
+        SPLINEPY_GITHUB_ACTIONS_BUILD: True
+
+    - uses: actions/upload-artifact@v3
+      with:
+        path: ./wheelhouse/*.whl
+        retention-days: 2
+
+  windows_wheel:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        arch: [x86, AMD64, ARM64]
+        cw_build: ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*", "cp311-*"]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - name: build wheels
+      uses: pypa/[email protected]
+      env:
+        CIBW_ARCHS: ${{ matrix.arch }}
+        CIBW_BUILD: ${{ matrix.cw_build }}
+        CIBW_TEST_SKIP: "*-win_arm64"
+        SPLINEPY_GITHUB_ACTIONS_BUILD: True
+
+    - uses: actions/upload-artifact@v3
+      with:
+        path: ./wheelhouse/*.whl
+        retention-days: 2
 
   source_dist:
     runs-on: ubuntu-latest
@@ -37,6 +89,8 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         path: ./dist/*
+        retention-days: 2
+
 
   upload_test_pypi:
     needs: [wheel_build_full, source_dist]

.gitmodules

@@ -10,6 +10,3 @@
 [submodule "third_party/bezman"]
 	path = third_party/bezman
 	url = [email protected]:tataratat/bezman.git
-[submodule "third_party/uff"]
-	path = third_party/uff
-	url = [email protected]:tataratat/uff

CMakeLists.txt

@@ -26,6 +26,12 @@ set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
 set(namespace "${PROJECT_NAME}::")
 
 
+# default build type id debug
+if (NOT CMAKE_BUILD_TYPE)
+  message("CMAKE_BUILD_TYPE undefined. Setting Debug.")
+  set(CMAKE_BUILD_TYPE Debug)
+endif()
+
 # global flags
 set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
 set(SPLINEPY_DEFS $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
@@ -76,5 +82,19 @@ if(SPLINEPY_BUILD_EXPLICIT)
             SPLINEPY_BUILD_EXPLICIT)
 endif(SPLINEPY_BUILD_EXPLICIT)
 
+# try to avoid re-build of splinepy if  possible
+if(SPLINEPY_COMPILE_PYTHON)
+  find_package(SplineLib QUIET)
+  find_package(bezman QUIET)
+  find_package(napf QUIET)
+  find_package(splinepy QUIET)
+  if(splinepy_FOUND)
+    message("Found installed splinepy, building only python module")
+    add_subdirectory(third_party/pybind11)
+    add_subdirectory(cpp/splinepy/py)
+    return()
+  endif()
+endif()
+
 add_subdirectory(third_party)
 add_subdirectory(cpp/splinepy)

cpp/splinepy/py/CMakeLists.txt

@@ -8,41 +8,16 @@ set(PYSPLINEPY_SRCS
         init/multi_patch.cpp
         init/reader.cpp
         init/spline_extensions.cpp
-        init/uffpy.cpp
         splinepy_core.cpp)
 
 # add target
 pybind11_add_module(splinepy_core ${PYSPLINEPY_SRCS})
 target_include_directories(splinepy_core PRIVATE "${PROJECT_SOURCE_DIR}/cpp")
-target_compile_definitions(splinepy_core PRIVATE ${DEFS})
+target_compile_definitions(splinepy_core PRIVATE ${SPLINEPY_DEFS})
 target_compile_options(splinepy_core
     PRIVATE
         ${SPLINEPY_FLAGS}
         ${SPLINEPY_OPTIMIZATION_FLAGS})
 
-# link splinepy
-target_link_libraries(splinepy_core PRIVATE splinepy)
-
-# link splinelib
-if(SPLINEPY_COMPILE_SPLINELIB)
-    target_link_libraries(splinepy_core PRIVATE splines input_output)
-else()
-    find_package(SplineLib REQUIRED)
-    target_link_libraries(splinepy_core
-        PRIVATE
-            SplineLib::splines
-            SplineLib::input_output
-    )
-endif()
-
-# link bezman
-target_link_libraries(splinepy_core PRIVATE bezman)
-
-# link fitting
-target_link_libraries(splinepy_core PRIVATE fitting)
-
-# link napf
-target_link_libraries(splinepy_core PRIVATE napf)
-
-# link uff
-target_link_libraries(splinepy_core PRIVATE uff)
+# link splinepy - all the other dependencies should propagte from splinepy
+target_link_libraries(splinepy_core PRIVATE splinepy::splinepy)

cpp/splinepy/py/init/uffpy.cpp

@@ -13,9 +13,6 @@
 // Bezman
 #include <bezman/src/utils/algorithms/point_uniquifier.hpp>
 
-// uff
-#include <uff.hpp>
-
 //
 #include <splinepy/py/py_spline.hpp>
 #include <splinepy/splines/null_spline.hpp>

cpp/splinepy/py/py_multi_patch.hpp

@@ -26,9 +26,6 @@ void init_exporter(py::module_&);
 // fitting
 void init_fitting(py::module_&);
 
-// unique vertices
-void init_uffpy(py::module_&);
-
 // multi_patch
 void init_multi_patch(py::module_& m);
 
@@ -46,6 +43,5 @@ PYBIND11_MODULE(splinepy_core, m) {
   splinepy::py::init::init_exporter(m);
   splinepy::py::init::init_fitting(m);
   splinepy::py::init::init_knot_insertion_matrix(m);
-  splinepy::py::init::init_uffpy(m);
   splinepy::py::init::init_multi_patch(m);
 }

cpp/splinepy/py/py_uffpy.hpp

@@ -0,0 +1,42 @@
+import gustaf as gus
+import numpy as np
+
+import splinepy
+
+if __name__ == "__main__":
+    line = splinepy.helpme.create.line(
+        np.array([[0, 0, 0], [2, 5, 0], [4, 4, 2]])
+    )
+    rect = splinepy.helpme.create.box(5, 3)
+    box = splinepy.helpme.create.box(3, 2, 4)
+    pyramid = splinepy.helpme.create.pyramid(1, 1, 2)
+
+    gus.show(
+        ["Line", line],
+        ["Rectangle", rect],
+        ["Box", box],
+        ["Pyramid", pyramid],
+        title="Rectangular objects",
+        resolution=50,
+    )
+
+    circ = splinepy.helpme.create.circle(5)
+    disk1 = splinepy.helpme.create.disk(3, angle=100, n_knot_spans=4)
+    disk2 = splinepy.helpme.create.disk(
+        5, inner_radius=1.0, angle=360, n_knot_spans=10
+    )
+
+    gus.show(["Line Circle", circ], ["Disk section", disk1], ["Disk", disk2])
+
+    cone = splinepy.helpme.create.cone(5, 10, angle=180)
+    gus.show(["Cone", cone])
+
+    torus = splinepy.helpme.create.torus(10, 2)
+    torus2 = splinepy.helpme.create.torus(
+        5, 2, section_inner_radius=0.5, torus_angle=100, section_angle=210
+    )
+
+    gus.show(["Torus", torus], ["Torus section", torus2], resolution=50)
+
+    sphere = splinepy.helpme.create.sphere(3)
+    gus.show(["Sphere", sphere], resolution=50)