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

[Fix] Requirements #1899

Merged
merged 4 commits into from
Jun 12, 2023
Merged

[Fix] Requirements #1899

merged 4 commits into from
Jun 12, 2023

Conversation

ryanxingql
Copy link
Contributor

@ryanxingql ryanxingql commented Jun 10, 2023

Remove mmcv and mmengine from "requirements/runtime.txt"

mmcv and mmengine are repeatedly listed in "requirements/{mminstall.txt,runtime.txt}". Following MMDetection, we removed mmcv and mmengine from "requirements/runtime.txt", and kept those in "requirements/mminstall.txt".

The reason is that we have manually installed MMCV and MMEngine before installing MMagic as indicated in the Doc. As a result, there is no need to require mmcv and mmengine in "requirements/runtime.txt", which are to be installed with "setup.py".

After this modification, the installation of MMagic is much faster.

Add dependencies Click and pandas in "requirements/runtime.txt"

We added Click and pandas in "requirements/runtime.txt". They are required by "mmagic/utils/io_utils.py" and "mmagic/models/editors/disco_diffusion/guider.py".

These two packages are installed when installing MIM. However, when someone uses pip instead of MIM to install MMCV, these two packages are missed and cannot be found.

@codecov
Copy link

codecov bot commented Jun 10, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.02 ⚠️

Comparison is base (ac6cb54) 82.95% compared to head (85b5993) 82.94%.

❗ Current head 85b5993 differs from pull request most recent head 2bf357f. Consider uploading reports for the commit 2bf357f to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1899      +/-   ##
==========================================
- Coverage   82.95%   82.94%   -0.02%     
==========================================
  Files         412      412              
  Lines       27673    27673              
  Branches     4332     4332              
==========================================
- Hits        22956    22952       -4     
- Misses       3774     3778       +4     
  Partials      943      943              
Flag Coverage Δ
unittests 82.94% <100.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
mmagic/__init__.py 82.75% <100.00%> (-13.80%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@Z-Fran Z-Fran self-requested a review June 12, 2023 03:38
requirements/mminstall.txt Outdated Show resolved Hide resolved
Z-Fran
Z-Fran previously approved these changes Jun 12, 2023
@ryanxingql
Copy link
Contributor Author

ryanxingql commented Jun 12, 2023

@Z-Fran Hi, I notice that in mmagic/mmagic/engine/init.py, the minimal version of MMCV is asserted to be "2.0.0rc1".

@Z-Fran
Copy link
Collaborator

Z-Fran commented Jun 12, 2023

@Z-Fran Hi, I notice that in mmagic/mmagic/engine/init.py, the minimal version of MMCV is asserted to be "2.0.0rc1".

Actually, it should also be modified to 2.0.0 here.

@ryanxingql
Copy link
Contributor Author

@Z-Fran Hi, I notice that in mmagic/mmagic/engine/init.py, the minimal version of MMCV is asserted to be "2.0.0rc1".

Actually, it should also be modified to 2.0.0 here.

May I change all these "2.0.0rc1" to "2.0.0"?

@Z-Fran Z-Fran merged commit 582c1a6 into open-mmlab:main Jun 12, 2023
@ryanxingql ryanxingql deleted the fix-require branch June 12, 2023 08:51
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.

2 participants