Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
79e3669
BLD: Don't unset CMAKE_INSTALL_PREFIX unless in dev mode
RUrlus May 23, 2022
2380e41
update armadillo gitlab branch to 11.2.x
conradsnicta Jun 27, 2022
5673bc7
update armadillo gitlab branch to 11.2.x
conradsnicta Jun 27, 2022
d1bb7d2
CICD: Update minimum Numpy version to one with wheel support
RUrlus Aug 16, 2022
4e9da1b
BLD: update armadillo gitlab branch to 11.4.x
RUrlus Oct 5, 2022
2fcf122
CICD: Update latest Pybind11 and Armadillo versions
RUrlus Oct 5, 2022
efbe052
FIX: Support fixed-size matrices
yaqwsx Oct 19, 2022
2df0a6e
CICD: Update Python versions to include 3.11
RUrlus Dec 8, 2022
46774aa
CICD: Bump checkout and setup-python versions
RUrlus Dec 8, 2022
49d5f77
CICD: Update compiler versions of Clang and GCC
RUrlus Dec 8, 2022
c230baa
CICD: Install Ninja manually to prevent usage of outdated Github action
RUrlus Dec 8, 2022
2a3c414
FIX: Fix lack off size_t on Windows with Python >= 3.10
RUrlus Dec 8, 2022
bd34554
CICD: Use Python 3.8 for minimum Numpy build
RUrlus Dec 8, 2022
8e696b4
CICD: Raise minimum Python version in tests to 3.7
RUrlus Dec 8, 2022
da1dee2
add armadillo 12.0.x branch
conradsnicta Feb 20, 2023
c51d392
add armadillo 12.0.x branch
conradsnicta Feb 20, 2023
8405baf
REL: Release of v0.6.7
RUrlus Apr 1, 2023
65fc27c
PKG: Add citation file and DOI badge
RUrlus Apr 1, 2023
608e00e
update armadillo 12 branch
conradsnicta Apr 10, 2023
2fbc2e6
update armadillo 12 branch
conradsnicta Apr 10, 2023
d6d4d3a
update to armadillo 12.4.x
conradsnicta Jun 19, 2023
cb00829
update to armadillo 12.4.x
conradsnicta Jun 19, 2023
0ff5479
add armadillo 12.6.x
conradsnicta Aug 12, 2023
ea31512
add armadillo 12.6.x
conradsnicta Aug 12, 2023
1a984a4
CICD: Fix missing comma
RUrlus Aug 22, 2023
22f8bd0
add armadillo 12.8.x
conradsnicta Mar 18, 2024
420b755
add armadillo 12.8.x
conradsnicta Mar 18, 2024
2345756
change default version to 12.8.x
conradsnicta Mar 18, 2024
271001a
CICD: Remove unsupported armadillo and pybind11 versions
RUrlus Mar 18, 2024
f2a9877
DEP: Update default Pybind11 version to the lastest one
RUrlus Mar 18, 2024
6461e9e
CICD: Update integration test dependency versions
RUrlus Mar 18, 2024
d24661e
CICD: Update read the docs configuration
RUrlus Mar 20, 2024
da905f7
CICD: Lower python version for RTD
RUrlus Mar 20, 2024
6195ae7
REL: Release v0.7.0
RUrlus Mar 27, 2024
68fcf83
CICD: Update checkout to v4 and Python-version to v5
RUrlus Jun 12, 2024
012ab43
CICD: Sudo install on MacOS and on Linux
RUrlus Jun 12, 2024
2f40b8c
CICD: Don't test CPython 3.7 on ARM based runners
RUrlus Jun 12, 2024
4c966bf
CHG: Make vendored Numpy api compatable with Numpy v2
RUrlus Jun 12, 2024
3c505c9
CICD: Add test for Numpy v2
RUrlus Jun 12, 2024
3f22135
DEP: Update minimum support Pybind11 version to 2.12
RUrlus Jun 12, 2024
746420e
DOC: Document updated Pybind11 version requirements
RUrlus Jun 12, 2024
7a8fbbe
REL: Release v0.8.0
RUrlus Jun 12, 2024
61b717b
Do not unset global CMake variables
hpwxf May 28, 2021
4d0e73f
Customize: add a smooth policy using macro to drive carma mem functions
hpwxf Sep 2, 2021
f45f6f1
Explicity namespace for ssize_t in pybind11
hpwxf Nov 15, 2022
1871e34
fix: PyArray_CopyInto C-API index differs between NumPy 1.x and 2.x
yannrichet Aug 3, 2026
8d74c33
ci: pin runner images to fix stale toolchain infra failures
yannrichet Aug 3, 2026
8962cf7
Merge branch 'feature/numpy2-support' into merge-test
yannrichet Aug 3, 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
20 changes: 8 additions & 12 deletions .github/workflows/asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,20 @@ jobs:
# All of these options are optional, so you can remove them if you are happy with the defaults
cancel_others: 'true'
build:
name: "Asan Python (Clang-10)"
name: "Asan Python (Clang-14)"
needs: pre_job
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
strategy:
fail-fast: True
runs-on: ubuntu-22.04

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: 3.8

