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

Merging Dev Into gen-ai-dev and Undeclared Variable Fixes #7887

Merged
merged 138 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
2fc0126
wholeBody_ct_segmentation failed to be download (#7280)
KumoLiu Dec 4, 2023
88f8dd2
update the Python version requirements for transformers (#7275)
KumoLiu Dec 5, 2023
d5585c3
7263 add diffusion loss (#7272)
kvttt Dec 5, 2023
8212458
Fix swinunetrv2 2D bug (#7302)
heyufan1995 Dec 8, 2023
b1c8b42
Fix `RuntimeError` in `DataAnalyzer` (#7310)
KumoLiu Dec 12, 2023
6126a6e
Support specified filenames in `Saveimage` (#7318)
KumoLiu Dec 14, 2023
4c546b3
Fix typo (#7321)
KumoLiu Dec 15, 2023
01a0ee1
fix optimizer pararmeter issue (#7322)
binliunls Dec 15, 2023
90d2acb
Fix `lazy` ignored in `SpatialPadd` (#7316)
KumoLiu Dec 18, 2023
f5327ad
Update openslide-python version (#7344)
KumoLiu Dec 28, 2023
b3d7a48
Upgrade the version of `transformers` (#7343)
KumoLiu Dec 29, 2023
02973f0
Bump github/codeql-action from 2 to 3 (#7354)
dependabot[bot] Jan 2, 2024
38ac573
Bump actions/upload-artifact from 3 to 4 (#7350)
dependabot[bot] Jan 2, 2024
454f89c
Bump actions/setup-python from 4 to 5 (#7351)
dependabot[bot] Jan 2, 2024
db6e81d
Bump actions/download-artifact from 3 to 4 (#7352)
dependabot[bot] Jan 2, 2024
8fa6931
Bump peter-evans/slash-command-dispatch from 3.0.1 to 3.0.2 (#7353)
dependabot[bot] Jan 3, 2024
445d750
Give more useful exception when batch is considered during matrix mul…
KumoLiu Jan 8, 2024
d7137cf
Fix incorrectly size compute in auto3dseg analyzer (#7374)
KumoLiu Jan 9, 2024
e1ffa7e
7380 mention demo in bending energy and diffusion docstrings (#7381)
kvttt Jan 10, 2024
25f1901
Pin gdown version to v4.6.3 (#7384)
KumoLiu Jan 12, 2024
78295c7
Fix Premerge (#7397)
KumoLiu Jan 18, 2024
80be1c3
Track applied operations in image filter (#7395)
vlaminckaxel Jan 18, 2024
facf176
Add `compile` support in `SupervisedTrainer` and `SupervisedEvaluator…
KumoLiu Jan 19, 2024
abe2e31
Fix CUDA_VISIBLE_DEVICES setting ignored (#7408)
KumoLiu Jan 22, 2024
6c9e49e
Fix Incorrect updated affine in `NrrdReader` and update docstring in …
KumoLiu Jan 25, 2024
df4cf92
Ignore E704 after update black (#7422)
KumoLiu Jan 30, 2024
cd36c1c
update `rm -rf /opt/hostedtoolcache` avoid change the python version …
KumoLiu Feb 1, 2024
6def75e
Bump peter-evans/slash-command-dispatch from 3.0.2 to 4.0.0 (#7428)
dependabot[bot] Feb 1, 2024
6ea3e39
Bump peter-evans/create-or-update-comment from 3 to 4 (#7429)
dependabot[bot] Feb 2, 2024
5301443
Bump actions/cache from 3 to 4 (#7430)
dependabot[bot] Feb 2, 2024
aa4f578
Bump codecov/codecov-action from 3 to 4 (#7431)
dependabot[bot] Feb 2, 2024
33afaef
Update tensorboard version to fix deadlock (#7435)
KumoLiu Feb 2, 2024
718e4be
auto updates (#7439)
monai-bot Feb 5, 2024
ec2cc83
Instantiation mode `"partial"` to `"callable"`. Return the `_target_`…
ibro45 Feb 6, 2024
c27cc98
Add support for mlflow experiment name in auto3dseg (#7442)
drbeh Feb 6, 2024
ff43028
Update gdown version (#7448)
KumoLiu Feb 7, 2024
a8080fc
Skip "test_gaussian_filter" as a workaround for blossom killed (#7474)
KumoLiu Feb 20, 2024
50f9aea
auto updates (#7463)
monai-bot Feb 20, 2024
df37a22
Skip "test_resize" as a workaround for blossom killed (#7484)
KumoLiu Feb 21, 2024
1b93988
Fix Python 3.12 import AttributeError (#7482)
KumoLiu Feb 21, 2024
f4103c5
Update test_nnunetv2runner (#7483)
KumoLiu Feb 22, 2024
9c77a04
Fix github resource issue when build latest docker (#7450)
KumoLiu Feb 23, 2024
f6f9e81
Use int16 instead of int8 in `LabelStats` (#7489)
KumoLiu Feb 23, 2024
20512d3
auto updates (#7495)
monai-bot Feb 26, 2024
7cfa2c9
Add sample_std parameter to RandGaussianNoise. (#7492)
bakert1 Feb 26, 2024
9830525
Add __repr__ and __str__ to Metrics baseclass (#7487)
MathijsdeBoer Feb 28, 2024
02c7f53
Bump al-cheb/configure-pagefile-action from 1.3 to 1.4 (#7510)
dependabot[bot] Mar 1, 2024
e9e2738
Add arm support (#7500)
KumoLiu Mar 3, 2024
95f69de
Fix error in "test_bundle_trt_export" (#7524)
KumoLiu Mar 10, 2024
6b7568d
Fix typo in the PerceptualNetworkType Enum (#7548)
SomeUserName1 Mar 15, 2024
ec63e06
Update to use `log_sigmoid` in `FocalLoss` (#7534)
KumoLiu Mar 18, 2024
35c93fd
Update integration_segmentation_3d result for PyTorch2403 (#7551)
KumoLiu Mar 22, 2024
c649934
Add Barlow Twins loss for representation learning (#7530)
Lucas-rbnt Mar 22, 2024
c3a7383
Stein's Unbiased Risk Estimator (SURE) loss and Conjugate Gradient (#…
cxlcl Mar 22, 2024
c86e790
auto updates (#7577)
monai-bot Mar 25, 2024
97678fa
Remove nested error propagation on `ConfigComponent` instantiate (#7569)
surajpaib Mar 26, 2024
e5bebfc
2872 implementation of mixup, cutmix and cutout (#7198)
juampatronics Mar 26, 2024
2716b6a
Remove device count cache when import monai (#7581)
KumoLiu Mar 27, 2024
c9fed96
Fixing gradient in sincos positional encoding in monai/networks/block…
Lucas-rbnt Mar 27, 2024
ba3c72c
Fix inconsistent alpha parameter/docs for RandGibbsNoise/RandGibbsNoi…
johnzielke Mar 27, 2024
7c0b10e
Fix bundle_root for NNIGen (#7586)
mingxin-zheng Mar 27, 2024
2d463a7
Auto3DSeg algo_template hash update (#7589)
monai-bot Mar 27, 2024
15d2abf
Utilizing subprocess for nnUNet training. (#7576)
KumoLiu Apr 1, 2024
ec4d946
typo fix (#7595)
scalyvladimir Apr 1, 2024
a7c2589
auto updates (#7599)
monai-bot Apr 1, 2024
c885100
7540 change bundle workflow args (#7549)
yiheng-wang-nv Apr 1, 2024
264b9e4
Add "properties_path" in BundleWorkflow (#7542)
KumoLiu Apr 1, 2024
bbaaf4c
Auto3DSeg algo_template hash update (#7603)
monai-bot Apr 1, 2024
5ec7305
ENH: generate_label_classes_crop_centers: warn only if ratio of missi…
lorinczszabolcs Apr 2, 2024
763347d
Update base image to 2403 (#7600)
KumoLiu Apr 3, 2024
195d7dd
simplification of the sincos positional encoding in patchembedding.py…
Lucas-rbnt Apr 4, 2024
625967c
harmonization and clarification of dice losses variants docs and asso…
Lucas-rbnt Apr 5, 2024
c0b9cc0
Implementation of intensity clipping transform: bot hard and soft app…
Lucas-rbnt Apr 5, 2024
87152d1
Fix typo in `SSIMMetric` (#7612)
KumoLiu Apr 8, 2024
e9a5bfe
auto updates (#7614)
monai-bot Apr 10, 2024
54a6991
Fix test error in `test_soft_clipping_one_sided_high` (#7624)
KumoLiu Apr 11, 2024
3856c45
Fix deprecated warning in ruff (#7625)
KumoLiu Apr 11, 2024
da3ecdd
7601 fix mlflow artifacts (#7604)
binliunls Apr 12, 2024
1268488
Uninstall opencv included in base image (#7626)
KumoLiu Apr 12, 2024
9e2904a
Add checks for num_fold and fail early if wrong (#7634)
mingxin-zheng Apr 12, 2024
0497448
Auto3DSeg algo_template hash update (#7642)
monai-bot Apr 15, 2024
605ffe1
Auto3DSeg algo_template hash update (#7643)
monai-bot Apr 15, 2024
bff4b15
Remove source code of numcodecs in the Dockerfile (#7644)
KumoLiu Apr 15, 2024
16d4e2f
Remove memory_pool_limit in trt config (#7647)
KumoLiu Apr 16, 2024
d6e6b24
Add version requirement for mlflow (#7659)
KumoLiu Apr 19, 2024
ffd4454
Auto3DSeg algo_template hash update (#7674)
monai-bot Apr 19, 2024
224c47a
Fixed four test issues within test code. (#7662)
freddiewanah Apr 19, 2024
7a6b69f
Adapt to use assert raises (#7670)
freddiewanah Apr 19, 2024
03a5fa6
MedicalNetPerceptualSimilarity: Add multi-channel (#7568)
SomeUserName1 Apr 19, 2024
c6bf8e9
Workaround for B909 in flake8-bugbear (#7691)
KumoLiu Apr 22, 2024
178ebc8
Fix AttributeError in 'PerceptualLoss' (#7693)
KumoLiu Apr 22, 2024
ac9b186
Always convert input to C-order in distance_transform_edt (#7675)
KumoLiu Apr 23, 2024
a59676f
Auto3DSeg algo_template hash update (#7695)
monai-bot Apr 23, 2024
ec6aa33
Merge similar test components with parameterized (#7663)
freddiewanah Apr 23, 2024
dc58e5c
Add ResNet backbones for FlexibleUNet (#7571)
k-sukharev Apr 23, 2024
1c07a17
Refactored test assertions that have suboptimal tests with numbers (#…
freddiewanah Apr 23, 2024
07a78d2
Auto3DSeg algo_template hash update (#7700)
monai-bot Apr 24, 2024
c3e4457
Update pycln version (#7704)
KumoLiu Apr 24, 2024
bfe09b8
Refactored others type of subotimal asserts (#7672)
freddiewanah Apr 24, 2024
8c709de
Fix download failing on FIPS machines (#7698)
MattTheCuber Apr 25, 2024
6a130cc
7713 Update TRT parameter (#7714)
binliunls Apr 26, 2024
4c193ea
Fix itk install error when python=3.8 (#7719)
KumoLiu Apr 29, 2024
5650899
auto updates (#7723)
monai-bot Apr 29, 2024
e1a69b0
Auto3DSeg algo_template hash update (#7728)
monai-bot Apr 30, 2024
fe733b0
Propagate kernel size through attention Attention-UNet (#7734)
Pkaps25 May 7, 2024
ecaf5a1
Fixed misguiding weight mode documentation (#7746)
simojens May 7, 2024
32b7754
Enhance logging logic in `ConfigWorkflow` (#7745)
KumoLiu May 8, 2024
f278e51
Add version requirement for filelock and nni (#7744)
KumoLiu May 8, 2024
d83fa56
Add dimensionality of heads argument to SABlock (#7664)
NabJa May 8, 2024
258f56d
Add activation parameter to ResNet (#7749)
Pkaps25 May 9, 2024
4af2306
Revert version requirement for mlflow (#7742)
KumoLiu May 10, 2024
ab4bd43
auto updates (#7760)
monai-bot May 13, 2024
daf2e71
Fix HTTPError when Too Many Requests for huggingface hub (#7765)
KumoLiu May 13, 2024
1bcf97f
Add direct links to github source code to docs (#7738)
johnzielke May 16, 2024
5e9ac1b
Fix matplotlib 3.9.0 has no attribute 'get_cmap` (#7780)
KumoLiu May 17, 2024
7429e2a
Fix doc source links for read the docs (#7779)
johnzielke May 17, 2024
d0d1292
Restrict Auto3DSeg fold input based on datalist (#7778)
mingxin-zheng May 17, 2024
25e78a2
7753 update changelog for v1.3.1 (#7773)
KumoLiu May 17, 2024
b16f54a
Pin transformer's version (#7782)
KumoLiu May 18, 2024
96bfda0
Skip failed tests (#7783)
KumoLiu May 20, 2024
244148d
Add function in monai.transforms.utils.py (#7712)
ytl0623 May 21, 2024
66a2fae
7753 update releasing 1.3.1 (#7788)
KumoLiu May 21, 2024
373c003
Add norm param to ResNet (#7752)
Pkaps25 May 23, 2024
e5afa43
Fix tests/test_warp.py (#7794)
KumoLiu May 23, 2024
ad6a433
Fix Resnet (#7805)
KumoLiu May 27, 2024
94ab632
auto updates (#7807)
monai-bot May 27, 2024
762b525
Fix precision issue in TestClipIntensityPercentiles3D (#7808)
KumoLiu May 28, 2024
a0935d9
Fix negative strides issue in `NrrdReader` (#7809)
KumoLiu May 28, 2024
0d7f772
Ensure deterministic in MixUp, CutMix, CutOut (#7813)
KumoLiu May 30, 2024
4029c42
Refactor Dataset to use Compose for transforms (#7784)
surajpaib May 31, 2024
7449c4d
change blossom-ci to ACL security format (#7843)
YanxuanLiu Jun 13, 2024
0d77b90
Merge branch 'dev' into gen-ai-dev
ericspod Jun 30, 2024
5855fa4
Minor fixes
ericspod Jun 30, 2024
81175cc
Minor fixes
ericspod Jun 30, 2024
e3a75af
Updates to remove undeclared variable errors from pylint
ericspod Jul 1, 2024
d4af01e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 1, 2024
cc1a79b
Fixes
ericspod Jul 1, 2024
f421ef4
Merge branches 'gen-ai-dev' and 'gen-ai-dev' of github.com:ericspod/M…
ericspod Jul 1, 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
16 changes: 9 additions & 7 deletions .github/workflows/blossom-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ jobs:
args: ${{ env.args }}

# This job only runs for pull request comments
if: contains('\
Nic-Ma,\
wyli,\
pxLi,\
YanxuanLiu,\
KumoLiu,\
', format('{0},', github.actor)) && github.event.comment.body == '/build'
if: |
github.event.comment.body == '/build' &&
(
github.actor == 'Nic-Ma' ||
github.actor == 'wyli' ||
github.actor == 'pxLi' ||
github.actor == 'YanxuanLiu' ||
github.actor == 'KumoLiu'
)
steps:
- name: Check if comment is issued by authorized person
run: blossom-ci
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ jobs:
python -m pip install --pre -U itk
- name: Install the dependencies
run: |
python -m pip install --user --upgrade pip wheel
python -m pip install torch==1.13.1 torchvision==0.14.1
cat "requirements-dev.txt"
python -m pip install -r requirements-dev.txt
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ jobs:
rm -rf {*,.[^.]*}

release_tag_docker:
if: github.repository == 'Project-MONAI/MONAI'
# if: github.repository == 'Project-MONAI/MONAI'
if: ${{ false }}
needs: versioning
runs-on: ubuntu-latest
steps:
Expand Down
95 changes: 94 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,98 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [1.3.1] - 2024-05-17
### Added
* Support for `by_measure` argument in `RemoveSmallObjects` (#7137)
* Support for `pretrained` flag in `ResNet` (#7095)
* Support for uploading and downloading bundles to and from the Hugging Face Hub (#6454)
* Added weight parameter in DiceLoss to apply weight to voxels of each class (#7158)
* Support for returning dice for each class in `DiceMetric` (#7163)
* Introduced `ComponentStore` for storage purposes (#7159)
* Added utilities used in MONAI Generative (#7134)
* Enabled Python 3.11 support for `convert_to_torchscript` and `convert_to_onnx` (#7182)
* Support for MLflow in `AutoRunner` (#7176)
* `fname_regex` option in PydicomReader (#7181)
* Allowed setting AutoRunner parameters from config (#7175)
* `VoxelMorphUNet` and `VoxelMorph` (#7178)
* Enabled `cache` option in `GridPatchDataset` (#7180)
* Introduced `class_labels` option in `write_metrics_reports` for improved readability (#7249)
* `DiffusionLoss` for image registration task (#7272)
* Supported specifying `filename` in `Saveimage` (#7318)
* Compile support in `SupervisedTrainer` and `SupervisedEvaluator` (#7375)
* `mlflow_experiment_name` support in `Auto3DSeg` (#7442)
* Arm support (#7500)
* `BarlowTwinsLoss` for representation learning (#7530)
* `SURELoss` and `ConjugateGradient` for diffusion models (#7308)
* Support for `CutMix`, `CutOut`, and `MixUp` augmentation techniques (#7198)
* `meta_file` and `logging_file` options to `BundleWorkflow` (#7549)
* `properties_path` option to `BundleWorkflow` for customized properties (#7542)
* Support for both soft and hard clipping in `ClipIntensityPercentiles` (#7535)
* Support for not saving artifacts in `MLFlowHandler` (#7604)
* Support for multi-channel images in `PerceptualLoss` (#7568)
* Added ResNet backbone for `FlexibleUNet` (#7571)
* Introduced `dim_head` option in `SABlock` to set dimensions for each head (#7664)
* Direct links to github source code to docs (#7738, #7779)
#### misc.
* Refactored `list_data_collate` and `collate_meta_tensor` to utilize the latest PyTorch API (#7165)
* Added __str__ method in `Metric` base class (#7487)
* Made enhancements for testing files (#7662, #7670, #7663, #7671, #7672)
* Improved documentation for bundles (#7116)
### Fixed
#### transforms
* Addressed issue where lazy mode was ignored in `SpatialPadd` (#7316)
* Tracked applied operations in `ImageFilter` (#7395)
* Warnings are now given only if missing class is not set to 0 in `generate_label_classes_crop_centers` (#7602)
* Input is now always converted to C-order in `distance_transform_edt` to ensure consistent behavior (#7675)
#### data
* Modified .npz file behavior to use keys in `NumpyReader` (#7148)
* Handled corrupted cached files in `PersistentDataset` (#7244)
* Corrected affine update in `NrrdReader` (#7415)
#### metrics and losses
* Addressed precision issue in `get_confusion_matrix` (#7187)
* Harmonized and clarified documentation and tests for dice losses variants (#7587)
#### networks
* Removed hard-coded `spatial_dims` in `SwinTransformer` (#7302)
* Fixed learnable `position_embeddings` in `PatchEmbeddingBlock` (#7564, #7605)
* Removed `memory_pool_limit` in TRT config (#7647)
* Propagated `kernel_size` to `ConvBlocks` within `AttentionUnet` (#7734)
* Addressed hard-coded activation layer in `ResNet` (#7749)
#### bundle
* Resolved bundle download issue (#7280)
* Updated `bundle_root` directory for `NNIGen` (#7586)
* Checked for `num_fold` and failed early if incorrect (#7634)
* Enhanced logging logic in `ConfigWorkflow` (#7745)
#### misc.
* Enabled chaining in `Auto3DSeg` CLI (#7168)
* Addressed useless error message in `nnUNetV2Runner` (#7217)
* Resolved typing and deprecation issues in Mypy (#7231)
* Quoted `$PY_EXE` variable to handle Python path that contains spaces in Bash (#7268)
* Improved documentation, code examples, and warning messages in various modules (#7234, #7213, #7271, #7326, #7569, #7584)
* Fixed typos in various modules (#7321, #7322, #7458, #7595, #7612)
* Enhanced docstrings in various modules (#7245, #7381, #7746)
* Handled error when data is on CPU in `DataAnalyzer` (#7310)
* Updated version requirements for third-party packages (#7343, #7344, #7384, #7448, #7659, #7704, #7744, #7742, #7780)
* Addressed incorrect slice compute in `ImageStats` (#7374)
* Avoided editing a loop's mutable iterable to address B308 (#7397)
* Fixed issue with `CUDA_VISIBLE_DEVICES` setting being ignored (#7408, #7581)
* Avoided changing Python version in CICD (#7424)
* Renamed partial to callable in instantiate mode (#7413)
* Imported AttributeError for Python 3.12 compatibility (#7482)
* Updated `nnUNetV2Runner` to support nnunetv2 2.2 (#7483)
* Used uint8 instead of int8 in `LabelStats` (#7489)
* Utilized subprocess for nnUNet training (#7576)
* Addressed deprecated warning in ruff (#7625)
* Fixed downloading failure on FIPS machine (#7698)
* Updated `torch_tensorrt` compile parameters to avoid warning (#7714)
* Restrict `Auto3DSeg` fold input based on datalist (#7778)
### Changed
* Base Docker image upgraded to `nvcr.io/nvidia/pytorch:24.03-py3` from `nvcr.io/nvidia/pytorch:23.08-py3`
### Removed
* Removed unrecommended star-arg unpacking after a keyword argument, addressed B026 (#7262)
* Skipped old PyTorch version test for `SwinUNETR` (#7266)
* Dropped docker build workflow and migrated to Nvidia Blossom system (#7450)
* Dropped Python 3.8 test on quick-py3 workflow (#7719)

## [1.3.0] - 2023-10-12
### Added
* Intensity transforms `ScaleIntensityFixedMean` and `RandScaleIntensityFixedMean` (#6542)
Expand Down Expand Up @@ -943,7 +1035,8 @@ the postprocessing steps should be used before calling the metrics methods

[highlights]: https://github.com/Project-MONAI/MONAI/blob/master/docs/source/highlights.md

[Unreleased]: https://github.com/Project-MONAI/MONAI/compare/1.3.0...HEAD
[Unreleased]: https://github.com/Project-MONAI/MONAI/compare/1.3.1...HEAD
[1.3.1]: https://github.com/Project-MONAI/MONAI/compare/1.3.0...1.3.1
[1.3.0]: https://github.com/Project-MONAI/MONAI/compare/1.2.0...1.3.0
[1.2.0]: https://github.com/Project-MONAI/MONAI/compare/1.1.0...1.2.0
[1.1.0]: https://github.com/Project-MONAI/MONAI/compare/1.0.1...1.1.0
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ title: "MONAI: Medical Open Network for AI"
abstract: "AI Toolkit for Healthcare Imaging"
authors:
- name: "MONAI Consortium"
date-released: 2023-10-12
version: "1.3.0"
date-released: 2024-05-21
version: "1.3.1"
identifiers:
- description: "This DOI represents all versions of MONAI, and will always resolve to the latest one."
type: doi
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

[![premerge](https://github.com/Project-MONAI/MONAI/actions/workflows/pythonapp.yml/badge.svg?branch=dev)](https://github.com/Project-MONAI/MONAI/actions/workflows/pythonapp.yml)
[![postmerge](https://img.shields.io/github/checks-status/project-monai/monai/dev?label=postmerge)](https://github.com/Project-MONAI/MONAI/actions?query=branch%3Adev)
[![docker](https://github.com/Project-MONAI/MONAI/actions/workflows/docker.yml/badge.svg?branch=dev)](https://github.com/Project-MONAI/MONAI/actions/workflows/docker.yml)
[![Documentation Status](https://readthedocs.org/projects/monai/badge/?version=latest)](https://docs.monai.io/en/latest/)
[![codecov](https://codecov.io/gh/Project-MONAI/MONAI/branch/dev/graph/badge.svg?token=6FTC7U1JJ4)](https://codecov.io/gh/Project-MONAI/MONAI)

Expand Down
4 changes: 2 additions & 2 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ sphinxcontrib-serializinghtml
sphinx-autodoc-typehints==1.11.1
pandas
einops
transformers<4.22; python_version <= '3.10' # https://github.com/Project-MONAI/MONAI/issues/5157
mlflow>=1.28.0, <=2.11.3
transformers>=4.36.0, <4.41.0; python_version <= '3.10'
mlflow>=2.12.2
clearml>=1.10.0rc0
tensorboardX
imagecodecs; platform_system == "Linux" or platform_system == "Darwin"
Expand Down
21 changes: 17 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def generate_apidocs(*args):
"sphinx.ext.mathjax",
"sphinx.ext.napoleon",
"sphinx.ext.autodoc",
"sphinx.ext.viewcode",
"sphinx.ext.linkcode",
"sphinx.ext.autosectionlabel",
"sphinx.ext.autosummary",
"sphinx_autodoc_typehints",
Expand Down Expand Up @@ -140,7 +140,7 @@ def generate_apidocs(*args):
"github_repo": "MONAI",
"github_version": "dev",
"doc_path": "docs/source",
"conf_py_path": "/docs/",
"conf_py_path": "/docs/source",
"VERSION": version,
}
html_scaled_image_link = False
Expand All @@ -167,11 +167,24 @@ def setup(app):


# -- Linkcode configuration --------------------------------------------------
DEFAULT_REF = "dev"
read_the_docs_ref = os.environ.get("READTHEDOCS_GIT_IDENTIFIER", None)
if read_the_docs_ref:
# When building on ReadTheDocs, link to the specific commit
# https://docs.readthedocs.io/en/stable/reference/environment-variables.html#envvar-READTHEDOCS_GIT_IDENTIFIER
git_ref = read_the_docs_ref
elif os.environ.get("GITHUB_REF_TYPE", "branch") == "tag":
# When building a tag, link to the tag itself
git_ref = os.environ.get("GITHUB_REF", DEFAULT_REF)
else:
git_ref = os.environ.get("GITHUB_SHA", DEFAULT_REF)

DEFAULT_REPOSITORY = "Project-MONAI/MONAI"
repository = os.environ.get("GITHUB_REPOSITORY", DEFAULT_REPOSITORY)

base_code_url = f"https://github.com/{repository}/blob/{version}"
base_code_url = f"https://github.com/{repository}/blob/{git_ref}"
MODULE_ROOT_FOLDER = "monai"
repo_root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))


# Adjusted from https://github.com/python-websockets/websockets/blob/main/docs/conf.py
Expand Down Expand Up @@ -201,7 +214,7 @@ def linkcode_resolve(domain, info):
except TypeError:
# e.g. object is a typing.Union
return None
file = os.path.relpath(file, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")))
file = os.path.relpath(file, repo_root_path)
if not file.startswith(MODULE_ROOT_FOLDER):
# e.g. object is a typing.NewType
return None
Expand Down
1 change: 0 additions & 1 deletion docs/source/networks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,6 @@ Layers
.. autoclass:: monai.networks.layers.vector_quantizer.VectorQuantizer
:members:

=======
`ConjugateGradient`
~~~~~~~~~~~~~~~~~~~
.. autoclass:: ConjugateGradient
Expand Down
4 changes: 2 additions & 2 deletions monai/apps/auto3dseg/auto_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -499,8 +499,8 @@ def set_num_fold(self, num_fold: int = 5) -> AutoRunner:

if num_fold <= 0:
raise ValueError(f"num_fold is expected to be an integer greater than zero. Now it gets {num_fold}")
if num_fold > self.max_fold + 1:
# Auto3DSeg allows no validation set, so the maximum fold number is max_fold + 1
if num_fold > self.max_fold:
# Auto3DSeg must contain validation set, so the maximum fold number is max_fold.
raise ValueError(
f"num_fold is greater than the maximum fold number {self.max_fold} in {self.datalist_filename}."
)
Expand Down
4 changes: 2 additions & 2 deletions monai/apps/detection/utils/anchor_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def generate_anchors(
w_ratios = 1 / area_scale
h_ratios = area_scale
# if 3d, w:h:d = 1:aspect_ratios[:,0]:aspect_ratios[:,1]
elif self.spatial_dims == 3:
else:
area_scale = torch.pow(aspect_ratios_t[:, 0] * aspect_ratios_t[:, 1], 1 / 3.0)
w_ratios = 1 / area_scale
h_ratios = aspect_ratios_t[:, 0] / area_scale
Expand All @@ -199,7 +199,7 @@ def generate_anchors(
hs = (h_ratios[:, None] * scales_t[None, :]).view(-1)
if self.spatial_dims == 2:
base_anchors = torch.stack([-ws, -hs, ws, hs], dim=1) / 2.0
elif self.spatial_dims == 3:
else: # elif self.spatial_dims == 3:
ds = (d_ratios[:, None] * scales_t[None, :]).view(-1)
base_anchors = torch.stack([-ws, -hs, -ds, ws, hs, ds], dim=1) / 2.0

Expand Down
1 change: 1 addition & 0 deletions monai/apps/pathology/transforms/post/array.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ def _generate_contour_coord(self, current: np.ndarray, previous: np.ndarray) ->
"""

p_delta = (current[0] - previous[0], current[1] - previous[1])
row, col = -1, -1

if p_delta in ((0.0, 1.0), (0.5, 0.5), (1.0, 0.0)):
row = int(current[0] + 0.5)
Expand Down
1 change: 1 addition & 0 deletions monai/bundle/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ def load_bundle_config(bundle_path: str, *config_names: str, **load_kw_args: Any
raise ValueError(f"Cannot find config file '{full_cname}'")

ardata = archive.read(full_cname)
cdata = {}

if full_cname.lower().endswith("json"):
cdata = json.loads(ardata, **load_kw_args)
Expand Down
1 change: 0 additions & 1 deletion monai/bundle/workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ def __init__(
super().__init__(workflow_type=workflow_type, meta_file=meta_file, properties_path=properties_path)
self.config_root_path = config_root_path
logging_file = str(self.config_root_path / "logging.conf") if logging_file is None else logging_file

if logging_file is False:
logger.warn(f"Logging file is set to {logging_file}, skipping logging.")
else:
Expand Down
Loading
Loading