[fbsync] Unpinned the libjpeg version and fixed jpeg_mem_dest's size type Wind… (#4288)

Summary:
* Unpinned the libjpeg version and fixed jpeg_mem_dest's size type Windows BC issue

* Temporarily get back pinned jpeg lib in order to run tests on CircleCI

* Revert "Temporarily get back pinned jpeg lib in order to run tests on CircleCI"

This reverts commit ab18a35.

* Used using instead of typedef and Fixed comment typo

Reviewed By: fmassa

Differential Revision: D30525893

fbshipit-source-id: bae9830e2d2212b9575a9ba6b4cc8313ba91e395

Co-authored-by: Zhongkai Zhu <[email protected]>
Co-authored-by: Vasilis Vryniotis <[email protected]>

Author: 2 people

.circleci/unittest/linux/scripts/environment.yml

@@ -7,8 +7,7 @@ dependencies:
   - pytest-mock
   - pip
   - libpng
-  # NOTE: Pinned to fix issues with size_t on Windows
-  - jpeg <=9b
+  - jpeg
   - ca-certificates
   - pip:
     - future

.circleci/unittest/windows/scripts/environment.yml

@@ -7,8 +7,7 @@ dependencies:
   - pytest-mock
   - pip
   - libpng
-  # NOTE: Pinned to fix issues with size_t on Windows
-  - jpeg <=9b
+  - jpeg
   - ca-certificates
   - pip:
     - future

packaging/torchvision/meta.yaml

@@ -9,8 +9,7 @@ requirements:
   build:
     - {{ compiler('c') }} # [win]
     - libpng
-    # NOTE: Pinned to fix issues with size_t on Windows
-    - jpeg <=9b
+    - jpeg
     # NOTE: The only ffmpeg version that we build is actually 4.2
     - ffmpeg >=4.2  # [not win]
 
@@ -25,8 +24,7 @@ requirements:
     - python
     - libpng
     - ffmpeg >=4.2  # [not win]
-    # NOTE: Pinned to fix issues with size_t on Windows
-    - jpeg <=9b
+    - jpeg
     - pillow >=5.3.0
     {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }}
     {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }}
@@ -52,8 +50,7 @@ test:
   requires:
     - pytest
     - scipy
-    # NOTE: Pinned to fix issues with size_t on Windows
-    - jpeg <=9b
+    - jpeg
     - ca-certificates
 
 

torchvision/csrc/io/image/cpu/encode_jpeg.cpp

@@ -13,6 +13,18 @@ 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, where as 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 compilcation
+// errors.
+#if defined(_WIN32) || !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
+using JpegSizeType = size_t;
+#endif
 
 using namespace detail;
 
@@ -22,7 +34,7 @@ torch::Tensor encode_jpeg(const torch::Tensor& data, int64_t quality) {
   struct torch_jpeg_error_mgr jerr {};
 
   // Define buffer to write JPEG information to and its size
-  unsigned long jpegSize = 0;
+  JpegSizeType jpegSize = 0;
   uint8_t* jpegBuf = nullptr;
 
   cinfo.err = jpeg_std_error(&jerr.pub);