Skip to content

Commit 72e8ccd

Browse files
authored
Merge pull request #67 from AdaptiveParticles/develop
update paper link, revert workflow checkouts
2 parents b1185e8 + ef34280 commit 72e8ccd

File tree

4 files changed

+1
-48
lines changed

4 files changed

+1
-48
lines changed

.github/workflows/build-deploy.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,33 +67,6 @@ jobs:
6767
- name: Submodule recursive
6868
run: git submodule update --init --recursive
6969

70-
# PR/push to develop should use the develop branch of LibAPR
71-
# for pull requests, we set the LibAPR branch based on the target (base) branch
72-
- name: Get branch name (pull request)
73-
if: ${{ github.event_name == 'pull_request' }}
74-
shell: bash
75-
run: echo "BRANCH_NAME=$(echo ${GITHUB_BASE_REF} | tr / -)" >> $GITHUB_ENV
76-
77-
- name: Get branch name (push)
78-
if: ${{ (github.event_name == 'push') && !contains(github.ref, 'tags') }}
79-
shell: bash
80-
run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
81-
82-
- name: Get branch name (tag push)
83-
if: ${{ (github.event_name == 'push') && contains(github.ref, 'tags') }}
84-
shell: bash
85-
run: |
86-
raw=$(git branch -r --contains ${{ github.ref }})
87-
branch=${raw/origin\/}
88-
echo "BRANCH_NAME=$(echo $branch)" >> $GITHUB_ENV
89-
90-
- name: Checkout LibAPR develop/master branch
91-
shell: bash
92-
run: |
93-
echo "checking out branch ${{ env.BRANCH_NAME }} of submodule external/LibAPR"
94-
cd external/LibAPR
95-
git checkout ${{ env.BRANCH_NAME }}
96-
9770
# Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.
9871
- uses: lukka/get-cmake@latest
9972
# Restore both vcpkg and its artifacts from the GitHub cache service.

.github/workflows/deploy-docs.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,6 @@ jobs:
3939

4040
- name: Submodule recursive
4141
run: git submodule update --init --recursive
42-
43-
- name: Get branch name
44-
shell: bash
45-
run: |
46-
raw=$(git branch -r --contains ${{ github.ref }})
47-
branch=${raw/origin\/}
48-
echo "BRANCH_NAME=$(echo $branch)" >> $GITHUB_ENV
49-
50-
- name: Checkout master/develop branch of LibAPR
51-
shell: bash
52-
run: |
53-
echo "checking out branch ${{ env.BRANCH_NAME }} of submodule external/LibAPR"
54-
cd external/LibAPR
55-
git checkout ${{ env.BRANCH_NAME }}
5642

5743
# Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.
5844
- uses: lukka/get-cmake@latest

.github/workflows/quick-test.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ jobs:
4545
- name: Submodule recursive
4646
run: git submodule update --init --recursive
4747

48-
- name: Checkout develop branch of LibAPR
49-
shell: bash
50-
run: |
51-
cd external/LibAPR
52-
git checkout develop
53-
5448
# Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.
5549
- uses: lukka/get-cmake@latest
5650
# Restore both vcpkg and its artifacts from the GitHub cache service.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ can be used directly in a wide range of processing tasks - even on the GPU!
2121

2222
For more detailed information about the APR and its use, see:
2323
- [Adaptive particle representation of fluorescence microscopy images](https://www.nature.com/articles/s41467-018-07390-9) (nature communications)
24-
- [Parallel Discrete Convolutions on Adaptive Particle Representations of Images](https://arxiv.org/abs/2112.03592) (arXiv preprint)
24+
- [Parallel Discrete Convolutions on Adaptive Particle Representations of Images](https://ieeexplore.ieee.org/abstract/document/9796006) (IEEE Transactions on Image Processing)
2525

2626
**pyapr** is built on top of the C++ library [LibAPR] using [pybind11].
2727

0 commit comments

Comments
 (0)