torchvision 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ae301007e3310dfc378a7f76d24bd71cc048be6156b32d9e0705412817c565
-  data.tar.gz: 423aee54316683ddf9d3893e04f8836dd16ade1408f6c046f6d8f6f337a09a46
+  metadata.gz: d218068a8502ca9aa41ec3240043c55122c22e10944fb5d0fb402e95ccb48e99
+  data.tar.gz: 3d9288e590d4d9a570c7f6c501ffbd30ef968c58790e2beec42721672b34075f
 SHA512:
-  metadata.gz: cf9c5a514c2ef42299161f97f077897c11b4708858018ffefcb282d6434003d49555ba54ea93ef0fb9e2f3cafdd7bd4395677e02bdfa5b1dcad4772aaeccc896
-  data.tar.gz: 0e01311267e620be6dfbed77724baed42ad9c597a2b5452d762845597ae257932e76848e0069149598743d78dc08b0374b18897ce9a272640eed4a3cec21bbd9
+  metadata.gz: c841175a05fdace23e273413c863dcb2135fcab66414a6600864e16e12375c65d37a62fa2f03a433852f946324f40192ca5656d1f3e87b72ec0207e1f92e585f
+  data.tar.gz: a9e98d5929bed556b59ef29ad690668dac7bfe7b5f46f87e92d9e8dab352793ee659dcd8894343264c60b75bfd0cc07177db00bb0a5828410d879ebeb22bf860

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+## 0.2.2 (2021-05-23)
+
+- Fixed error with ruby-vips 2.1.2
+
+## 0.2.1 (2021-03-14)
+
+- Added `ImageFolder` and `DatasetFolder`
+- Added `CenterCrop` and `RandomResizedCrop` transforms
+- Added `crop` method
+
+## 0.2.0 (2021-03-11)
+
+- Added `RandomHorizontalFlip`, `RandomVerticalFlip`, and `Resize` transforms
+- Added `save_image` method
+- Added `data` and `targets` methods to datasets
+- Removed support for Ruby < 2.6
+
+Breaking changes
+
+- Added dependency on libvips
+- MNIST datasets return images instead of tensors
+
+## 0.1.3 (2020-06-29)
+
+- Added AlexNet model
+- Added ResNet34, ResNet50, ResNet101, and ResNet152 models
+- Added ResNeXt model
+- Added VGG11, VGG13, VGG16, and VGG19 models
+- Added Wide ResNet model
+
+## 0.1.2 (2020-04-29)
+
+- Added CIFAR10, CIFAR100, FashionMNIST, and KMNIST datasets
+- Added ResNet18 model
+
 ## 0.1.1 (2020-04-28)
 
 - Removed `mini_magick` for performance

data/LICENSE.txt

@@ -1,7 +1,7 @@
 BSD 3-Clause License
 
-Copyright (c) Andrew Kane 2020,
 Copyright (c) Soumith Chintala 2016,
+Copyright (c) Andrew Kane 2020-2021,
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -2,12 +2,16 @@
 
 :fire: Computer vision datasets, transforms, and models for Ruby
 
