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.

Sign up for GitHub

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

Jump to bottom

Apple M1/M2 Compatibility #115

Merged
merged 10 commits into from
Oct 3, 2023
Merged

Apple M1/M2 Compatibility #115

merged 10 commits into from
Oct 3, 2023

Conversation

vassilispapadop
Copy link
Contributor

@vassilispapadop vassilispapadop commented Sep 27, 2023 •
edited
Loading

Description

This PR updates the requirements and documentation for Apple M1/M2 compatibility

Solves issue with file paths structure in MacOS bundle.

Fixes #86

Changelog:

Added:

  • envs/environment-apple-m2.yaml
  • requirements-apple-m2.yaml

Updated:

  • model_option.py
  • swap.py
  • face_gan.py
  • multibox_loss.py
  • retinaface_detection.py
  • fs_model.py
  • option.py
  • norm.py
  • reverse2original.py
  • util.py
  • ui.py
  • README

Fixed:

  • configs/*.yaml : relative file path

Removed:

  • ...

@vassilispapadop vassilispapadop added the mac osx Issues or pull requests related to dot usage on macosx label Sep 28, 2023
@vassilispapadop vassilispapadop self-assigned this Sep 28, 2023
@vassilispapadop vassilispapadop marked this pull request as ready for review September 28, 2023 20:08
giorgiop
giorgiop reviewed Sep 29, 2023
View reviewed changes
Copy link
Member

@giorgiop giorgiop left a comment

Choose a reason for hiding this comment

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

@Ghassen-Chaabouni let's test if this branch introduces any issues for windows

README.md Outdated Show resolved Hide resolved
src/dot/ui/ui.py Outdated
"Resources",
)

# if sys.platform == "darwin":
Copy link
Member

Choose a reason for hiding this comment

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

remove?

Ghassen-Chaabouni
Ghassen-Chaabouni approved these changes Sep 29, 2023
View reviewed changes
Copy link
Contributor

@Ghassen-Chaabouni Ghassen-Chaabouni left a comment

Choose a reason for hiding this comment

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

LGTM. I didn't notice any issues on windows

@vassilispapadop vassilispapadop merged commit 06c764e into main Oct 3, 2023
2 checks passed
@vassilispapadop vassilispapadop deleted the apple-silicon branch October 3, 2023 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ghassen-Chaabouni Ghassen-Chaabouni Ghassen-Chaabouni approved these changes

@giorgiop giorgiop giorgiop approved these changes

Assignees

@vassilispapadop vassilispapadop

Labels
mac osx Issues or pull requests related to dot usage on macosx
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Apple M1/M2 Compatibility
3 participants
@vassilispapadop @giorgiop @Ghassen-Chaabouni