From 0a658d113e54873316da324ab472e52f5e313fe6 Mon Sep 17 00:00:00 2001 From: Shohei Hido Date: Tue, 25 Aug 2015 15:25:17 -0700 Subject: [PATCH 1/2] Update comparison.rst PR for Multi-GPU has been merged into the master branch of Caffe. https://github.com/BVLC/caffe/pull/2870 --- docs/source/comparison.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/comparison.rst b/docs/source/comparison.rst index b201cb9f83f6..10cb54f6cf4b 100644 --- a/docs/source/comparison.rst +++ b/docs/source/comparison.rst @@ -45,7 +45,7 @@ We hope it helps you to choose an appropriate framework for the demand. | +-----------------------------+-------------------+------------------------+-------------------+----------------------------------------------------+ | | CPU/GPU generic coding [4]_ | [1]_ | [5]_ | Y | | | +-----------------------------+-------------------+------------------------+-------------------+----------------------------------------------------+ -| | Multi GPU (data parallel) | Y | | Y (fbcunn) | `#2114 `_ | +| | Multi GPU (data parallel) | Y | | Y (fbcunn) | Y | | +-----------------------------+-------------------+------------------------+-------------------+----------------------------------------------------+ | | Multi GPU (model parallel) | Y | | Y (fbcunn) | | +-------+-----------------------------+-------------------+------------------------+-------------------+----------------------------------------------------+ From 67ece2480c94d2c45ab391b5879fb69118759da9 Mon Sep 17 00:00:00 2001 From: Kenta OONO Date: Wed, 2 Sep 2015 11:46:11 +0900 Subject: [PATCH 2/2] Align rightmost vertical line --- docs/source/comparison.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/comparison.rst b/docs/source/comparison.rst index 10cb54f6cf4b..50c9c5f38d06 100644 --- a/docs/source/comparison.rst +++ b/docs/source/comparison.rst @@ -45,7 +45,7 @@ We hope it helps you to choose an appropriate framework for the demand. | +-----------------------------+-------------------+------------------------+-------------------+----------------------------------------------------+ | | CPU/GPU generic coding [4]_ | [1]_ | [5]_ | Y | | | +-----------------------------+-------------------+------------------------+-------------------+----------------------------------------------------+ -| | Multi GPU (data parallel) | Y | | Y (fbcunn) | Y | +| | Multi GPU (data parallel) | Y | | Y (fbcunn) | Y | | +-----------------------------+-------------------+------------------------+-------------------+----------------------------------------------------+ | | Multi GPU (model parallel) | Y | | Y (fbcunn) | | +-------+-----------------------------+-------------------+------------------------+-------------------+----------------------------------------------------+