From 8a04b86824c17ea8e8d0871539f48667f4b3b1f3 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Fri, 4 Jun 2021 15:01:02 +0100 Subject: [PATCH 1/4] -e and -v for conda --- .circleci/unittest/linux/scripts/setup_env.sh | 4 ++-- .circleci/unittest/windows/scripts/setup_env.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index 773bd78f202..b71f4f6d178 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -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)" @@ -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 -v diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index b0b70631112..fcbbdc1d6a9 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -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)" @@ -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 - From 6528849d0858798e8157434bf1f5ab1ba77c542f Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Fri, 4 Jun 2021 15:08:56 +0100 Subject: [PATCH 2/4] forgot -v --- .circleci/unittest/windows/scripts/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index fcbbdc1d6a9..00f93662152 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -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 -v From c551e8b253cb02c77919aa519c76ef7f0ab1989f Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Fri, 4 Jun 2021 15:10:12 +0100 Subject: [PATCH 3/4] -vvv, yolo --- .circleci/unittest/linux/scripts/setup_env.sh | 2 +- .circleci/unittest/windows/scripts/setup_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/linux/scripts/setup_env.sh b/.circleci/unittest/linux/scripts/setup_env.sh index b71f4f6d178..7b593e77c5f 100755 --- a/.circleci/unittest/linux/scripts/setup_env.sh +++ b/.circleci/unittest/linux/scripts/setup_env.sh @@ -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 -v +conda env update --file "${this_dir}/environment.yml" --prune -vvv diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index 00f93662152..98c1d9a893f 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -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 -v +conda env update --file "${this_dir}/environment.yml" --prune -vvv From ce4f0a6b9741b1f06dcd16022f163dbfa2f63428 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Fri, 4 Jun 2021 16:34:32 +0100 Subject: [PATCH 4/4] add hacky _jpeg_version() --- torchvision/csrc/io/image/image.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/torchvision/csrc/io/image/image.cpp b/torchvision/csrc/io/image/image.cpp index 37d64013cb2..df49635dd52 100644 --- a/torchvision/csrc/io/image/image.cpp +++ b/torchvision/csrc/io/image/image.cpp @@ -26,3 +26,21 @@ static auto registry = torch::RegisterOperators() } // namespace image } // namespace vision + +#ifdef JPEG_FOUND + #include +#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 \ No newline at end of file