Renaming public image methods to match the ones on python.

Author: datumbox

torchvision/csrc/io/image/cpu/read_image_impl.cpp renamed to torchvision/csrc/io/image/cpu/decode_image.cpp

@@ -1,7 +1,7 @@
-#include "read_image_impl.h"
+#include "decode_image.h"
 
-#include "readjpeg_impl.h"
-#include "readpng_impl.h"
+#include "decode_jpeg.h"
+#include "decode_png.h"
 
 namespace vision {
 namespace image {
@@ -20,9 +20,9 @@ torch::Tensor decode_image(const torch::Tensor& data, ImageReadMode mode) {
   const uint8_t png_signature[4] = {137, 80, 78, 71}; // == "\211PNG"
 
   if (memcmp(jpeg_signature, datap, 3) == 0) {
-    return decodeJPEG(data, mode);
+    return decode_jpeg(data, mode);
   } else if (memcmp(png_signature, datap, 4) == 0) {
-    return decodePNG(data, mode);
+    return decode_png(data, mode);
   } else {
     TORCH_CHECK(
         false,

torchvision/csrc/io/image/cpu/read_image_impl.h renamed to torchvision/csrc/io/image/cpu/decode_image.h

@@ -1,4 +1,4 @@
-#include "readjpeg_impl.h"
+#include "decode_jpeg.h"
 #include "jpegcommon.h"
 
 namespace vision {
@@ -7,9 +7,9 @@ namespace image {
 using namespace detail;
 
 #if !JPEG_FOUND
-torch::Tensor decodeJPEG(const torch::Tensor& data, ImageReadMode mode) {
+torch::Tensor decode_jpeg(const torch::Tensor& data, ImageReadMode mode) {
   TORCH_CHECK(
-      false, "decodeJPEG: torchvision not compiled with libjpeg support");
+      false, "decode_jpeg: torchvision not compiled with libjpeg support");
 }
 #else
 
@@ -73,7 +73,7 @@ static void torch_jpeg_set_source_mgr(
 
 } // namespace
 
-torch::Tensor decodeJPEG(const torch::Tensor& data, ImageReadMode mode) {
+torch::Tensor decode_jpeg(const torch::Tensor& data, ImageReadMode mode) {
   // Check that the input tensor dtype is uint8
   TORCH_CHECK(data.dtype() == torch::kU8, "Expected a torch.uint8 tensor");
   // Check that the input tensor is 1-dimensional

torchvision/csrc/io/image/cpu/readjpeg_impl.cpp renamed to torchvision/csrc/io/image/cpu/decode_jpeg.cpp

@@ -6,7 +6,7 @@
 namespace vision {
 namespace image {
 
-C10_EXPORT torch::Tensor decodeJPEG(
+C10_EXPORT torch::Tensor decode_jpeg(
     const torch::Tensor& data,
     ImageReadMode mode = IMAGE_READ_MODE_UNCHANGED);
 

torchvision/csrc/io/image/cpu/readjpeg_impl.h renamed to torchvision/csrc/io/image/cpu/decode_jpeg.h

@@ -1,16 +1,17 @@
-#include "readpng_impl.h"
+#include "decode_png.h"
 #include "pngcommon.h"
 
 namespace vision {
 namespace image {
 
 #if !PNG_FOUND
-torch::Tensor decodePNG(const torch::Tensor& data, ImageReadMode mode) {
-  TORCH_CHECK(false, "decodePNG: torchvision not compiled with libPNG support");
+torch::Tensor decode_png(const torch::Tensor& data, ImageReadMode mode) {
+  TORCH_CHECK(
+      false, "decode_png: torchvision not compiled with libPNG support");
 }
 #else
 
-torch::Tensor decodePNG(const torch::Tensor& data, ImageReadMode mode) {
+torch::Tensor decode_png(const torch::Tensor& data, ImageReadMode mode) {
   // Check that the input tensor dtype is uint8
   TORCH_CHECK(data.dtype() == torch::kU8, "Expected a torch.uint8 tensor");
   // Check that the input tensor is 1-dimensional

torchvision/csrc/io/image/cpu/readpng_impl.cpp renamed to torchvision/csrc/io/image/cpu/decode_png.cpp

@@ -6,7 +6,7 @@
 namespace vision {
 namespace image {
 
-C10_EXPORT torch::Tensor decodePNG(
+C10_EXPORT torch::Tensor decode_png(
     const torch::Tensor& data,
     ImageReadMode mode = IMAGE_READ_MODE_UNCHANGED);
 

torchvision/csrc/io/image/cpu/readpng_impl.h renamed to torchvision/csrc/io/image/cpu/decode_png.h

@@ -1,4 +1,4 @@
-#include "writejpeg_impl.h"
+#include "encode_jpeg.h"
 
 #include "jpegcommon.h"
 
@@ -9,14 +9,14 @@ using namespace detail;
 
 #if !JPEG_FOUND
 
-torch::Tensor encodeJPEG(const torch::Tensor& data, int64_t quality) {
+torch::Tensor encode_jpeg(const torch::Tensor& data, int64_t quality) {
   TORCH_CHECK(
-      false, "encodeJPEG: torchvision not compiled with libjpeg support");
+      false, "encode_jpeg: torchvision not compiled with libjpeg support");
 }
 
 #else
 
-torch::Tensor encodeJPEG(const torch::Tensor& data, int64_t quality) {
+torch::Tensor encode_jpeg(const torch::Tensor& data, int64_t quality) {
   // Define compression structures and error handling
   struct jpeg_compress_struct cinfo;
   struct torch_jpeg_error_mgr jerr;

torchvision/csrc/io/image/cpu/writejpeg_impl.cpp renamed to torchvision/csrc/io/image/cpu/encode_jpeg.cpp

@@ -5,7 +5,9 @@
 namespace vision {
 namespace image {
 
-C10_EXPORT torch::Tensor encodeJPEG(const torch::Tensor& data, int64_t quality);
+C10_EXPORT torch::Tensor encode_jpeg(
+    const torch::Tensor& data,
+    int64_t quality);
 
 } // namespace image
 } // namespace vision

torchvision/csrc/io/image/cpu/writejpeg_impl.h renamed to torchvision/csrc/io/image/cpu/encode_jpeg.h

@@ -1,4 +1,4 @@
-#include "writejpeg_impl.h"
+#include "encode_jpeg.h"
 
 #include "pngcommon.h"
 
@@ -7,8 +7,9 @@ namespace image {
 
 #if !PNG_FOUND
 
-torch::Tensor encodePNG(const torch::Tensor& data, int64_t compression_level) {
-  TORCH_CHECK(false, "encodePNG: torchvision not compiled with libpng support");
+torch::Tensor encode_png(const torch::Tensor& data, int64_t compression_level) {
+  TORCH_CHECK(
+      false, "encode_png: torchvision not compiled with libpng support");
 }
 
 #else
@@ -66,7 +67,7 @@ void torch_png_write_data(
 
 } // namespace
 
-torch::Tensor encodePNG(const torch::Tensor& data, int64_t compression_level) {
+torch::Tensor encode_png(const torch::Tensor& data, int64_t compression_level) {
   // Define compression structures and error handling
   png_structp png_write;
   png_infop info_ptr;

torchvision/csrc/io/image/cpu/writepng_impl.cpp renamed to torchvision/csrc/io/image/cpu/encode_png.cpp

@@ -5,7 +5,7 @@
 namespace vision {
 namespace image {
 
-C10_EXPORT torch::Tensor encodePNG(
+C10_EXPORT torch::Tensor encode_png(
     const torch::Tensor& data,
     int64_t compression_level);
 

torchvision/csrc/io/image/cpu/writepng_impl.h renamed to torchvision/csrc/io/image/cpu/encode_png.h

@@ -1,4 +1,4 @@
-#include "read_write_file_impl.h"
+#include "read_write_file.h"
 
 #include <sys/stat.h>
 

torchvision/csrc/io/image/cpu/read_write_file_impl.cpp renamed to torchvision/csrc/io/image/cpu/read_write_file.cpp

@@ -15,10 +15,10 @@ namespace vision {
 namespace image {
 
 static auto registry = torch::RegisterOperators()
-                           .op("image::decode_png", &decodePNG)
-                           .op("image::encode_png", &encodePNG)
-                           .op("image::decode_jpeg", &decodeJPEG)
-                           .op("image::encode_jpeg", &encodeJPEG)
+                           .op("image::decode_png", &decode_png)
+                           .op("image::encode_png", &encode_png)
+                           .op("image::decode_jpeg", &decode_jpeg)
+                           .op("image::encode_jpeg", &encode_jpeg)
                            .op("image::read_file", &read_file)
                            .op("image::write_file", &write_file)
                            .op("image::decode_image", &decode_image);

torchvision/csrc/io/image/cpu/read_write_file_impl.h renamed to torchvision/csrc/io/image/cpu/read_write_file.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "cpu/read_image_impl.h"
-#include "cpu/read_write_file_impl.h"
-#include "cpu/readjpeg_impl.h"
-#include "cpu/readpng_impl.h"
-#include "cpu/writejpeg_impl.h"
-#include "cpu/writepng_impl.h"
+#include "cpu/decode_image.h"
+#include "cpu/decode_jpeg.h"
+#include "cpu/decode_png.h"
+#include "cpu/encode_jpeg.h"
+#include "cpu/encode_png.h"
+#include "cpu/read_write_file.h"