-This gem is currently experimental. There may be breaking changes between each release. Please report any issues you experience.
-
-[![Build Status](https://travis-ci.org/ankane/torchvision.svg?branch=master)](https://travis-ci.org/ankane/torchvision)
+[![Build Status](https://github.com/ankane/torchvision/workflows/build/badge.svg?branch=master)](https://github.com/ankane/torchvision/actions)
 
 ## Installation
 
+First, [install libvips](#libvips-installation). For Homebrew, use:
+
+```sh
+brew install vips
+```
+
 Add this line to your application’s Gemfile:
 
 ```ruby
@@ -16,17 +20,139 @@ gem 'torchvision'
 
 ## Getting Started
 
-This library follows the [Python API](https://pytorch.org/docs/master/torchvision/). Many methods and options are missing at the moment. PRs welcome!
+This library follows the [Python API](https://pytorch.org/docs/stable/torchvision/index.html). Many methods and options are missing at the moment. PRs welcome!
+
+## Examples
+
+- [MNIST](https://github.com/ankane/torch.rb/tree/master/examples/mnist)
+- [Transfer learning](https://github.com/ankane/torch.rb/tree/master/examples/transfer-learning)
+- [Generative adversarial networks](https://github.com/ankane/torch.rb/tree/master/examples/gan)
 
 ## Datasets
 
-MNIST dataset
+Load a dataset
+
+```ruby
+TorchVision::Datasets::MNIST.new("./data", train: true, download: true)
+```
+
+Supported datasets are:
+
+- CIFAR10
+- CIFAR100
+- FashionMNIST
+- KMNIST
+- MNIST
+
+## Transforms
+
+```ruby
+TorchVision::Transforms::Compose.new([
+  TorchVision::Transforms::ToTensor.new,
+  TorchVision::Transforms::Normalize.new([0.1307], [0.3081])
+])
+```
+
+Supported transforms are:
+
+- CenterCrop
+- Compose
+- Normalize
+- RandomHorizontalFlip
+- RandomResizedCrop
+- RandomVerticalFlip
+- Resize
+- ToTensor
+
+## Models
+
+- [AlexNet](#alexnet)
+- [ResNet](#resnet)
+- [ResNeXt](#resnext)
+- [VGG](#vgg)
+- [Wide ResNet](#wide-resnet)
+
+### AlexNet
 
 ```ruby
-trainset = TorchVision::Datasets::MNIST.new("./data", train: true, download: true)
-trainset.size
+TorchVision::Models::AlexNet.new
 ```
 
+### ResNet
+
+```ruby
+TorchVision::Models::ResNet18.new
+TorchVision::Models::ResNet34.new
+TorchVision::Models::ResNet50.new
+TorchVision::Models::ResNet101.new
+TorchVision::Models::ResNet152.new
+```
+
+### ResNeXt
+
+```ruby
+TorchVision::Models::ResNext52_32x4d.new
+TorchVision::Models::ResNext101_32x8d.new
+```
+
+### VGG
+
+```ruby
+TorchVision::Models::VGG11.new
+TorchVision::Models::VGG11BN.new
+TorchVision::Models::VGG13.new
+TorchVision::Models::VGG13BN.new
+TorchVision::Models::VGG16.new
+TorchVision::Models::VGG16BN.new
+TorchVision::Models::VGG19.new
+TorchVision::Models::VGG19BN.new
+```
+
+### Wide ResNet
+
+```ruby
+TorchVision::Models::WideResNet52_2.new
+TorchVision::Models::WideResNet101_2.new
+```
+
+## Pretrained Models
+
+You can download pretrained models with [this script](pretrained.py)
+
+```sh
+pip install torchvision
+python pretrained.py
+```
+
+And load them
+
+```ruby
+net = TorchVision::Models::ResNet18.new
+net.load_state_dict(Torch.load("net.pth"))
+```
+
+## libvips Installation
+
+### Linux
+
+Check your package manager. For Ubuntu, use:
+
+```sh
+sudo apt install libvips
+```
+
+You can also [build from source](https://libvips.github.io/libvips/install.html).
+
+### Mac
+
+```sh
+brew install vips
+```
+
+### Windows
+
+Check out [the options](https://libvips.github.io/libvips/install.html).
+
 ## Disclaimer
 
 This library downloads and prepares public datasets. We don’t host any datasets. Be sure to adhere to the license for each dataset.

data/lib/torchvision.rb

@@ -1,23 +1,62 @@
 # dependencies
 require "numo/narray"
+require "vips"
 require "torch"
 
 # stdlib
 require "digest"
 require "fileutils"
 require "net/http"
+require "rubygems/package"
 require "tmpdir"
 
 # modules
+require "torchvision/utils"
 require "torchvision/version"
 
 # datasets
+require "torchvision/datasets/vision_dataset"
+require "torchvision/datasets/dataset_folder"
+require "torchvision/datasets/image_folder"
+require "torchvision/datasets/cifar10"
+require "torchvision/datasets/cifar100"
 require "torchvision/datasets/mnist"
+require "torchvision/datasets/fashion_mnist"
+require "torchvision/datasets/kmnist"
+
+# models
+require "torchvision/models/alexnet"
+require "torchvision/models/basic_block"
+require "torchvision/models/bottleneck"
+require "torchvision/models/resnet"
+require "torchvision/models/resnet18"
+require "torchvision/models/resnet34"
+require "torchvision/models/resnet50"
+require "torchvision/models/resnet101"
+require "torchvision/models/resnet152"
+require "torchvision/models/resnext50_32x4d"
+require "torchvision/models/resnext101_32x8d"
+require "torchvision/models/vgg"
+require "torchvision/models/vgg11"
+require "torchvision/models/vgg11_bn"
+require "torchvision/models/vgg13"
+require "torchvision/models/vgg13_bn"
+require "torchvision/models/vgg16"
+require "torchvision/models/vgg16_bn"
+require "torchvision/models/vgg19"
+require "torchvision/models/vgg19_bn"
+require "torchvision/models/wide_resnet50_2"
+require "torchvision/models/wide_resnet101_2"
 
 # transforms
+require "torchvision/transforms/center_crop"
 require "torchvision/transforms/compose"
 require "torchvision/transforms/functional"
 require "torchvision/transforms/normalize"
+require "torchvision/transforms/random_horizontal_flip"
+require "torchvision/transforms/random_resized_crop"
+require "torchvision/transforms/random_vertical_flip"
+require "torchvision/transforms/resize"
 require "torchvision/transforms/to_tensor"
 
 module TorchVision

data/lib/torchvision/datasets/cifar10.rb

@@ -0,0 +1,117 @@
+module TorchVision
+  module Datasets
+    class CIFAR10 < VisionDataset
+      # https://www.cs.toronto.edu/~kriz/cifar.html
+
+      def initialize(root, train: true, download: false, transform: nil, target_transform: nil)
+        super(root, transform: transform, target_transform: target_transform)
+        @train = train
+
+        self.download if download
+
+        if !_check_integrity
+          raise Error, "Dataset not found or corrupted. You can use download=True to download it"
+        end
+
+        downloaded_list = @train ? train_list : test_list
+
+        @data = String.new
+        @targets = String.new
+
+        downloaded_list.each do |file|
+          file_path = File.join(@root, base_folder, file[:filename])
+          File.open(file_path, "rb") do |f|
+            while !f.eof?
+              f.read(1) if multiple_labels?
+              @targets << f.read(1)
+              @data << f.read(3072)
+            end
+          end
+        end
+
+        @targets = @targets.unpack("C*")
+        # TODO switch i to -1 when Numo supports it
+        @data = Numo::UInt8.from_binary(@data).reshape(@targets.size, 3, 32, 32)
+        @data = @data.transpose(0, 2, 3, 1)
+      end
+
+      def size
+        @data.shape[0]
+      end
+
+      def [](index)
+        # TODO remove trues when Numo supports it
+        img, target = @data[index, true, true, true], @targets[index]
+
+        img = Utils.image_from_array(img)
+
+        img = @transform.call(img) if @transform
+
+        target = @target_transform.call(target) if @target_transform
+
+        [img, target]
+      end
+
+      def _check_integrity
+        root = @root
+        (train_list + test_list).each do |fentry|
+          fpath = File.join(root, base_folder, fentry[:filename])
+          return false unless check_integrity(fpath, fentry[:sha256])
+        end
+        true
+      end
+
+      def download
+        if _check_integrity
+          puts "Files already downloaded and verified"
+          return
+        end
+
+        download_file(url, download_root: @root, filename: filename, sha256: tgz_sha256)
+
+        path = File.join(@root, filename)
+        File.open(path, "rb") do |io|
+          Gem::Package.new("").extract_tar_gz(io, @root)
+        end
+      end
+
+      private
+
+      def base_folder
+        "cifar-10-batches-bin"
+      end
+
+      def url
+        "https://www.cs.toronto.edu/~kriz/cifar-10-binary.tar.gz"
+      end
+
+      def filename
+        "cifar-10-binary.tar.gz"
+      end
+
+      def tgz_sha256
+        "c4a38c50a1bc5f3a1c5537f2155ab9d68f9f25eb1ed8d9ddda3db29a59bca1dd"
+      end
+
+      def train_list
+        [
+          {filename: "data_batch_1.bin", sha256: "cee916563c9f80d84e3cc88e17fdc0941787f1244f00a67874d45b261883ada5"},
+          {filename: "data_batch_2.bin", sha256: "a591ca11fa1708a91ee40f54b3da4784ccd871ecf2137de63f51ada8b3fa57ed"},
+          {filename: "data_batch_3.bin", sha256: "bbe8596564c0f86427f876058170b84dac6670ddf06d79402899d93ceea26f67"},
+          {filename: "data_batch_4.bin", sha256: "014e562d6e23c72197cc727519169a60359f5eccd8945ad5a09d710285ff4e48"},
+          {filename: "data_batch_5.bin", sha256: "755304fc0b379caeae8c14f0dac912fbc7d6cd469eb67a1029a08a39453a9add"},
+        ]
+      end
+
+      def test_list
+        [
+          {filename: "test_batch.bin", sha256: "8e2eb146ae340b09e24670f29cabc6326dba54da8789dab6768acf480273f65b"}
+        ]
+      end
+
+      def multiple_labels?
+        false
+      end
+    end
+  end
+end

data/lib/torchvision/datasets/cifar100.rb

@@ -0,0 +1,41 @@
+module TorchVision
+  module Datasets
+    class CIFAR100 < CIFAR10
+      # https://www.cs.toronto.edu/~kriz/cifar.html
+
+      private
+
+      def base_folder
+        "cifar-100-binary"
+      end
+
+      def url
+        "https://www.cs.toronto.edu/~kriz/cifar-100-binary.tar.gz"
+      end
+
+      def filename
+        "cifar-100-binary.tar.gz"
+      end
+
+      def tgz_sha256
+        "58a81ae192c23a4be8b1804d68e518ed807d710a4eb253b1f2a199162a40d8ec"
+      end
+
+      def train_list
+        [
+          {filename: "train.bin", sha256: "f31298fc616915fa142368359df1c4ca2ae984d6915ca468b998a5ec6aeebf29"}
+        ]
+      end
+
+      def test_list
+        [
+          {filename: "test.bin", sha256: "d8b1e6b7b3bee4020055f0699b111f60b1af1e262aeb93a0b659061746f8224a"}
+        ]
+      end
+
+      def multiple_labels?
+        true
+      end
+    end
+  end
+end