Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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-cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
python-version: 3.8

- name: Cache pip packages
uses: actions/cache@v5
uses: actions/cache@v6
continue-on-error: true
with:
path: ~/.cache/pip
Expand All @@ -66,7 +66,7 @@ jobs:

- name: Cache ccache (Ubuntu)
if: matrix.os == 'ubuntu-latest'
uses: actions/cache@v5
uses: actions/cache@v6
continue-on-error: true
with:
path: ~/.cache/ccache
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
shell: bash

- name: Restore build cache
uses: actions/cache@v5
uses: actions/cache@v6
continue-on-error: true
with:
path: ${{ runner.workspace }}/build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-metal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
python-version: '3.12'

- name: Cache pip packages
uses: actions/cache@v5
uses: actions/cache@v6
continue-on-error: true
with:
path: ~/Library/Caches/pip
Expand All @@ -57,7 +57,7 @@ jobs:
shell: bash

- name: Cache ccache
uses: actions/cache@v5
uses: actions/cache@v6
continue-on-error: true
with:
path: ~/Library/Caches/ccache
Expand All @@ -69,7 +69,7 @@ jobs:
uses: lukka/get-cmake@v4.3.3

- name: Restore build cache
uses: actions/cache@v5
uses: actions/cache@v6
continue-on-error: true
with:
path: ${{ runner.workspace }}/build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-opencl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
python-version: 3.8

- name: Cache pip packages
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
Expand All @@ -76,7 +76,7 @@ jobs:

- name: Cache ccache (Ubuntu)
if: matrix.os == 'ubuntu-latest'
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ~/.cache/ccache
key: ${{ runner.os }}-ccache-opencl-${{ hashFiles('clic/**', 'cmake/**') }}
Expand All @@ -88,7 +88,7 @@ jobs:

- name: Cache OpenCL dependencies
if: matrix.opencl-required == true
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ${{ runner.workspace }}/opencl-cache
key: opencl-${{ matrix.name }}-${{ env.opencl-icd-loader-git-tag }}-${{ env.opencl-headers-git-tag }}
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
shell: bash -l {0}

- name: Restore build cache
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ${{ runner.workspace }}/build
key: ${{ runner.os }}-opencl-build-${{ matrix.cmake-build-type }}-${{ hashFiles('CMakeLists.txt', 'clic/**', 'cmake/**') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_and_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
shell: bash

- name: Cache CMake build
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ${{ runner.workspace }}/build
key: cmake-${{ runner.os }}-${{ matrix.buildtype }}-${{ hashFiles('CMakeLists.txt', 'clic/**', 'cmake/**') }}
Expand Down
2 changes: 1 addition & 1 deletion clic/include/tier4.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ threshold_mean_func(const Device::Pointer & device, const Array::Pointer & src,
* @brief Takes label map and its corresponding quantifications table and plots the requested property (e.g., 'mean_intensity')
* on to the labels. The resulting image is a parametric map of the requested property.
*
* NOTE: The quantification table can be generated using labels_statistics or labels_neighbors_statistics functions,
* NOTE: The quantification table can be generated using labels_statistics or labels_neighbors_statistics functions,
* with the 'include_background' parameter set to 'True'.
*
* @param device Device to perform the operation on. [const Device::Pointer &]
Expand Down
4 changes: 2 additions & 2 deletions clic/src/tier4/parametrics_map.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ parametric_map_func(const Device::Pointer & device,
throw std::runtime_error("Property '" + target_property + "' not found in statistics");
}

auto nb_labels = tier2::maximum_of_all_pixels_func(device, labels) + 1;
auto nb_labels = tier2::maximum_of_all_pixels_func(device, labels) + 1;
auto vector = properties.at(lower_property_name);

// check if the vector size matches the number of labels
if (vector.size() != nb_labels)
{
vector.insert(vector.begin(), 0);
vector.insert(vector.begin(), 0);
}

auto values = Array::create(vector.size(), 1, 1, 1, dType::FLOAT, mType::BUFFER, device);
Expand Down
2 changes: 1 addition & 1 deletion clic/src/tier7/neighborhood_label_statistics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ labels_neighbors_statistics_func(const Device::Pointer & device,
const std::vector<int> & proximal_distances,
const std::vector<int> & nearest_neighbor_ns,
const std::vector<int> & dilation_radii,
bool. include_background) -> StatisticsMap
bool.include_background) -> StatisticsMap
{
auto nei_stats = compute_neighbors_statistics_per_labels(device, label, proximal_distances, nearest_neighbor_ns, dilation_radii);

Expand Down
Loading