Skip to content

NOMRG Show libjpeg version when building #3968

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

Closed
NicolasHug wants to merge 5 commits into from
Closed

NOMRG Show libjpeg version when building #3968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a04b86
-e and -v for conda
NicolasHug Jun 4, 2021
7b7ed53
Merge branch 'master' of github.com:pytorch/vision into show_libjpeg
NicolasHug Jun 4, 2021
6528849
forgot -v
NicolasHug Jun 4, 2021
c551e8b
-vvv, yolo
NicolasHug Jun 4, 2021
ce4f0a6
add hacky _jpeg_version()
NicolasHug Jun 4, 2021
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
4 changes: 2 additions & 2 deletions .circleci/unittest/linux/scripts/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# Do not install PyTorch and torchvision here, otherwise they also get cached.

set -e
set -ex

this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
root_dir="$(git rev-parse --show-toplevel)"
Expand Down Expand Up @@ -42,4 +42,4 @@ if [[ "${PYTHON_VERSION}" = "3.9" ]]; then
fi

conda install -y -c pytorch "ffmpeg${FFMPEG_PIN}"
conda env update --file "${this_dir}/environment.yml" --prune
conda env update --file "${this_dir}/environment.yml" --prune -vvv
4 changes: 2 additions & 2 deletions .circleci/unittest/windows/scripts/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# Do not install PyTorch and torchvision here, otherwise they also get cached.

set -e
set -ex

this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
root_dir="$(git rev-parse --show-toplevel)"
Expand Down Expand Up @@ -36,4 +36,4 @@ conda activate "${env_dir}"

# 3. Install Conda dependencies
printf "* Installing dependencies (except PyTorch)\n"
conda env update --file "${this_dir}/environment.yml" --prune
conda env update --file "${this_dir}/environment.yml" --prune -vvv
18 changes: 18 additions & 0 deletions torchvision/csrc/io/image/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,21 @@ static auto registry = torch::RegisterOperators()

} // namespace image
} // namespace vision

#ifdef JPEG_FOUND
#include <jpeglib.h>
#endif

namespace vision {
int64_t jpeg_version() {
#ifdef JPEG_FOUND
return JPEG_LIB_VERSION;
#else
return -1;
#endif
}

TORCH_LIBRARY_FRAGMENT(torchvision, m) {
m.def("_jpeg_version", &jpeg_version);
}
} // namespace vision