Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
166 commits
Select commit Hold shift + click to select a range
38d38e2
initial commit
lyna1404 May 28, 2024
e60307a
Implemented datasets module with tests
lyna1404 May 28, 2024
98f6638
added init files to det3pa and tests folders
lyna1404 May 28, 2024
3a85989
added environment.yml file
lyna1404 May 28, 2024
723a175
updated environment.yml
lyna1404 May 28, 2024
76bf938
added Github Actions CI workflow
lyna1404 May 28, 2024
5f3a3c1
updated Github Actions ci workflow
lyna1404 May 29, 2024
922db3d
updated Github Actions ci workflow
lyna1404 May 29, 2024
4568daf
updated environment.yml
lyna1404 May 29, 2024
c99c792
updated Github Actions ci workflow
lyna1404 May 29, 2024
897e146
updated Github Actions ci workflow
lyna1404 May 29, 2024
546aa5f
implemented models subpackage along with its unittests
lyna1404 Jun 2, 2024
b44f1ec
finalizing the package docs
lyna1404 Jun 10, 2024
21b3bcb
package documentation
lyna1404 Jun 11, 2024
d7a26e1
Package code review
lyna1404 Jun 18, 2024
de02352
updated ci.yml
lyna1404 Jun 18, 2024
80815d4
updated ci.yml
lyna1404 Jun 18, 2024
2a25e46
Add : .gitignore file
lyna1404 Jun 28, 2024
5e386c6
Add : experiments
lyna1404 Jun 28, 2024
3f610c2
took into consideration code review comments
lyna1404 Jun 28, 2024
be4df36
last fixes
lyna1404 Jul 2, 2024
fe93583
added readme file
lyna1404 Jul 2, 2024
d1b460c
updated readme file
lyna1404 Jul 2, 2024
7d07a68
updated ci workflow
lyna1404 Jul 2, 2024
aca8512
Create LICENSE
lyna1404 Jul 2, 2024
e620fcf
Update LICENSE
lyna1404 Jul 2, 2024
400b60d
readthedocs publication
lyna1404 Jul 2, 2024
34537ca
readthedocs.yml and setup.py added
lyna1404 Jul 2, 2024
86cebdd
Merge branch 'main' of https://github.com/lyna1404/det3pa
lyna1404 Jul 2, 2024
c8d9f97
update readthedocs requirements file
lyna1404 Jul 2, 2024
1b25903
modified directory name
lyna1404 Jul 2, 2024
ff756d8
updated the setup.py
lyna1404 Jul 2, 2024
7ef895d
updated the docs conf.py
lyna1404 Jul 2, 2024
c9557f0
updated readthedocs.yml
lyna1404 Jul 2, 2024
df4a140
updated readthedocs.yml
lyna1404 Jul 2, 2024
c1fed4d
updated the docs
lyna1404 Jul 2, 2024
3603c43
updated python required version
lyna1404 Jul 3, 2024
8935641
updated python required version
lyna1404 Jul 3, 2024
baacf3d
updated ci workflow
lyna1404 Jul 3, 2024
25afbe7
updated ci workflow
lyna1404 Jul 3, 2024
4e3bf68
updated readme images
lyna1404 Jul 3, 2024
12ace96
update .gitignore
lyna1404 Jul 4, 2024
19db39c
updated the release version
lyna1404 Jul 4, 2024
adaa57b
updated the ci workflows
lyna1404 Jul 4, 2024
26d6f61
updated the ci workflows
lyna1404 Jul 4, 2024
07f2b7c
updated the ci workflows
lyna1404 Jul 4, 2024
f888ade
updated the ci workflows
lyna1404 Jul 4, 2024
c533451
updated the ci workflows
lyna1404 Jul 4, 2024
ca3b0a2
updated the ci workflows
lyna1404 Jul 4, 2024
104c069
updated the ci workflows
lyna1404 Jul 4, 2024
8b47707
updated the ci workflows
lyna1404 Jul 4, 2024
196fb38
updated the ci workflows
lyna1404 Jul 4, 2024
f996684
updated the ci workflows
lyna1404 Jul 4, 2024
80ec5cb
updated the ci workflows
lyna1404 Jul 4, 2024
b15d097
updated the ci workflows
lyna1404 Jul 4, 2024
5c899c1
updated the ci workflows
lyna1404 Jul 4, 2024
f796327
updated the ci workflows
lyna1404 Jul 4, 2024
6b46207
updated the ci workflows
lyna1404 Jul 4, 2024
66b3550
updated the ci workflows
lyna1404 Jul 4, 2024
b93958a
updated python versions
lyna1404 Jul 5, 2024
ec88a39
updated dependencies
lyna1404 Jul 5, 2024
56a4237
updated dependencies
lyna1404 Jul 5, 2024
c0648c2
added experiments configuration saving
lyna1404 Jul 5, 2024
ec09fd4
updated Results structure of Med3pa
lyna1404 Jul 5, 2024
2f7cc70
updated release version
lyna1404 Jul 5, 2024
dd8d0e8
updated dependencies version
lyna1404 Jul 6, 2024
743abb1
updated release version
lyna1404 Jul 6, 2024
8b109a8
migrated to python 3.9
lyna1404 Jul 7, 2024
c54aef8
migrated to python 3.9
lyna1404 Jul 7, 2024
308199d
migrated to python 3.9
lyna1404 Jul 7, 2024
2d578a3
fixed dependencies issues
lyna1404 Jul 9, 2024
1e44495
updated results structure
lyna1404 Jul 9, 2024
8bc6fe3
updated model params
lyna1404 Jul 9, 2024
d84fb04
added file_path saving
lyna1404 Jul 9, 2024
b328161
fixed med3pa and added comparaison
lyna1404 Jul 16, 2024
14b5375
added fixed ipc and apc, detectron comparaison and config files
lyna1404 Jul 22, 2024
bf7bee3
added fixed ipc and apc, detectron comparaison and config files
lyna1404 Jul 22, 2024
b8f3fda
updated setup.py
lyna1404 Jul 22, 2024
5fca745
added option to use same models for test set
lyna1404 Jul 22, 2024
05b39d8
added option to use same models for test set
lyna1404 Jul 22, 2024
51a5924
added option to use same models for test set
lyna1404 Jul 22, 2024
a4ee9e2
some fixes in med3pa
lyna1404 Jul 24, 2024
7ddef9b
updated model saving in med3pa + subpackage classes
lyna1404 Jul 24, 2024
6d33c30
updated med3pa models saving
lyna1404 Jul 24, 2024
a847a96
imported comparison modules
lyna1404 Jul 25, 2024
95adbe9
fixed detectron by profiles
lyna1404 Jul 25, 2024
4fe170a
med3pa fixes
lyna1404 Jul 26, 2024
bd5c1f5
fixed comparison
lyna1404 Jul 28, 2024
543a585
fixed detectron comparison
lyna1404 Jul 29, 2024
e8ceb59
Update setup.py
lyna1404 Jul 29, 2024
d753826
updated detectron comparison
lyna1404 Jul 30, 2024
11d8d91
updated setup.py
lyna1404 Jul 30, 2024
ba30346
Merge branch 'main' of https://github.com/MEDomics-UdeS/MED3pa
lyna1404 Jul 30, 2024
849b3fd
updated setup.py
lyna1404 Jul 30, 2024
a58785e
Added sigmoidal error
Olivier998 Aug 6, 2024
7f670bc
Formatting
Olivier998 Sep 5, 2024
bd33a5a
Med3paResults file creation
Olivier998 Sep 5, 2024
3b24e2f
Filename correction
Olivier998 Sep 5, 2024
5ffd344
Added ensemble rf
Olivier998 Sep 10, 2024
af95ee9
updated github url
Olivier998 Sep 10, 2024
745250a
Uniformised metrics arguments
Olivier998 Sep 18, 2024
f3eff52
Removed default threshold
Olivier998 Sep 19, 2024
1ebea8c
Removed need of validation set
Olivier998 Oct 4, 2024
ce5ca24
Adapted models for external use
Olivier998 Oct 4, 2024
7b69c54
Generate Med3paResults file from a dict instead of filepath
Olivier998 Oct 16, 2024
59cdd8e
ensure arrays correction
Olivier998 Oct 17, 2024
7921f1a
Ensure arrays correction2
Olivier998 Oct 17, 2024
514f0c9
removed seed object and function
Olivier998 Oct 21, 2024
2c3a856
Default all_dr to False
Olivier998 Oct 21, 2024
c118817
Added ray in detectron runs
Olivier998 Oct 21, 2024
7db567a
Small corrections
Olivier998 Oct 23, 2024
a9892b1
Small correction
Olivier998 Oct 30, 2024
ddeeb91
float flatten correction
Olivier998 Nov 15, 2024
1bf55b6
added ray in ipc optim
Olivier998 Nov 26, 2024
cef850c
modified ray configuration
Olivier998 Nov 27, 2024
34c9ecf
stored shared variables on the cluster
Nov 27, 2024
8ea1ab6
Added more processes to ray/changed detectron by profiles
Olivier998 Nov 27, 2024
0210d91
Removed uncorrect abstractmethod decorator
Nov 28, 2024
7fd4744
sent basemodel on the cluster
Nov 28, 2024
bed5498
removed ray in med3pa
Olivier998 Nov 28, 2024
e9cf212
Changed xgboost version
Olivier998 Nov 28, 2024
9f943bd
Update mdr.py
Olivier998 Nov 29, 2024
e181c6b
Changed matplotlib background
Olivier998 Nov 29, 2024
56071cb
Merge branch 'modifs_oli' of https://github.com/MEDomics-UdeS/MED3pa …
Olivier998 Nov 29, 2024
4459094
Corrections on filtering by profiles and DR
Olivier998 Nov 29, 2024
067a243
error import matplotlib
Olivier998 Nov 29, 2024
d7bde3f
corrections
Olivier998 Nov 30, 2024
e92dffc
removed redundant ray init
Olivier998 Nov 30, 2024
5a77acf
test without tqdm
Olivier998 Nov 30, 2024
fce3c77
profile filtering correction and added tqdm
Olivier998 Nov 30, 2024
b595a18
test with ray wait
Olivier998 Nov 30, 2024
d9d1a22
revert changes, bug from cluster
Olivier998 Nov 30, 2024
689cd24
Added more profiles in parallel with ray
Olivier998 Nov 30, 2024
bfde24d
forgot ray init
Olivier998 Nov 30, 2024
4a03564
arguments correction
Olivier998 Nov 30, 2024
cc205bd
global tqdm progress bar
Olivier998 Dec 1, 2024
2b0408d
forgot update
Olivier998 Dec 1, 2024
290863f
only doing detectron on whole dataset once
Olivier998 Dec 1, 2024
84cd790
forgot import copy
Olivier998 Dec 1, 2024
d9f84aa
try adding ray to gridsearchcv
Olivier998 Dec 3, 2024
ba8c586
Removed numpy inf, incompatible with json
Olivier998 Dec 12, 2024
4725d58
Added checkpointing and limited number of ray tasks sent
Olivier998 Dec 30, 2024
55e1bcc
ray wait correction
Olivier998 Dec 31, 2024
41ec467
wait few seconds before sending new tasks
Olivier998 Dec 31, 2024
7a8dcb4
path uniformity for checkpointing with ray
Olivier998 Jan 1, 2025
4e48866
test
Olivier998 Jan 2, 2025
862b067
test
Olivier998 Jan 2, 2025
ff8f121
test
Olivier998 Jan 2, 2025
fac52c6
Added preprocessing on args for checkpointing
Olivier998 Jan 2, 2025
93ee86f
remove weight balance when 1 class
Olivier998 Jan 4, 2025
1d89926
removed ray from ipc optimize
Olivier998 Jan 8, 2025
7977af9
main checkpointer format to pickle
Olivier998 Jan 8, 2025
8cc17d9
added ray shutdown to allow resources redistribution
Olivier998 Jan 9, 2025
6f82348
modifs review
Olivier998 Jul 29, 2025
d35a75b
readme correction
Olivier998 Jul 29, 2025
0d39064
changed readme
Olivier998 Jul 29, 2025
6f925d2
modifs pour review
Olivier998 Jul 29, 2025
1bc0746
corrected links
Olivier998 Jul 29, 2025
d3562c3
Merge branch 'code_review' into review
Olivier998 Jul 29, 2025
97e456e
removed .keys for dict to list conversion
Olivier998 Aug 13, 2025
9326792
modifs code review
Olivier998 Aug 20, 2025
72233c7
saving model instance rather than sub-instance
Olivier998 Aug 20, 2025
a4367ca
added MED3pa usage example
Olivier998 Aug 26, 2025
1fda1f2
removed deprecated folders
Olivier998 Aug 26, 2025
395c1ce
updated readme
Olivier998 Aug 26, 2025
6bd16c5
updated readthedocs
Olivier998 Sep 5, 2025
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
52 changes: 52 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: CI

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
build:
runs-on: windows-latest

