Skip to content

Conversation

@KumoLiu
Copy link
Contributor

@KumoLiu KumoLiu commented May 7, 2025

workaround for #8439

Description

This PR temporarily restricts the setuptools version to 79.0.1 to maintain compatibility with our current setup. In future updates, we need to review and update our setup configurations to accommodate later versions of setuptools.

Types of changes

  • Non-breaking change (fix or new feature that would not break existing functionality).
  • Breaking change (fix or new feature that would cause existing functionality to change).
  • New tests added to cover the changes.
  • Integration tests passed locally by running ./runtests.sh -f -u --net --coverage.
  • Quick tests passed locally by running ./runtests.sh --quick --unittests --disttests.
  • In-line docstrings updated.
  • Documentation updated, tested make html command in the docs/ folder.

ericspod and others added 4 commits May 2, 2025 15:46
Signed-off-by: Eric Kerfoot <eric.kerfoot@kcl.ac.uk>
Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com>
Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com>
@KumoLiu
Copy link
Contributor Author

KumoLiu commented May 7, 2025

@KumoLiu KumoLiu requested review from Nic-Ma, Copilot and ericspod May 7, 2025 11:26
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR temporarily restricts the setuptools version to 79.0.1 to maintain compatibility with the current setup, while also updating torch version and target Python versions in various project files.

  • Updated requirements-min.txt to restrict setuptools for Python 3.12 and above
  • Revised torch dependency and target Python versions in pyproject.toml and workflow files
  • Made a type adjustment in the ddpm scheduler for variance

Reviewed Changes

Copilot reviewed 6 out of 8 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
requirements-min.txt Updated setuptools dependency to enforce an upper limit for Python 3.12+
pyproject.toml Revised torch version requirement and updated black's target Python versions
monai/networks/schedulers/ddpm.py Changed variance from an integer to a tensor with type annotation
.github/workflows/pythonapp.yml Updated torch version in installation steps
.github/workflows/pythonapp-min.yml Adjusted the pytorch version matrix with a FIXME comment
Files not reviewed (2)
  • docs/requirements.txt: Language not supported
  • setup.cfg: Language not supported

Copy link
Member

@ericspod ericspod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me, we can merge the previous PR if there's anything included in these changes.

@KumoLiu
Copy link
Contributor Author

KumoLiu commented May 7, 2025

Looks fine to me, we can merge the previous PR if there's anything included in these changes.

We need fixed the version of setuptools to fix the ci issue in this pr: https://github.com/Project-MONAI/MONAI/pull/8436/files
So if you want merge that one, could you help merge the change in this pr to that one?

@ericspod
Copy link
Member

ericspod commented May 7, 2025

Looks fine to me, we can merge the previous PR if there's anything included in these changes.

We need fixed the version of setuptools to fix the ci issue in this pr: https://github.com/Project-MONAI/MONAI/pull/8436/files So if you want merge that one, could you help merge the change in this pr to that one?

Sure we'll merge this one and I'll handle the merging for my PR.

@ericspod ericspod enabled auto-merge (squash) May 7, 2025 14:32
@KumoLiu
Copy link
Contributor Author

KumoLiu commented May 7, 2025

/build

@KumoLiu
Copy link
Contributor Author

KumoLiu commented May 7, 2025

Temporarily set min-dep-pytorch (latest) as not required in this PR.

Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com>
@KumoLiu
Copy link
Contributor Author

KumoLiu commented May 8, 2025

/build

@ericspod ericspod merged commit 0d19a72 into Project-MONAI:dev May 8, 2025
25 checks passed
@@ -1,3 +1,2 @@
torch>=2.3.0; sys_platform != 'win32'
torch>=2.4.1; sys_platform == 'win32'
torch>=2.4.1, <2.7.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ericspod Was it intentional to also bump the minimum torch on non-Windows platforms from 2.3.0 to 2.4.1?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was yes, we intend to support the previous three versions of Pytorch so 2.3 fell out of official support for MONAI.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you all have plans to document these type of decisions as part of #8303? And for addressing #8380?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants