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

Correct package requirements for tests. #271

Merged
merged 14 commits into from
Feb 14, 2023
Merged

Correct package requirements for tests. #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3de6e6c
Test commit on personal fork.
AWehenkel Feb 14, 2023
97b8255
Test commit on personal fork.
AWehenkel Feb 14, 2023
daeeb24
Add and update copyrights.
AWehenkel Feb 14, 2023
7ec7fc1
Correct packages requirements for tests.
AWehenkel Feb 14, 2023
a2d31f7
Merge branch 'ott-jax:main' into copyrights
AWehenkel Feb 14, 2023
b7860e1
Add apt-get install libsuitesparse-dev to get tests with scikit-spars…
AWehenkel Feb 14, 2023
ca26f2a
Merge remote-tracking branch 'origin/copyrights' into minor_changes_c…
AWehenkel Feb 14, 2023
8e37345
Merge branch 'ott-jax:main' into copyrights
AWehenkel Feb 14, 2023
e79c1fc
Corect os runner check and also add it to "norma" tests.
AWehenkel Feb 14, 2023
e1a019e
Merge remote-tracking branch 'origin/copyrights' into minor_changes_c…
AWehenkel Feb 14, 2023
b9d8198
Add brew install for scikit sparse.
AWehenkel Feb 14, 2023
004bfa7
remove scikit-sparse from 3.11.
AWehenkel Feb 14, 2023
3c5c7f7
Install libsuite sparse for gpu env tests.
AWehenkel Feb 14, 2023
c7b14f2
Remove libsuite sparse for gpu env tests (added in the docker).
AWehenkel Feb 14, 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
21 changes: 21 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ jobs:
with:
python-version: '3.9'

- name: Install apt dependencies
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get install libsuitesparse-dev

- name: Install brew dependencies
if: ${{ runner.os == 'macOS' }}
run: |
brew install suite-sparse

- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand All @@ -44,6 +54,7 @@ jobs:
options: --gpus="device=12"
steps:
- uses: actions/checkout@v3

- name: Install dependencies
# `jax[cuda]<0.4` because of Docker issues: https://github.com/google/jax/issues/13758
# `flax<0.6.5` because it requires `jax>=0.4.2`
Expand Down Expand Up @@ -80,6 +91,16 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Install apt dependencies
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get install libsuitesparse-dev

- name: Install brew dependencies
if: ${{ runner.os == 'macOS' }}
run: |
brew install suite-sparse

- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ test = [
"networkx>=2.5",
"scikit-learn>=1.0"
]
experimental = [
"scikit-sparse>=0.4.6",
]
docs = [
"sphinx>=4.0",
"ipython>=7.20.0",
Expand Down Expand Up @@ -177,6 +174,7 @@ legacy_tox_ini = """
[testenv]
extras = test
pass_env = CUDA_*,PYTEST_*,CI
deps = py{38,39,310}: scikit-sparse>=0.4.6
Copy link
Contributor

Choose a reason for hiding this comment

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

this is for graph geometry, right?

commands =
gpu: pip install "jax[cuda]" -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html
python -m pytest {tty:--color=yes} {posargs: \
Expand Down