From 15209e50816bdae6a75144730515e889a77f7003 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Fri, 17 Sep 2021 14:10:03 +0100 Subject: [PATCH 1/4] Windows use size_t --- torchvision/csrc/io/image/cpu/encode_jpeg.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/torchvision/csrc/io/image/cpu/encode_jpeg.cpp b/torchvision/csrc/io/image/cpu/encode_jpeg.cpp index 3b669b9906c..a8dbc7b2a28 100644 --- a/torchvision/csrc/io/image/cpu/encode_jpeg.cpp +++ b/torchvision/csrc/io/image/cpu/encode_jpeg.cpp @@ -15,11 +15,7 @@ torch::Tensor encode_jpeg(const torch::Tensor& data, int64_t quality) { #else // For libjpeg version <= 9b, the out_size parameter in jpeg_mem_dest() is // defined as unsigned long, whereas in later version, it is defined as size_t. -// For windows backward compatibility, we define JpegSizeType as different types -// according to the libjpeg version used, in order to prevent compilation -// errors. -#if defined(_WIN32) || !defined(JPEG_LIB_VERSION_MAJOR) || \ - JPEG_LIB_VERSION_MAJOR < 9 || \ +#if !defined(JPEG_LIB_VERSION_MAJOR) || JPEG_LIB_VERSION_MAJOR < 9 || \ (JPEG_LIB_VERSION_MAJOR == 9 && JPEG_LIB_VERSION_MINOR <= 2) using JpegSizeType = unsigned long; #else From 827b7adb113a92332bc6fbbfaef922207e445990 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Fri, 17 Sep 2021 14:58:01 +0100 Subject: [PATCH 2/4] Temporarily pin jpeg <=9b --- .circleci/unittest/linux/scripts/environment.yml | 2 +- .circleci/unittest/windows/scripts/environment.yml | 2 +- packaging/torchvision/meta.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index ce3fe3be6e6..f49a1d59155 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -7,7 +7,7 @@ dependencies: - pytest-mock - pip - libpng - - jpeg + - jpeg <=9b - ca-certificates - pip: - future diff --git a/.circleci/unittest/windows/scripts/environment.yml b/.circleci/unittest/windows/scripts/environment.yml index 5b0d3f5462d..21ae23a0ff8 100644 --- a/.circleci/unittest/windows/scripts/environment.yml +++ b/.circleci/unittest/windows/scripts/environment.yml @@ -7,7 +7,7 @@ dependencies: - pytest-mock - pip - libpng - - jpeg + - jpeg <=9b - ca-certificates - pip: - future diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index da061c5cc2a..928e67cbf98 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -9,7 +9,7 @@ requirements: build: - {{ compiler('c') }} # [win] - libpng - - jpeg + - jpeg <=9b # NOTE: The only ffmpeg version that we build is actually 4.2 - ffmpeg >=4.2 # [not win] @@ -24,7 +24,7 @@ requirements: - python - libpng - ffmpeg >=4.2 # [not win] - - jpeg + - jpeg <=9b - pillow >=5.3.0 {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} @@ -50,7 +50,7 @@ test: requires: - pytest - scipy - - jpeg + - jpeg <=9b - ca-certificates From 93f8bbbbefc11c8d1e1f8bd9f7bcfe08d30f88c4 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Fri, 17 Sep 2021 15:20:32 +0100 Subject: [PATCH 3/4] Temporarily pin jpeg ==9c --- .circleci/unittest/linux/scripts/environment.yml | 2 +- .circleci/unittest/windows/scripts/environment.yml | 2 +- packaging/torchvision/meta.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index f49a1d59155..699bebd2b2f 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -7,7 +7,7 @@ dependencies: - pytest-mock - pip - libpng - - jpeg <=9b + - jpeg ==9c - ca-certificates - pip: - future diff --git a/.circleci/unittest/windows/scripts/environment.yml b/.circleci/unittest/windows/scripts/environment.yml index 21ae23a0ff8..489369e43ab 100644 --- a/.circleci/unittest/windows/scripts/environment.yml +++ b/.circleci/unittest/windows/scripts/environment.yml @@ -7,7 +7,7 @@ dependencies: - pytest-mock - pip - libpng - - jpeg <=9b + - jpeg ==9c - ca-certificates - pip: - future diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index 928e67cbf98..325042acb42 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -9,7 +9,7 @@ requirements: build: - {{ compiler('c') }} # [win] - libpng - - jpeg <=9b + - jpeg ==9c # NOTE: The only ffmpeg version that we build is actually 4.2 - ffmpeg >=4.2 # [not win] @@ -24,7 +24,7 @@ requirements: - python - libpng - ffmpeg >=4.2 # [not win] - - jpeg <=9b + - jpeg ==9c - pillow >=5.3.0 {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} @@ -50,7 +50,7 @@ test: requires: - pytest - scipy - - jpeg <=9b + - jpeg ==9c - ca-certificates From 336bbcd1ab4c8889d8b1417151e7c969aa6d5d20 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Fri, 17 Sep 2021 15:27:01 +0100 Subject: [PATCH 4/4] Remove pinning. --- .circleci/unittest/linux/scripts/environment.yml | 2 +- .circleci/unittest/windows/scripts/environment.yml | 2 +- packaging/torchvision/meta.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index 699bebd2b2f..ce3fe3be6e6 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -7,7 +7,7 @@ dependencies: - pytest-mock - pip - libpng - - jpeg ==9c + - jpeg - ca-certificates - pip: - future diff --git a/.circleci/unittest/windows/scripts/environment.yml b/.circleci/unittest/windows/scripts/environment.yml index 489369e43ab..5b0d3f5462d 100644 --- a/.circleci/unittest/windows/scripts/environment.yml +++ b/.circleci/unittest/windows/scripts/environment.yml @@ -7,7 +7,7 @@ dependencies: - pytest-mock - pip - libpng - - jpeg ==9c + - jpeg - ca-certificates - pip: - future diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index 325042acb42..da061c5cc2a 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -9,7 +9,7 @@ requirements: build: - {{ compiler('c') }} # [win] - libpng - - jpeg ==9c + - jpeg # NOTE: The only ffmpeg version that we build is actually 4.2 - ffmpeg >=4.2 # [not win] @@ -24,7 +24,7 @@ requirements: - python - libpng - ffmpeg >=4.2 # [not win] - - jpeg ==9c + - jpeg - pillow >=5.3.0 {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} @@ -50,7 +50,7 @@ test: requires: - pytest - scipy - - jpeg ==9c + - jpeg - ca-certificates