Skip to content

Commit

Permalink
Merge branch 'master' into fix-panoptic-class-order
Browse files Browse the repository at this point in the history
  • Loading branch information
SkafteNicki authored May 30, 2024
2 parents f9ffb54 + 8d9d2ae commit e4fc7b8
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-integrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
# this was updated in `source cashing` by optional oldest
cat requirements/_integrate.txt
# to have install pyTorch
pip install -e . --find-links=${PYTORCH_URL}
pip install -e . "setuptools==69.5.1" --find-links=${PYTORCH_URL}
# adjust version to PT ecosystem based on installed TM
python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ jobs:
timeout-minutes: 25
run: |
pip --version
pip install -e . -U --find-links $PYTORCH_URL -f $PYPI_CACHE
pip install -r requirements/_doctest.txt -U -f $PYPI_CACHE
pip install -e . -U "setuptools==69.5.1" -r requirements/_doctest.txt \
--find-links $PYTORCH_URL -f $PYPI_CACHE
pip list
- name: DocTests
Expand Down
2 changes: 1 addition & 1 deletion dockers/ubuntu-cuda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ COPY requirements/ requirements/

RUN \
# set particular PyTorch version
pip install -q wget packaging && \
pip install -q wget packaging "setuptools==69.5.1" && \
python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py && \
for fpath in `ls requirements/*.txt`; do \
python ./adjust-torch-versions.py $fpath ${PYTORCH_VERSION}; \
Expand Down
3 changes: 2 additions & 1 deletion requirements/_docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ pydantic > 1.0.0, < 3.0.0
# --------------------------
# todo: until this has resolution - https://github.com/sphinx-gallery/sphinx-gallery/issues/1290
# Image
scikit-image ~=0.22
scikit-image ~=0.22; python_version < "3.10"
scikit-image ~=0.23; python_version >= "3.10"
2 changes: 1 addition & 1 deletion requirements/_integrate.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# contentiously validated integration with these expected ranges

# ToDo: investigate and add validation with 2.0+ on GPU
pytorch-lightning >=1.9.0, <2.1.0
pytorch-lightning >=1.9.0, <2.3.0
4 changes: 2 additions & 2 deletions requirements/_tests.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

coverage ==7.5.1
pytest ==8.1.1
coverage ==7.5.2
pytest ==8.2.1
pytest-cov ==5.0.0
pytest-doctestplus ==1.2.1
pytest-rerunfailures ==14.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/classification_test.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

pandas >=1.4.0, <=2.0.3
pandas >=1.4.0, <=2.2.2
netcal >1.0.0, <=1.3.5 # calibration_error
numpy <1.27.0
fairlearn # group_fairness
2 changes: 1 addition & 1 deletion requirements/multimodal.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

transformers >=4.10.0, <4.41.0
transformers >=4.10.0, <4.42.0
piq <=0.8.0
2 changes: 1 addition & 1 deletion requirements/nominal_test.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

pandas >1.0.0, <=2.0.3 # cannot pin version due to numpy version incompatibility
pandas >1.0.0, <=2.2.2 # cannot pin version due to numpy version incompatibility
dython <=0.7.5
scipy >1.0.0, <1.11.0 # cannot pin version due to some version conflicts with `oldest` CI configuration
statsmodels >0.13.5, <0.15.0
4 changes: 2 additions & 2 deletions requirements/text.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

nltk >=3.6, <=3.8.1
tqdm >=4.41.0, <4.67.0
regex >=2021.9.24, <=2024.5.10
transformers >4.4.0, <4.41.0
regex >=2021.9.24, <=2024.5.15
transformers >4.4.0, <4.42.0
mecab-python3 >=1.0.6, <1.1.0
ipadic >=1.0.0, <1.1.0
sentencepiece >=0.2.0, <0.3.0
2 changes: 1 addition & 1 deletion requirements/text_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
jiwer >=2.3.0, <3.1.0
rouge-score >0.1.0, <=0.1.2
bert_score ==0.3.13
huggingface-hub <0.23
huggingface-hub <0.24
sacrebleu >=2.3.0, <2.5.0

mecab-ko >=1.0.0, <1.1.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/typing.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mypy ==1.9.0
mypy ==1.10.0
torch ==2.3.0

types-PyYAML
Expand Down

0 comments on commit e4fc7b8

Please sign in to comment.