- uses: seanmiddleditch/gha-setup-ninja@master
python-version: "3.10"

- name: Print env
run: |
Expand All @@ -46,7 +42,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install --upgrade cmake
python -m pip install --upgrade cmake ninja
ninja --version
cmake --version

Expand All @@ -66,8 +62,8 @@ jobs:
-DCARMA_BUILD_TESTS=ON \
-DBUILD_NATIVE_TESTS=OFF \
-DBUILD_PYTHON_TESTS=ON \
-DCMAKE_C_COMPILER=clang-10 \
-DCMAKE_CXX_COMPILER=clang++-10 \
-DCMAKE_C_COMPILER=clang-14 \
-DCMAKE_CXX_COMPILER=clang++-14 \
-DCMAKE_INSTALL_PREFIX:PATH=. \
-DPython3_EXECUTABLE=${PY_CMD} \
-DCMAKE_BUILD_TYPE=Asan \
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
name: "Default settings",
os: ubuntu-latest,
build_type: "Release",
cc: "gcc-9",
cxx: "g++-9",
cc: "gcc-11",
cxx: "g++-11",
generators: "Ninja",
target: "all",
options: ""
Expand All @@ -46,8 +46,8 @@ jobs:
name: "Hard steal",
os: ubuntu-latest,
build_type: "Release",
cc: "gcc-9",
cxx: "g++-9",
cc: "gcc-11",
cxx: "g++-11",
generators: "Ninja",
target: "all",
options: "-DENABLE_CARMA_HARD_STEAL=ON"
Expand All @@ -56,8 +56,8 @@ jobs:
name: "Soft steal",
os: ubuntu-latest,
build_type: "Release",
cc: "gcc-9",
cxx: "g++-9",
cc: "gcc-11",
cxx: "g++-11",
generators: "Ninja",
target: "all",
options: "-DENABLE_CARMA_SOFT_STEAL=ON"
Expand All @@ -66,23 +66,21 @@ jobs:
name: "Not own data",
os: ubuntu-latest,
build_type: "Release",
cc: "gcc-9",
cxx: "g++-9",
cc: "gcc-11",
cxx: "g++-11",
generators: "Ninja",
target: "all",
options: "-DENABLE_CARMA_DONT_REQUIRE_OWNDATA=ON"
}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: 3.8

- uses: seanmiddleditch/gha-setup-ninja@master
python-version: '3.10'

- name: Print env
run: |
Expand All @@ -91,7 +89,7 @@ jobs:

- name: Install dependencies on ubuntu
run: |
python -m pip install --upgrade cmake
python -m pip install --upgrade cmake ninja
sudo apt install -y lcov
ninja --version
cmake --version
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,18 @@ jobs:
strategy:
fail-fast: false
matrix:
armadillo: ["10.6.x", "10.8.x", "11.1.x"]
pybind: ["v2.6.0", "v2.9.2"]
armadillo: ["10.8.x", "11.4.x", "12.4.x", "12.6.x", "12.8.x"]
pybind: ["v2.12.0"]

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: false

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: 3.8

- uses: seanmiddleditch/gha-setup-ninja@master
python-version: '3.10'

- name: Print env
run: |
Expand All @@ -57,7 +55,7 @@ jobs:

- name: Install dependencies on ubuntu
run: |
python -m pip install --upgrade cmake
python -m pip install --upgrade cmake ninja
ninja --version
cmake --version

