Skip to content

Redo c api interface #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Aaron-Preus merged 4 commits into from
Mar 16, 2026
Merged

Redo c api interface #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72e3601
make bMax accessible in options
Aaron-Preus Mar 15, 2026
b857391
only publish to PyPi on tags
Aaron-Preus Mar 16, 2026
d246135
fix txpo
Aaron-Preus Mar 16, 2026
0eca7e8
windows 2019 is no longer supported
Aaron-Preus Mar 16, 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
6 changes: 3 additions & 3 deletions .github/workflows/build-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
os: [
windows-2025,
windows-2022,
windows-2019,
ubuntu-24.04,
ubuntu-22.04,
] #, macos-14, macos-14-large, macos-15, macos-26]
Expand Down Expand Up @@ -82,7 +81,8 @@ jobs:
pip install pytest scipy
pytest -v

commit_shared_libs:
commit_and_publish:
if: startsWith(github.ref, 'refs/tags/v')
needs: test
runs-on: ubuntu-latest
permissions:
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
- name: build package
run: python -m build

- name: Publish to TestPyPI
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@release/v1

- name: commit shared libraries
Expand Down
9 changes: 0 additions & 9 deletions src/deterministic_gaussian_sampling/approximation/dirac_to_dirac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ def __call__(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wYChecked is None else wYChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
Expand Down Expand Up @@ -126,7 +125,6 @@ def modified_van_mises_distance_sq(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wYChecked is None else wYChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double))
Expand Down Expand Up @@ -174,7 +172,6 @@ def modified_van_mises_distance_sq_derivative(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wYChecked is None else wYChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double))
Expand Down Expand Up @@ -231,7 +228,6 @@ def __call__(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
wX,
wXD,
Expand Down Expand Up @@ -286,7 +282,6 @@ def modified_van_mises_distance_sq(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
wX,
wXD
Expand Down Expand Up @@ -332,7 +327,6 @@ def modified_van_mises_distance_sq_derivative(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
wX,
wXD
Expand Down Expand Up @@ -402,7 +396,6 @@ def __call__(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wYChecked is None else wYChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
Expand Down Expand Up @@ -459,7 +452,6 @@ def modified_van_mises_distance_sq(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wYChecked is None else wYChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double))
Expand Down Expand Up @@ -507,7 +499,6 @@ def modified_van_mises_distance_sq_derivative(
ctypes.c_size_t(M),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wYChecked is None else wYChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double))
Expand Down
6 changes: 0 additions & 6 deletions src/deterministic_gaussian_sampling/approximation/gaussian_to_dirac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ def __call__(
covData.sqrt_eigvals.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
ctypes.byref(minimizer_result),
Expand Down Expand Up @@ -95,7 +94,6 @@ def modified_van_mises_distance_sq(
ctypes.byref(result),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double))
)
Expand Down Expand Up @@ -123,7 +121,6 @@ def modified_van_mises_distance_sq_derivative(
gradientChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double))
)
Expand Down Expand Up @@ -173,7 +170,6 @@ def __call__(
self._parent.gm_to_dirac_snd_double,
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
ctypes.byref(minimizer_result),
Expand Down Expand Up @@ -205,7 +201,6 @@ def modified_van_mises_distance_sq(
ctypes.byref(result),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double))
)
Expand All @@ -230,7 +225,6 @@ def modified_van_mises_distance_sq_derivative(
gradientChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
ctypes.c_size_t(L),
ctypes.c_size_t(N),
ctypes.c_size_t(100),
xChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double)),
None if wXChecked is None else wXChecked.ctypes.data_as(ctypes.POINTER(ctypes.c_double))
)
Expand Down
5 changes: 0 additions & 5 deletions src/deterministic_gaussian_sampling/dll_handling/dynamic_dll_loading.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ def _setup_ctypes_dll(cdll: ctypes.CDLL) -> ctypes.CDLL:
c_size, # M
c_size, # L
c_size, # N
c_size, # bMax
c_double_p, # x
c_double_p, # wX
c_double_p, # wY
Expand Down Expand Up @@ -85,7 +84,6 @@ def _setup_ctypes_dll(cdll: ctypes.CDLL) -> ctypes.CDLL:
c_size,
c_size,
c_size,
c_size,
c_double_p,
ctypes_wrapper.wXCallbackCTypes,
ctypes_wrapper.wXDCallbackCTypes,
Expand Down Expand Up @@ -138,7 +136,6 @@ def _setup_ctypes_dll(cdll: ctypes.CDLL) -> ctypes.CDLL:
c_size,
c_size,
c_size,
c_size,
c_double_p,
c_double_p,
c_double_p,
Expand Down Expand Up @@ -190,7 +187,6 @@ def _setup_ctypes_dll(cdll: ctypes.CDLL) -> ctypes.CDLL:
c_double_p, # sqrt eigenvalues
c_size,
c_size,
c_size,
c_double_p,
c_double_p,
gsl_result_p,
Expand Down Expand Up @@ -236,7 +232,6 @@ def _setup_ctypes_dll(cdll: ctypes.CDLL) -> ctypes.CDLL:
c_void_p,
c_size,
c_size,
c_size,
c_double_p,
c_double_p,
gsl_result_p,
Expand Down
3 changes: 3 additions & 0 deletions src/deterministic_gaussian_sampling/type_wrapper/ctypes_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class ApproximateOptionsCTypes(ctypes.Structure):
("initialX", ctypes.c_bool),
("maxIterations", ctypes.c_size_t),
("verbose", ctypes.c_bool),
("bMax", ctypes.c_size_t),
]

@staticmethod
Expand All @@ -90,6 +91,7 @@ def from_py_type(pyT: "deterministic_gaussian_sampling.type_wrapper.python_varia
ctypes.c_bool(pyT.initialX),
ctypes.c_size_t(pyT.maxIterations),
ctypes.c_bool(pyT.verbose),
ctypes.c_size_t(pyT.bMax),
)

def to_py_type(self):
Expand All @@ -103,6 +105,7 @@ def to_py_type(self):
bool(self.initialX),
int(self.maxIterations),
bool(self.verbose),
int(self.bMax),
)


Expand Down
2 changes: 2 additions & 0 deletions src/deterministic_gaussian_sampling/type_wrapper/python_variant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ class ApproximateOptionsPy:
initialX: bool
maxIterations: int
verbose: bool
bMax: int

def __str__(self):
lines = []
Expand All @@ -126,6 +127,7 @@ def __str__(self):
lines.append(f" initialX: {self.initialX}")
lines.append(f" maxIterations: {self.maxIterations}")
lines.append(f" verbose: {self.verbose}")
lines.append(f" bMax: {self.bMax}")
return "\n".join(lines)

__repr__ = __str__
Expand Down
Loading