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

Update installation instructions for Macs, min version of rastermap #1009

Merged
merged 5 commits into from
Aug 6, 2023

Conversation

rly
Copy link
Contributor

@rly rly commented Aug 1, 2023

  1. By setting the env var CONDA_SUBDIR=osx-64, I think that using iTerm with Rosetta is no longer needed. Without it, I was able to pip install "suite2p[all]" on my Mac M1 and run it with images in an h5 file (an nwb file) just fine. So I simplified the instructions for Mac M1 machines.

  2. I reverted the note about scanimage-tiff-reader mac incompatibility. The latest release 1.4.1.4 adds support for Mac M1. See https://gitlab.com/vidriotech/scanimagetiffreader-python/-/commit/9f4de14aa3186b0643608c5d203890f2ca1a8172 . I don't know if there was a separate issue with non-M1 macs, but I could install suite2p on both a Mac with Apple Silicon and one with an Intel processor. Fix add scanimage-tiff-reader as a dependency again #981.

  3. I updated the minimum version of rastermap to one that supports from rastermap.rastermap import Rastermap

  4. My editor removes trailing spaces at the end of lines automatically...

rly added 5 commits July 28, 2023 10:18
Remove note about scanimage-tiff-reader mac incompatibility
Simplify mac os instructions
Update rastermap requirement based on issue ticket suggestions
@codecov
Copy link

codecov bot commented Aug 1, 2023

Codecov Report

Merging #1009 (3c7e11d) into main (9ab4ca1) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1009   +/-   ##
=======================================
  Coverage   58.52%   58.52%           
=======================================
  Files          40       40           
  Lines        4567     4567           
=======================================
  Hits         2673     2673           
  Misses       1894     1894           

@rly
Copy link
Contributor Author

rly commented Aug 1, 2023

Just to add - pyqt6 has released wheels for all mac os machines. I believe the reason why CONDA_SUBDIR=osx-64 has to be added to the instructions for Mac arm64 machines is that without it, pyqt5 would need to be built for arm64 from source, which is not straightforward. If suite2p were updated to use pyqt6, then I think having separate instructions for Mac x86 and Mac arm64 will no longer be necessary.

@carsen-stringer carsen-stringer merged commit e1f99be into MouseLand:main Aug 6, 2023
9 checks passed
@rly rly deleted the update_readme branch August 6, 2023 15:18
@carsen-stringer
Copy link
Member

thanks! we've upgraded now to qtpy with pyqt6 support. I don't have a mac M1/M2 to test but hopefully it works more easily now

@rly
Copy link
Contributor Author

rly commented Aug 7, 2023

Yep, I can install the latest on my mac M1 with the updated instructions now. Thanks!

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.

add scanimage-tiff-reader as a dependency again
2 participants