Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
cd6e90b
Initial apptainer CQ file
adam-urbanczyk Apr 14, 2026
d597816
Initial image workflow
adam-urbanczyk Apr 14, 2026
b1dd114
Update path
adam-urbanczyk Apr 14, 2026
1a57544
Try copying everything
adam-urbanczyk Apr 14, 2026
1478fab
Debugging
adam-urbanczyk Apr 14, 2026
d45fbad
Manipulate the env
adam-urbanczyk Apr 14, 2026
19f191f
Try to install cq
adam-urbanczyk Apr 14, 2026
853b518
Debugging
adam-urbanczyk Apr 14, 2026
bb64dd6
Update env file handling
adam-urbanczyk Apr 15, 2026
7843dae
Test after building
adam-urbanczyk Apr 16, 2026
82a3ada
Add git
adam-urbanczyk Apr 16, 2026
dd92ac7
Remove redundant pytest run
adam-urbanczyk Apr 16, 2026
099dd1a
Try to build docker image too
adam-urbanczyk Apr 21, 2026
fd30d24
Remove prefix
adam-urbanczyk Apr 21, 2026
4e06d0d
Debug build
adam-urbanczyk Apr 21, 2026
e298fc4
Remove head
adam-urbanczyk Apr 21, 2026
0ed819b
More debuggig
adam-urbanczyk Apr 21, 2026
273bec4
More debuggig
adam-urbanczyk Apr 21, 2026
c9b323f
More debuggig
adam-urbanczyk Apr 21, 2026
731e2d0
Try chowning opt
adam-urbanczyk Apr 21, 2026
7f69a9b
Trying to produce a MRE
adam-urbanczyk Apr 22, 2026
416c6a1
Less minimal example
adam-urbanczyk Apr 22, 2026
90c4e37
Turn off chown
adam-urbanczyk Apr 22, 2026
2e7447d
Another variant
adam-urbanczyk Apr 22, 2026
aab9018
Revert debugging changes
adam-urbanczyk Apr 23, 2026
60f8b4e
Back to the original env file
adam-urbanczyk Apr 23, 2026
6dda726
Remove redundant test step
adam-urbanczyk Apr 23, 2026
b895c90
Use tmp
adam-urbanczyk Apr 23, 2026
140a5c3
Add a deploy step
adam-urbanczyk Apr 23, 2026
f2e791c
Diffeent temp name for testing
adam-urbanczyk Apr 23, 2026
2302fc9
Explicit name
adam-urbanczyk Apr 24, 2026
3c99e9a
Push docker too
adam-urbanczyk Apr 24, 2026
d9665ae
Add suggestion from lorenzncode
adam-urbanczyk Apr 25, 2026
9acf6e5
Typo fix
adam-urbanczyk Apr 25, 2026
2894f21
Run tests for docker too
adam-urbanczyk Apr 25, 2026
fef4e74
Typo fix
adam-urbanczyk Apr 25, 2026
d2845f4
Only publish on master
adam-urbanczyk Apr 25, 2026
835544c
Adjust if statements
adam-urbanczyk Apr 25, 2026
43a9fbd
Use newer checkout version
adam-urbanczyk Apr 25, 2026
d5f63e2
Add jupyterlab
adam-urbanczyk Apr 27, 2026
bf54ac8
Seperate install files
adam-urbanczyk Apr 27, 2026
6492811
Updated def
adam-urbanczyk Apr 27, 2026
0b03d7b
Update ci
adam-urbanczyk Apr 27, 2026
9150c0c
Specify exact path
adam-urbanczyk Apr 27, 2026
dd49914
Restructure the def file
adam-urbanczyk Apr 27, 2026
e0eccf5
Line endings
adam-urbanczyk Apr 27, 2026
de8d032
Update dockerfile
adam-urbanczyk Apr 28, 2026
1c2c520
Set MYDIR
adam-urbanczyk Apr 28, 2026
09ac786
Publish under branch name
adam-urbanczyk Apr 28, 2026
2d62098
Use branch name everywhere
adam-urbanczyk Apr 28, 2026
c50d8de
Same for sif upload
adam-urbanczyk Apr 28, 2026
c5b3901
Final version
adam-urbanczyk Apr 28, 2026
97a76c7
Update README
adam-urbanczyk Apr 28, 2026
554f654
Update docs
adam-urbanczyk Apr 29, 2026
b841be5
Fixing code blocks
adam-urbanczyk Apr 29, 2026
778cb52
More docs corrections
adam-urbanczyk Apr 29, 2026
fb455c5
Change dir to opt for docker
adam-urbanczyk May 1, 2026
0e6abc5
Do not install in editable mode
adam-urbanczyk May 1, 2026
9d07e62
Update docs
adam-urbanczyk May 1, 2026
274835c
Better shell
adam-urbanczyk May 7, 2026
05f155a
Add a test
adam-urbanczyk May 8, 2026
c86691c
History handling fix
adam-urbanczyk May 8, 2026
ad098cf
Output issues when performing check
adam-urbanczyk May 8, 2026
4dc4a8d
Add verbose flag
adam-urbanczyk May 8, 2026
8dfca2a
Add reverse
adam-urbanczyk May 8, 2026
55a3b71
Black
adam-urbanczyk May 8, 2026
b7db67c
Extend siblings
adam-urbanczyk May 8, 2026
8ae7c7a
Extend siblings
adam-urbanczyk May 8, 2026
e41ab1c
Merge branch 'master' into adam-shape-fixes
adam-urbanczyk May 8, 2026
012cbc7
Fix failure
adam-urbanczyk May 8, 2026
52d7c8c
Use better solver
adam-urbanczyk May 8, 2026
fb60a06
Fix failing test
adam-urbanczyk May 8, 2026
5135eb2
Improve siblings coverage
adam-urbanczyk May 9, 2026
b936482
Improve coverage of free func utils
adam-urbanczyk May 9, 2026
dafbdd2
Merge branch 'master' into adam-shape-fixes
adam-urbanczyk May 9, 2026
5d34edd
Trigger different path
adam-urbanczyk May 9, 2026
eeb3125
Use the same solver in both overloads
adam-urbanczyk May 9, 2026
31e7a48
Merge branch 'adam-shape-fixes' of https://github.com/CadQuery/cadque…
adam-urbanczyk May 9, 2026
a0ba567
Fix test
adam-urbanczyk May 10, 2026
225f0b3
Tweak solver params
adam-urbanczyk May 10, 2026
76c9c52
Added offset2D
adam-urbanczyk May 11, 2026
470c23e
Extend offset2D
adam-urbanczyk May 13, 2026
4a6a9d1
Add test for offset2D
adam-urbanczyk May 13, 2026
88e5463
Update func
adam-urbanczyk May 13, 2026
d8f7790
Tweak docstring
adam-urbanczyk May 14, 2026
351d9ef
Merge branch 'master' into adam-shape-fixes
adam-urbanczyk May 14, 2026
6cc6965
Update cadquery/occ_impl/shapes.py
adam-urbanczyk May 16, 2026
b1b6af1
Fix siblings
adam-urbanczyk May 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cadquery/func.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
extrude,
revolve,
offset,
offset2D,
sweep,
loft,
check,
Expand Down
26 changes: 17 additions & 9 deletions cadquery/occ_impl/nurbs.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from numpy.typing import NDArray
from numpy import linspace, ndarray

