Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
vision
Commits
851b623c
"src/vscode:/vscode.git/clone" did not exist on "23546ab5cfad6d0c968621bb7da1424d09ff1158"
Unverified
Commit
851b623c
authored
May 07, 2021
by
Vasilis Vryniotis
Committed by
GitHub
May 07, 2021
Browse files
Pin JPEG version to resolve the size_t issue on windows (#3787)
parent
a78d0d83
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
.circleci/unittest/linux/scripts/environment.yml
.circleci/unittest/linux/scripts/environment.yml
+2
-1
.circleci/unittest/windows/scripts/environment.yml
.circleci/unittest/windows/scripts/environment.yml
+2
-1
packaging/torchvision/meta.yaml
packaging/torchvision/meta.yaml
+6
-3
No files found.
.circleci/unittest/linux/scripts/environment.yml
View file @
851b623c
...
@@ -9,7 +9,8 @@ dependencies:
...
@@ -9,7 +9,8 @@ dependencies:
-
codecov
-
codecov
-
pip
-
pip
-
libpng
-
libpng
-
jpeg
# NOTE: Pinned to fix issues with size_t on Windows
-
jpeg <=9b
-
ca-certificates
-
ca-certificates
-
pip
:
-
pip
:
-
future
-
future
...
...
.circleci/unittest/windows/scripts/environment.yml
View file @
851b623c
...
@@ -9,7 +9,8 @@ dependencies:
...
@@ -9,7 +9,8 @@ dependencies:
-
codecov
-
codecov
-
pip
-
pip
-
libpng
-
libpng
-
jpeg
# NOTE: Pinned to fix issues with size_t on Windows
-
jpeg <=9b
-
ca-certificates
-
ca-certificates
-
pip
:
-
pip
:
-
future
-
future
...
...
packaging/torchvision/meta.yaml
View file @
851b623c
...
@@ -9,7 +9,8 @@ requirements:
...
@@ -9,7 +9,8 @@ requirements:
build
:
build
:
-
{{
compiler('c')
}}
# [win]
-
{{
compiler('c')
}}
# [win]
-
libpng
-
libpng
-
jpeg
# NOTE: Pinned to fix issues with size_t on Windows
-
jpeg <=9b
# NOTE: The only ffmpeg version that we build is actually 4.2
# NOTE: The only ffmpeg version that we build is actually 4.2
-
ffmpeg >=4.2
# [not win]
-
ffmpeg >=4.2
# [not win]
...
@@ -24,7 +25,8 @@ requirements:
...
@@ -24,7 +25,8 @@ requirements:
-
python
-
python
-
libpng
-
libpng
-
ffmpeg >=4.2
# [not win]
-
ffmpeg >=4.2
# [not win]
-
jpeg
# NOTE: Pinned to fix issues with size_t on Windows
-
jpeg <=9b
-
pillow >=5.3.0
-
pillow >=5.3.0
{{
environ.get('CONDA_PYTORCH_CONSTRAINT')
}}
{{
environ.get('CONDA_PYTORCH_CONSTRAINT')
}}
{{
environ.get('CONDA_CUDATOOLKIT_CONSTRAINT')
}}
{{
environ.get('CONDA_CUDATOOLKIT_CONSTRAINT')
}}
...
@@ -51,7 +53,8 @@ test:
...
@@ -51,7 +53,8 @@ test:
-
pytest
-
pytest
-
scipy
-
scipy
-
av >=8.0.1
-
av >=8.0.1
-
jpeg
# NOTE: Pinned to fix issues with size_t on Windows
-
jpeg <=9b
-
ca-certificates
-
ca-certificates
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment