Skip to content

Commit

Permalink
Merge pull request #52 from 3DOM-FBK/dev
Browse files Browse the repository at this point in the history
DIM version 1.0.0
  • Loading branch information
franioli committed Mar 19, 2024
2 parents 627a710 + 8c8a3a4 commit 5df2a9e
Show file tree
Hide file tree
Showing 93 changed files with 34,401 additions and 1,917 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run_lint_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: lint_and_format

on:
push:
branches: [master, dev]
branches: "*" # Run on all branches
pull_request:
branches: [master, dev]

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/run_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: run-test

on:
push:
branches: [master, dev]
branches: "*" # Run on all branches
pull_request:
branches: [master, dev]

Expand All @@ -29,7 +29,6 @@ jobs:
python -m pip install --upgrade pip
pip install -e .
pip install pycolmap
pip install einops
- name: Test with pytest
run: |
pytest
4 changes: 2 additions & 2 deletions .github/workflows/run_test_win.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: run-test
name: run-test-win

on:
push:
branches: [master, dev]
branches: "*" # Run on all branches
pull_request:
branches: [master, dev]

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ fra_*
sb_*
config.yaml
run_casalbagliano.sh
config/cameras_test.yaml

# VScode
.vscode/
Expand Down
53 changes: 53 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
cff-version: 1.2.0
message: "If you use this software, please cite it as below."
authors:
- family-names: "Morelli"
given-names: "Luca"
orcid: "0000-0001-7180-2279"
- family-names: "Ioli"
given-names: "Francesco"
orcid: "0000-0001-7429-891X"
- family-names: "Maiwald"
given-names: "Ferdinand"
orcid: "0000-0002-2456-9731"
- family-names: "Mazzacca"
given-names: "Gabriele"
- family-names: "Menna"
given-names: "Fabio"
orcid: "0000-0002-5365-8813"
- family-names: "Remondino"
given-names: "Fabio"
orcid: "0000-0001-6097-5342"
title: "DEEP-IMAGE-MATCHING: A TOOLBOX FOR MULTIVIEW IMAGE MATCHING OF COMPLEX SCENARIOS"
version: 0.1.0
doi: 10.5194/isprs-archives-XLVIII-2-W4-2024-309-2024
date-released: 2024-02-15
url: "https://isprs-archives.copernicus.org/articles/XLVIII-2-W4-2024/309/2024"

preferred-citation:
type: article
authors:
- family-names: "Morelli"
given-names: "Luca"
orcid: "0000-0001-7180-2279"
- family-names: "Ioli"
given-names: "Francesco"
orcid: "0000-0001-7429-891X"
- family-names: "Maiwald"
given-names: "Ferdinand"
orcid: "0000-0002-2456-9731"
- family-names: "Mazzacca"
given-names: "Gabriele"
- family-names: "Menna"
given-names: "Fabio"
orcid: "0000-0002-5365-8813"
- family-names: "Remondino"
given-names: "Fabio"
orcid: "0000-0001-6097-5342"
doi: "10.1007/s41064-023-00272-w"
journal: "The International Archives of the Photogrammetry, Remote Sensing and Spatial Information Sciences"
start: 309 # First page number
end: 316 # Last page number
title: "DEEP-IMAGE-MATCHING: A TOOLBOX FOR MULTIVIEW IMAGE MATCHING OF COMPLEX SCENARIOS"
volume: XLVIII-2/W4-2024
year: 2024
38 changes: 38 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
FROM pytorch/pytorch:2.2.0-cuda12.1-cudnn8-runtime

ARG BRANCH=master

# Set environment variables
ENV DEBIAN_FRONTEND=noninteractive

# Install system dependencies
RUN apt-get update && \
apt-get install -y \
git \
python3.10-venv \
libglib2.0-0 \
ffmpeg \
libsm6 \
libxext6


# Clone repo
RUN git clone https://github.com/3DOM-FBK/deep-image-matching.git /workspace/dim
WORKDIR /workspace/dim

# Checkout the specified branch
RUN git checkout ${BRANCH}

# Create virtual environment
RUN python3.10 -m venv /venv
ENV PATH=/venv/bin:$PATH

# Install deep-image-matching
RUN python3 -m pip install --upgrade pip
RUN pip3 install setuptools
RUN pip3 install torch torchvision
RUN pip3 install -e .
RUN pip3 install pycolmap

# Running the tests:
RUN python -m pytest
Loading

0 comments on commit 5df2a9e

Please sign in to comment.