from casadi import ldl, ldl_solve
from casadi import ldl, ldl_solve, Linsol, DM, solve

from OCP.Geom import Geom_BSplineCurve, Geom_BSplineSurface
from OCP.TColgp import TColgp_Array1OfPnt, TColgp_Array2OfPnt
Expand Down Expand Up @@ -1454,7 +1454,9 @@ def uIsoMatrix(surf: Surface, u: float) -> COO:
nu = surf.pts.shape[0]
nv = surf.pts.shape[1]

block = designMatrix(np.atleast_1d(u), surf.uorder, surf.uknots, surf.uperiodic)
block = designMatrix(
np.atleast_1d(np.array(u)), surf.uorder, surf.uknots, surf.uperiodic
)

shape = (nv, nu * nv)

Expand All @@ -1481,7 +1483,9 @@ def vIsoMatrix(surf: Surface, v: float) -> COO:
nu = surf.pts.shape[0]
nv = surf.pts.shape[1]

block = designMatrix(np.atleast_1d(v), surf.vorder, surf.vknots, surf.vperiodic)
block = designMatrix(
np.atleast_1d(np.array(v)), surf.vorder, surf.vknots, surf.vperiodic
)

shape = (nu, nu * nv)

Expand Down Expand Up @@ -1853,8 +1857,9 @@ def approximate2D(
CtC = C.T @ C

# solve normal equations
D, L, P = ldl(CtC, False)
pts = ldl_solve(C.T @ data, D, L, P).toarray()
CtC = DM(CtC)
ldl = Linsol("mumps", "mumps", CtC.sparsity())
Comment thread
adam-urbanczyk marked this conversation as resolved.
pts = ldl.solve(CtC, C.T @ data).toarray()

# construct the result
rv = Surface(
Expand Down Expand Up @@ -1927,8 +1932,10 @@ def constrainedApproximate2D(
LHS = sp.bmat(((CtC_xyz, As.coo().T,), (As.coo(), None)))
RHS = np.concatenate((C_xyz.T @ data.flatten(order="F"), bs))

D, L, P = ldl(LHS, False)
sol = ldl_solve(RHS, D, L, P).toarray()
LHS_DM = DM(LHS)
ldl = Linsol("mumps", "mumps", LHS_DM.sparsity())
sol = ldl.solve(LHS_DM, RHS).toarray()

pts = sol[: CtC_xyz.shape[0]]

# construct the result
Expand Down Expand Up @@ -2006,8 +2013,9 @@ def constrainedApproximate2D(
LHS = CtC
RHS = C.T @ data[:, i]

D, L, P = ldl(LHS, False)
sol = ldl_solve(RHS, D, L, P).toarray()
LHS_DM = DM(LHS)
ldl = Linsol("mumps", "mumps", LHS_DM.sparsity())
sol = ldl.solve(LHS_DM, RHS).toarray()
pts.append(sol[: CtC.shape[0]])

# construct the result
Expand Down
Loading