Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New caps dataset #562

Open
wants to merge 41 commits into
base: refactoring
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a9a23b9
Bump sqlparse from 0.4.4 to 0.5.0 (#558)
dependabot[bot] Apr 22, 2024
5e52ca8
concatenation and stacking of capsdatasets +creation from control file
HuguesRoy Apr 22, 2024
d56f705
low level caps dataset class (CapsDatasetImage)
HuguesRoy Apr 22, 2024
1b111d1
reformat
HuguesRoy Apr 22, 2024
4969368
reformat
HuguesRoy Apr 22, 2024
d7c1fba
Typing
HuguesRoy Apr 23, 2024
84811a4
typing : fench to english...
HuguesRoy Apr 23, 2024
e4875cd
compatibility for patch,roi and slices
HuguesRoy Apr 24, 2024
adfc233
Dataloader for paired and unpaired datasets
HuguesRoy Apr 24, 2024
d28a50a
Update clinicadl/utils/caps_dataset/caps_dataset_refactoring/caps_dat…
HuguesRoy Apr 24, 2024
3b9e4dc
Update clinicadl/utils/caps_dataset/caps_dataset_refactoring/caps_dat…
HuguesRoy Apr 24, 2024
c5f27ee
Update clinicadl/utils/caps_dataset/caps_dataset_refactoring/caps_dat…
HuguesRoy Apr 24, 2024
36eb46f
Bump tqdm from 4.66.1 to 4.66.3 (#569)
dependabot[bot] May 4, 2024
fa7f0f1
Bump werkzeug from 3.0.1 to 3.0.3 (#570)
dependabot[bot] May 7, 2024
a05fcd5
Bump jinja2 from 3.1.3 to 3.1.4 (#571)
dependabot[bot] May 7, 2024
76fc265
Update concat_dataset.py
HuguesRoy May 15, 2024
b2fc3e6
Bump mlflow from 2.10.1 to 2.12.1 (#575)
dependabot[bot] May 17, 2024
495d5b9
Bump gunicorn from 21.2.0 to 22.0.0 (#576)
dependabot[bot] May 17, 2024
bdd102a
Bump requests from 2.31.0 to 2.32.0 (#578)
dependabot[bot] May 21, 2024
beccd4c
[CI] Run tests through GitHub Actions (#573)
NicolasGensollen May 22, 2024
2861e9d
[CI] Skip tests when PR is in draft mode (#592)
NicolasGensollen May 23, 2024
f5de251
[CI] Test train workflow on GPU machine (#590)
NicolasGensollen May 23, 2024
69b3538
[CI] Port remaining GPU tests to GitHub Actions (#593)
NicolasGensollen May 23, 2024
c9d9252
[CI] Remove GPU pipeline from Jenkinsfile (#594)
NicolasGensollen May 24, 2024
753f04e
[CI] Port remaining non GPU tests to GitHub Actions (#581)
NicolasGensollen May 24, 2024
c424d77
[CI] Remove jenkins related things (#595)
NicolasGensollen May 24, 2024
52d7561
Add flags to run CI tests locally (#596)
thibaultdvx May 30, 2024
39d22fd
[CI] Remove duplicated verbose flag in test pipelines (#598)
NicolasGensollen May 30, 2024
571662c
[DOC] Update the Python version used for creating the conda environme…
NicolasGensollen May 30, 2024
d54d59c
Flag for local tests (#608)
thibaultdvx May 31, 2024
f20e7fb
Update quality_check.py (#609)
HuguesRoy Jun 4, 2024
f6f382a
Fix issue in compare_folders (#610)
thibaultdvx Jun 4, 2024
52f9492
[INFRA] Update the Makefile `check.lock` target (#603)
NicolasGensollen Jun 4, 2024
996cdd5
[CI] Run unit tests and linter on refactoring branch (#618)
NicolasGensollen Jun 7, 2024
d0d5cd2
Trigger tests when undrafted (#623)
thibaultdvx Jun 12, 2024
dca3802
Bump urllib3 from 1.26.18 to 1.26.19 (#625)
dependabot[bot] Jun 18, 2024
b8d402b
Bump certifi from 2024.2.2 to 2024.7.4 (#634)
dependabot[bot] Jul 8, 2024
6dc2956
Bump zipp from 3.17.0 to 3.19.1 (#635)
dependabot[bot] Jul 10, 2024
b30aac8
Bump setuptools from 69.0.3 to 70.0.0 (#636)
dependabot[bot] Jul 16, 2024
f6d3f25
Bump sentry-sdk from 1.40.1 to 2.8.0 (#638)
dependabot[bot] Jul 19, 2024
94d81e3
Merge branch 'hr_caps_dataset' into caps_dataset
camillebrianceau Jul 31, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: 'Lint codebase'

on:
pull_request:
branches: [ dev ]
branches: [ "dev", "refactoring" ]
push:
branches: [ dev ]
branches: [ "dev", "refactoring" ]

permissions:
contents: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Test

on:
push:
branches: [dev]
branches: ["dev", "refactoring"]
pull_request:
branches: [dev]
branches: ["dev", "refactoring"]

permissions:
contents: read
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/test_cli.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: CLI Tests

on:
push:
branches: ["dev", "refactoring"]
pull_request:
branches: ["dev", "refactoring"]
types: [opened, synchronize, reopened, ready_for_review]

permissions:
contents: read

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

env:
POETRY_VERSION: '1.8.3'
PYTHON_VERSION: '3.11'

jobs:
test-cli:
if: github.event.pull_request.draft == false
runs-on:
- self-hosted
- Linux
- ubuntu
- cpu
steps:
- uses: actions/checkout@v4
- uses: snok/install-poetry@v1
with:
version: ${{ env.POETRY_VERSION }}
virtualenvs-create: false
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Run CLI tests
run: |
source /builds/miniconda3/etc/profile.d/conda.sh
make env.conda
conda activate "${{ github.workspace }}"/env
make install
cd tests
poetry run pytest \
--junitxml=./test-reports/test_cli_report.xml \
--disable-warnings \
--verbose \
test_cli.py
54 changes: 54 additions & 0 deletions .github/workflows/test_generate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Generate Tests

on:
push:
branches: ["dev", "refactoring"]
pull_request:
branches: ["dev", "refactoring"]
types: [opened, synchronize, reopened, ready_for_review]

permissions:
contents: read

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

env:
POETRY_VERSION: '1.8.3'
PYTHON_VERSION: '3.11'

jobs:
test-generate:
if: github.event.pull_request.draft == false
runs-on:
- self-hosted
- Linux
- ubuntu
- cpu
steps:
- uses: actions/checkout@v4
- uses: snok/install-poetry@v1
with:
version: ${{ env.POETRY_VERSION }}
virtualenvs-create: false
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Run tests for generate task
run: |
source /builds/miniconda3/etc/profile.d/conda.sh
make env.conda
conda activate "${{ github.workspace }}"/env
make install
cd tests
poetry run pytest \
--junitxml=./test-reports/test_generate_report.xml \
--disable-warnings \
--verbose \
--basetemp=$HOME/tmp/generate \
--input_data_directory=/mnt/data/data_ci \
test_generate.py
- name: Cleaning
run: |
rm -rf $HOME/tmp/generate
54 changes: 54 additions & 0 deletions .github/workflows/test_interpret.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Interpretation Tests (GPU)

on:
push:
branches: ["dev", "refactoring"]
pull_request:
branches: ["dev", "refactoring"]
types: [opened, synchronize, reopened, ready_for_review]

permissions:
contents: read

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

env:
POETRY_VERSION: '1.8.3'
PYTHON_VERSION: '3.11'

jobs:
test-interpret-gpu:
if: github.event.pull_request.draft == false
runs-on:
- self-hosted
- Linux
- ubuntu
- gpu
steps:
- uses: actions/checkout@v4
- uses: snok/install-poetry@v1
with:
version: ${{ env.POETRY_VERSION }}
virtualenvs-create: false
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Run tests for Interpret task on GPU
run: |
source "${HOME}/miniconda3/etc/profile.d/conda.sh"
make env.conda
conda activate "${{ github.workspace }}"/env
make install
cd tests
poetry run pytest \
--junitxml=./test-reports/test_interpret_report.xml \
--disable-warnings \
--verbose \
--basetemp=$HOME/actions_runner_workdir/interpret \
--input_data_directory=/mnt/data/clinicadl_data_ci/data_ci \
test_interpret.py
- name: Cleaning
run: |
rm -rf $HOME/actions_runner_workdir/interpret/*
54 changes: 54 additions & 0 deletions .github/workflows/test_predict.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Predict Tests

on:
push:
branches: ["dev", "refactoring"]
pull_request:
branches: ["dev", "refactoring"]
types: [opened, synchronize, reopened, ready_for_review]

permissions:
contents: read

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

env:
POETRY_VERSION: '1.8.3'
PYTHON_VERSION: '3.11'

jobs:
test-predict:
if: github.event.pull_request.draft == false
runs-on:
- self-hosted
- Linux
- ubuntu
- cpu
steps:
- uses: actions/checkout@v4
- uses: snok/install-poetry@v1
with:
version: ${{ env.POETRY_VERSION }}
virtualenvs-create: false
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Run tests for predict task
run: |
source /builds/miniconda3/etc/profile.d/conda.sh
make env.conda
conda activate "${{ github.workspace }}"/env
make install
cd tests
poetry run pytest \
--junitxml=./test-reports/test_predict_report.xml \
--disable-warnings \
--verbose \
--basetemp=$HOME/tmp/predict \
--input_data_directory=/mnt/data/data_ci \
test_predict.py
- name: Cleaning
run: |
rm -rf $HOME/tmp/predict/*
54 changes: 54 additions & 0 deletions .github/workflows/test_prepare_data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Prepare data Tests

on:
push:
branches: ["dev", "refactoring"]
pull_request:
branches: ["dev", "refactoring"]
types: [opened, synchronize, reopened, ready_for_review]

permissions:
contents: read

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

env:
POETRY_VERSION: '1.8.3'
PYTHON_VERSION: '3.11'

jobs:
test-prepare-data:
if: github.event.pull_request.draft == false
runs-on:
- self-hosted
- Linux
- ubuntu
- cpu
steps:
- uses: actions/checkout@v4
- uses: snok/install-poetry@v1
with:
version: ${{ env.POETRY_VERSION }}
virtualenvs-create: false
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Run tests for prepare data task
run: |
source /builds/miniconda3/etc/profile.d/conda.sh
make env.conda
conda activate "${{ github.workspace }}"/env
make install
cd tests
poetry run pytest \
--junitxml=./test-reports/test_prepare_data_report.xml \
--disable-warnings \
--verbose \
--basetemp=$HOME/tmp/prepare_data \
--input_data_directory=/mnt/data/data_ci \
test_prepare_data.py
- name: Cleaning
run: |
rm -rf $HOME/tmp/prepare_data/*
54 changes: 54 additions & 0 deletions .github/workflows/test_quality_checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Quality Check Tests

on:
push:
branches: ["dev", "refactoring"]
pull_request:
branches: ["dev", "refactoring"]
types: [opened, synchronize, reopened, ready_for_review]

permissions:
contents: read

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

env:
POETRY_VERSION: '1.8.3'
PYTHON_VERSION: '3.11'

jobs:
test-quality-check:
if: github.event.pull_request.draft == false
runs-on:
- self-hosted
- Linux
- ubuntu
- cpu
steps:
- uses: actions/checkout@v4
- uses: snok/install-poetry@v1
with:
version: ${{ env.POETRY_VERSION }}
virtualenvs-create: false
- uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
- name: Run tests for Quality Check
run: |
source /builds/miniconda3/etc/profile.d/conda.sh
make env.conda
conda activate "${{ github.workspace }}"/env
make install
cd tests
poetry run pytest \
--junitxml=./test-reports/test_quality_check_report.xml \
--disable-warnings \
--verbose \
--basetemp=$HOME/tmp/quality_checks \
--input_data_directory=/mnt/data/data_ci \
test_qc.py
- name: Cleaning
run: |
rm -rf $HOME/tmp/quality_checks/*
Loading