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

Osx versions #240

Closed
wants to merge 3 commits into from
Closed

Osx versions #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42ba481
Remove the tests I don't care about
liamhuber Dec 1, 2023
6e34a01
Change the OSs to different invokations of macos
liamhuber Dec 1, 2023
ea79417
Run the tests totally independently
liamhuber Dec 1, 2023
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
41 changes: 0 additions & 41 deletions .github/workflows/deploy.yml
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions .github/workflows/unittest-flux.yml
View file
Open in desktop

This file was deleted.

15 changes: 11 additions & 4 deletions .github/workflows/unittest-win.yml → .github/workflows/unittest-openmpi-11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This workflow is used to run the unittest of pyiron

name: Unittests-msmpi
name: Unittests-openmpi

on:
push:
Expand All @@ -14,8 +14,11 @@ jobs:
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: [windows-latest]
python-version: ['3.11']
include:
- operating-system: macos-11
python-version: '3.11'
label: osx-11-64-py-3-11-openmpi
prefix: /Users/runner/miniconda3/envs/my-env

steps:
- uses: actions/checkout@v2
Expand All @@ -27,7 +30,7 @@ jobs:
miniforge-variant: Mambaforge
channel-priority: strict
auto-update-conda: true
environment-file: .ci_support/environment-win.yml
environment-file: .ci_support/environment-openmpi.yml
- name: Test
shell: bash -l {0}
timeout-minutes: 5
Expand All @@ -36,3 +39,7 @@ jobs:
pip install . --no-deps --no-build-isolation
cd tests
python -m unittest discover .
env:
OMPI_MCA_plm: 'isolated'
OMPI_MCA_rmaps_base_oversubscribe: 'yes'
OMPI_MCA_btl_vader_single_copy_mechanism: 'none'
15 changes: 11 additions & 4 deletions .github/workflows/unittests-old.yml → .github/workflows/unittest-openmpi-12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This workflow is used to run the unittest of pyiron

name: Unittest Lower Bound
name: Unittests-openmpi

on:
push:
Expand All @@ -11,18 +11,25 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
include:
- operating-system: macos-12
python-version: '3.11'
label: osx-12-64-py-3-11-openmpi
prefix: /Users/runner/miniconda3/envs/my-env
steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2.2.0
with:
python-version: '3.9'
python-version: ${{ matrix.python-version }}
mamba-version: "*"
channels: conda-forge
miniforge-variant: Mambaforge
channel-priority: strict
auto-update-conda: true
environment-file: .ci_support/environment-old.yml
environment-file: .ci_support/environment-openmpi.yml
- name: Test
shell: bash -l {0}
timeout-minutes: 5
Expand Down
32 changes: 8 additions & 24 deletions .github/workflows/unittest-mpich.yml → .github/workflows/unittest-openmpi-13.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This workflow is used to run the unittest of pyiron

name: Unittests-mpich
name: Unittests-openmpi

on:
push:
Expand All @@ -15,31 +15,11 @@ jobs:
strategy:
matrix:
include:
- operating-system: macos-latest
- operating-system: macos-13
python-version: '3.11'
label: osx-64-py-3-11-mpich
label: osx-13-64-py-3-11-openmpi
prefix: /Users/runner/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: '3.11'
label: linux-64-py-3-11-mpich
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: '3.10'
label: linux-64-py-3-10-mpich
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: 3.9
label: linux-64-py-3-9-mpich
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: 3.8
label: linux-64-py-3-8-mpich
prefix: /usr/share/miniconda3/envs/my-env

steps:
- uses: actions/checkout@v2
- uses: conda-incubator/setup-miniconda@v2.2.0
Expand All @@ -50,7 +30,7 @@ jobs:
miniforge-variant: Mambaforge
channel-priority: strict
auto-update-conda: true
environment-file: .ci_support/environment-mpich.yml
environment-file: .ci_support/environment-openmpi.yml
- name: Test
shell: bash -l {0}
timeout-minutes: 5
Expand All @@ -59,3 +39,7 @@ jobs:
pip install . --no-deps --no-build-isolation
cd tests
python -m unittest discover .
env:
OMPI_MCA_plm: 'isolated'
OMPI_MCA_rmaps_base_oversubscribe: 'yes'
OMPI_MCA_btl_vader_single_copy_mechanism: 'none'
22 changes: 1 addition & 21 deletions .github/workflows/unittest-openmpi.yml → ...hub/workflows/unittest-openmpi-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,8 @@ jobs:
include:
- operating-system: macos-latest
python-version: '3.11'
label: osx-64-py-3-11-openmpi
label: osx-latest-64-py-3-11-openmpi
prefix: /Users/runner/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: '3.11'
label: linux-64-py-3-11-openmpi
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: '3.10'
label: linux-64-py-3-10-openmpi
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: 3.9
label: linux-64-py-3-9-openmpi
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: 3.8
label: linux-64-py-3-8-openmpi
prefix: /usr/share/miniconda3/envs/my-env

steps:
- uses: actions/checkout@v2
Expand Down
Loading