strategy:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12']

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Install Miniconda on Windows
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true

- name: Create Conda environment
run: |
conda env create -f environment.yaml

- name: Activate Conda environment and run tests
run: |
conda activate MED3pa
python -m unittest discover -s tests
shell: cmd

- name: Install dependencies for documentation
run: |
conda activate MED3pa
conda install sphinx sphinx_rtd_theme
shell: cmd

- name: Build documentation
run: |
conda activate MED3pa
cd docs
make html
shell: cmd
63 changes: 63 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Upload Python Package to PyPI and Deploy Documentation to Read the Docs

on:
release:
types: [created]

jobs:
pypi-publish:
name: Publish release to PyPI and Deploy Documentation
runs-on: ubuntu-latest

permissions:
id-token: write
contents: read

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: "3.12"

- name: Install Miniconda
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true

- name: Initialize Conda
run: |
conda init bash
shell: bash

- name: Create Conda environment
run: |
conda env create -f environment.yaml

- name: Activate Conda environment
run: |
source ~/.bashrc
conda activate MED3pa
shell: bash

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel setuptools-scm sphinx sphinx_rtd_theme

- name: Clean dist directory
run: |
rm -rf dist/

- name: Build package
run: |
python setup.py sdist bdist_wheel # Could also be python -m build

- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
repository-url: https://upload.pypi.org/legacy/
skip-existing: true

34 changes: 34 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Ignore Python bytecode files
*.pyc
*.pyo
__pycache__/

# Ignore Jupyter Notebook checkpoints
.ipynb_checkpoints/

# Ignore virtual environment directories
venv/
env/
.venv/
.env/

# Ignore OS-specific files
.DS_Store
Thumbs.db

# Ignore IDE-specific files
.vscode/
.idea/

# Ignore log files
*.log

# Ignore specific directories or files
node_modules/
dist/
build/

experiments/

*.MED3paResults
*.csv
Loading