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

Enable testing arm64 Mac architecture in the CI. #3422

Merged
merged 4 commits into from
Sep 23, 2024
Merged

Enable testing arm64 Mac architecture in the CI. #3422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9deae60
add macos latest to test
h-mayorquin Sep 18, 2024
1462f92
add condition to run everything if workflow files are changed
h-mayorquin Sep 18, 2024
6331075
add checks
h-mayorquin Sep 18, 2024
c3e5252
add sampling frequency to blackrock to avoid warning
h-mayorquin Sep 18, 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
8 changes: 6 additions & 2 deletions .github/scripts/determine_testing_environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
sortingcomponents_changed = False
generation_changed = False
stream_extractors_changed = False
github_actions_changed = False


for changed_file in changed_files_in_the_pull_request_paths:
Expand Down Expand Up @@ -78,9 +79,12 @@
sorters_internal_changed = True
else:
sorters_changed = True
elif ".github" in changed_file.parts:
if "workflows" in changed_file.parts:
github_actions_changed = True


run_everything = core_changed or pyproject_toml_changed or neobaseextractor_changed
run_everything = core_changed or pyproject_toml_changed or neobaseextractor_changed or github_actions_changed
run_generation_tests = run_everything or generation_changed
run_extractor_tests = run_everything or extractors_changed or plexon2_changed
run_preprocessing_tests = run_everything or preprocessing_changed
Expand All @@ -96,7 +100,7 @@
run_sorters_test = run_everything or sorters_changed
run_internal_sorters_test = run_everything or run_sortingcomponents_tests or sorters_internal_changed

run_streaming_extractors_test = stream_extractors_changed
run_streaming_extractors_test = stream_extractors_changed or github_actions_changed

install_plexon_dependencies = plexon2_changed

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/all-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.9", "3.12"] # Lower and higher versions we support
os: [macos-13, windows-latest, ubuntu-latest]
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4
- name: Setup Python ${{ matrix.python-version }}
Expand Down
7 changes: 4 additions & 3 deletions src/spikeinterface/extractors/tests/test_neoextractors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ class BlackrockSortingTest(SortingCommonTestSuite, unittest.TestCase):
ExtractorClass = BlackrockSortingExtractor
downloads = ["blackrock"]
entities = [
"blackrock/FileSpec2.3001.nev",
dict(file_path=local_folder / "blackrock/FileSpec2.3001.nev", sampling_frequency=30_000.0),
dict(file_path=local_folder / "blackrock/blackrock_2_1/l101210-001.nev", sampling_frequency=30_000.0),
]

Expand Down Expand Up @@ -278,8 +278,8 @@ class Spike2RecordingTest(RecordingCommonTestSuite, unittest.TestCase):


@pytest.mark.skipif(
version.parse(platform.python_version()) >= version.parse("3.10"),
reason="Sonpy only testing with Python < 3.10!",
version.parse(platform.python_version()) >= version.parse("3.10") or platform.system() == "Darwin",
reason="Sonpy only testing with Python < 3.10 and not supported on macOS!",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this an Arm issue?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, want to give it a shot to have something that excludes intel cpus from mac? I think they stopped selling two years ago only so many people might still have them.

That said, I did not want to allocate extra effort to something that won't work in a year anyway (see the python restriction)

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think that's fair. Let's not waste effort. our new Neo deprecation policy will also hit this one eventually.

)
class CedRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
ExtractorClass = CedRecordingExtractor
Expand All @@ -293,6 +293,7 @@ class CedRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
]


@pytest.mark.skipif(platform.system() == "Darwin", reason="Maxwell plugin not supported on macOS")
class MaxwellRecordingTest(RecordingCommonTestSuite, unittest.TestCase):
ExtractorClass = MaxwellRecordingExtractor
downloads = ["maxwell"]
Expand Down
Loading