Skip to content

Commit

Permalink
deps: unpin versions
Browse files Browse the repository at this point in the history
  • Loading branch information
XuehaiPan committed May 10, 2024
1 parent 08c4a6a commit 839f737
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 29 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ addlicense-install: go-install

# Tests

pytest: pytest-install
pytest: test-install
$(PYTHON) -m pytest --version
cd tests && $(PYTHON) -c 'import $(PROJECT_PATH)' && \
$(PYTHON) -c 'import $(PROJECT_PATH)._C; print(f"GLIBCXX_USE_CXX11_ABI={$(PROJECT_PATH)._C.GLIBCXX_USE_CXX11_ABI}")' && \
Expand Down Expand Up @@ -185,7 +185,7 @@ clang-format: clang-format-install

clang-tidy: clang-tidy-install cmake-configure
clang-tidy --version
clang-tidy -p=cmake-build-debug $(CXX_FILES)
clang-tidy --extra-arg="-v" -p=cmake-build-debug $(CXX_FILES)

# Documentation

Expand Down
29 changes: 15 additions & 14 deletions conda-recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ channels:
- conda-forge

dependencies:
- python = 3.10
- python = 3.11
- pip

# Dependency
Expand All @@ -36,15 +36,15 @@ dependencies:
- cmake >= 3.11
- make
- cxx-compiler
- pybind11
- pybind11 >= 2.11.1

# Benchmark
- pytorch::pytorch >= 2.0, < 2.1.0a0
- pytorch::pytorch >= 2.0, < 2.4.0a0
- pytorch::torchvision
- pytorch::pytorch-mutex = *=*cpu*
- jax >= 0.4.6, < 0.5.0a0
- jaxlib >= 0.4, < 0.5.0a0 =*cpu*
- dm-tree
- conda-forge::jax >= 0.4.6, < 0.5.0a0
- conda-forge::jaxlib >= 0.4, < 0.5.0a0 =*cpu*
- conda-forge::dm-tree
- pandas
- tabulate
- termcolor
Expand All @@ -65,10 +65,10 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- isort >= 5.11.0
- conda-forge::black >= 22.6.0
- pylint >= 2.15.0
- mypy >= 0.990
- isort
- conda-forge::black
- pylint
- mypy
- flake8
- flake8-bugbear
- flake8-comprehensions
Expand All @@ -79,7 +79,8 @@ dependencies:
- doc8
- pydocstyle
- xdoctest
- clang-format >= 14
- clang-tools >= 14 # clang-tidy
- cpplint
- pre-commit
- conda-forge::clang-format >= 14
- conda-forge::clang-tools >= 14 # clang-tidy
- conda-forge::cpplint
- conda-forge::pre-commit
- conda-forge::identify
4 changes: 2 additions & 2 deletions docs/conda-recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ channels:
- conda-forge

dependencies:
- python = 3.10
- python = 3.11
- pip

# Dependency
Expand All @@ -35,7 +35,7 @@ dependencies:
- cmake >= 3.11
- make
- cxx-compiler
- pybind11
- pybind11 >= 2.11.1

# Documentation
- sphinx >= 5.2.1
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ sphinxcontrib-bibtex
sphinx-autodoc-typehints >= 1.19.2
docutils

jax[cpu] >= 0.3
jax[cpu] >= 0.4.6
numpy
torch
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ jax = ["jax"]
numpy = ["numpy"]
torch = ["torch"]
lint = [
"isort >= 5.11.0",
"black >= 22.6.0",
"pylint[spelling] >= 2.15.0",
"mypy >= 0.990",
"isort",
"black",
"pylint[spelling]",
"mypy",
"flake8",
"flake8-bugbear",
"flake8-comprehensions",
Expand Down Expand Up @@ -89,7 +89,7 @@ docs = [
]
benchmark = [
"jax[cpu] >= 0.4.6, < 0.5.0a0",
"torch >= 2.0, < 2.3.0a0",
"torch >= 2.0, < 2.4.0a0",
"torchvision",
"dm-tree >= 0.1, < 0.2.0a0",
"pandas",
Expand Down
10 changes: 5 additions & 5 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
pytest
pytest-cov
pytest-xdist
isort >= 5.11.0
black >= 22.6.0
pylint[spelling] >= 2.15.0
mypy >= 0.990
isort
black
pylint[spelling]
mypy
flake8
flake8-bugbear
flake8-comprehensions
Expand All @@ -21,6 +21,6 @@ xdoctest
cpplint
pre-commit

jax[cpu] >= 0.3
jax[cpu] >= 0.4.6
numpy
torch

0 comments on commit 839f737

Please sign in to comment.