Expand All @@ -77,8 +75,8 @@ jobs:
-DCARMA_BUILD_TESTS=ON \
-DUSE_ARMA_VERSION=${{ matrix.armadillo }} \
-DUSE_PYBIND11_VERSION=${{ matrix.pybind }} \
-DCMAKE_C_COMPILER=clang-10 \
-DCMAKE_CXX_COMPILER=clang++-10 \
-DCMAKE_C_COMPILER=clang-14 \
-DCMAKE_CXX_COMPILER=clang++-14 \
-DCMAKE_INSTALL_PREFIX:PATH=. \
-DPython3_EXECUTABLE=${PY_CMD} \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
31 changes: 15 additions & 16 deletions .github/workflows/install_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ jobs:
target: "ALL_BUILD"
}
- {
name: "Ubuntu (Clang-10)",
name: "Ubuntu (Clang-14)",
os: ubuntu-latest,
build_type: "Release",
cc: "clang-10",
cxx: "clang++-10",
cc: "clang-14",
cxx: "clang++-14",
generators: "Ninja",
target: "all"
}
- {
name: "Ubuntu (GCC-9)",
name: "Ubuntu (GCC-11)",
os: ubuntu-latest,
build_type: "Release",
cc: "gcc-9",
cxx: "g++-9",
cc: "gcc-11",
cxx: "g++-11",
generators: "Ninja",
target: "all"
}
Expand All @@ -77,15 +77,13 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: 3.8

- uses: seanmiddleditch/gha-setup-ninja@master
python-version: '3.10'

- name: Print env
run: |
Expand All @@ -95,21 +93,21 @@ jobs:
- name: Install dependencies on windows
if: startsWith(matrix.config.os, 'windows')
run: |
choco install cmake
choco install cmake ninja
ninja --version
cmake --version

- name: Install dependencies on ubuntu
if: runner.os == 'Linux'
run: |
python -m pip install --upgrade cmake
python -m pip install --upgrade cmake ninja
ninja --version
cmake --version

- name: Install dependencies on macos
if: startsWith(matrix.config.os, 'macos')
run: |
python -m pip install cmake
python -m pip install cmake ninja
ninja --version
cmake --version

Expand All @@ -119,7 +117,8 @@ jobs:
python -m pip install numpy pytest

- name: Install CARMA
if: runner.os == 'Linux'
# install with sudo
if: runner.os == 'Linux' || matrix.config.os == 'macos-latest'
run: |
mkdir build
cd build
Expand All @@ -138,7 +137,7 @@ jobs:
sudo cmake --build . --config Release --target install

- name: Install CARMA
if: runner.os != 'Linux'
if: startsWith(matrix.config.os, 'windows')
run: |
mkdir build
cd build
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,47 +37,45 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
config:
- {
name: "Ubuntu (Clang-10)",
name: "Ubuntu (Clang-14)",
os: ubuntu-latest,
build_type: "Release",
cc: "clang-10",
cxx: "clang++-10",
cc: "clang-14",
cxx: "clang++-14",
generators: "Ninja",
target: "all"
}
- {
name: "Ubuntu (GCC-9)",
name: "Ubuntu (GCC-11)",
os: ubuntu-latest,
build_type: "Release",
cc: "gcc-9",
cxx: "g++-9",
cc: "gcc-11",
cxx: "g++-11",
generators: "Ninja",
target: "all"
}

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- uses: seanmiddleditch/gha-setup-ninja@master

- name: Print env
run: |
echo github.event.action: ${{ github.event.action }}
echo github.event_name: ${{ github.event_name }}

- name: Install dependencies on ubuntu
run: |
python -m pip install --upgrade cmake
python -m pip install --upgrade cmake ninja
ninja --version
cmake --version

Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
config:
- {
name: "macOS (Clang)",
Expand All @@ -51,24 +51,22 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: true

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- uses: seanmiddleditch/gha-setup-ninja@master

- name: Print env
run: |
echo github.event.action: ${{ github.event.action }}
echo github.event_name: ${{ github.event_name }}

- name: Install dependencies on macos
run: |
python -m pip install cmake
python -m pip install cmake ninja
ninja --version
cmake --version

Expand Down
Loading