Skip to content

Commit

Permalink
Merge branch 'master' into concat-tracks
Browse files Browse the repository at this point in the history
  • Loading branch information
skoudoro committed Jan 12, 2024
2 parents 43c97d6 + 443f702 commit 79a7559
Show file tree
Hide file tree
Showing 61 changed files with 936 additions and 594 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
cibw_python: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
cibw_python: ["cp39-*", "cp310-*", "cp311-*", "cp312-*"]
cibw_manylinux: [manylinux2014]
cibw_arch: ["x86_64", "aarch64"]
steps:
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
fail-fast: false
matrix:
os: [macos-latest]
cibw_python: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
cibw_python: ["cp39-*", "cp310-*", "cp311-*", "cp312-*"]
cibw_manylinux: [manylinux1]
cibw_arch: ["x86_64", "arm64"]
steps:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
cibw_python: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
cibw_python: ["cp39-*", "cp310-*", "cp311-*", "cp312-*"]
cibw_arch: ["AMD64"]
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
uses: ./.github/workflows/test_template.yml
with:
runs-on: '["ubuntu-latest", "macos-latest", "windows-latest"]'
python-version: '["3.8", "3.9", "3.10", 3.11, 3.12]'
python-version: '["3.9", "3.10", 3.11, 3.12]'
6 changes: 0 additions & 6 deletions .github/workflows/test_compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ concurrency:
cancel-in-progress: true

jobs:
minimal-py38:
uses: ./.github/workflows/test_template.yml
with:
runs-on: '["ubuntu-latest", ]'
python-version: '["3.8", ]'
depends: cython==0.29.24 numpy==1.19.5 scipy==1.8 nibabel==4.0.0 h5py==3.0.0 tqdm
minimal-py39:
uses: ./.github/workflows/test_template.yml
with:
Expand Down
2 changes: 1 addition & 1 deletion dipy/align/bundlemin.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cdef cnp.dtype f64_dt = np.dtype(np.float64)


cdef double min_direct_flip_dist(double *a,double *b,
cnp.npy_intp rows) nogil:
cnp.npy_intp rows) noexcept nogil:
r""" Minimum of direct and flip average (MDF) distance [Garyfallidis12]
between two streamlines.
Expand Down
8 changes: 4 additions & 4 deletions dipy/align/crosscorr.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ cimport cython
cimport numpy as cnp


cdef inline int _int_max(int a, int b) nogil:
cdef inline int _int_max(int a, int b) noexcept nogil:
r"""
Returns the maximum of a and b
"""
return a if a >= b else b


cdef inline int _int_min(int a, int b) nogil:
cdef inline int _int_min(int a, int b) noexcept nogil:
r"""
Returns the minimum of a and b
"""
Expand All @@ -32,7 +32,7 @@ cdef enum:
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
cdef inline int _wrap(int x, int m)nogil:
cdef inline int _wrap(int x, int m) noexcept nogil:
r""" Auxiliary function to `wrap` an array around its low-end side.
Negative indices are mapped to last coordinates so that no extra memory
is required to account for local rectangular windows that exceed the
Expand All @@ -57,7 +57,7 @@ cdef inline void _update_factors(double[:, :, :, :] factors,
floating[:, :, :] moving,
floating[:, :, :] static,
cnp.npy_intp ss, cnp.npy_intp rr, cnp.npy_intp cc,
cnp.npy_intp s, cnp.npy_intp r, cnp.npy_intp c, int operation)nogil:
cnp.npy_intp s, cnp.npy_intp r, cnp.npy_intp c, int operation)noexcept nogil:
r"""Updates the precomputed CC factors of a rectangular window
Updates the precomputed CC factors of the rectangular window centered
Expand Down
2 changes: 1 addition & 1 deletion dipy/align/sumsqdiff.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cdef extern from "dpy_math.h" nogil:
@cython.cdivision(True)
cdef void _solve_2d_symmetric_positive_definite(double* A, double* y,
double det,
double* out) nogil:
double* out) noexcept nogil:
r"""Solves a 2-variable symmetric positive-definite linear system
The C implementation of the public-facing Python function
Expand Down
6 changes: 3 additions & 3 deletions dipy/align/transforms.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ cdef class Transform:
cdef:
int number_of_parameters
int dim
cdef int _jacobian(self, double[:] theta, double[:] x, double[:, :] J)nogil
cdef void _get_identity_parameters(self, double[:] theta) nogil
cdef void _param_to_matrix(self, double[:] theta, double[:, :] T)nogil
cdef int _jacobian(self, double[:] theta, double[:] x, double[:, :] J) noexcept nogil
cdef void _get_identity_parameters(self, double[:] theta) noexcept nogil
cdef void _param_to_matrix(self, double[:] theta, double[:, :] T) noexcept nogil
Loading

0 comments on commit 79a7559

Please sign in to comment.