Skip to content

Commit 397149d

Browse files
committed
v2.0:
- Updated for Tensorflow 1.9 - Removed/Modified unnecessary Environmental variables - Added installation instructions for pycocotools - Tidied up certain parts that seemed ambiguous
1 parent 116e15b commit 397149d

File tree

10 files changed

+51
-39
lines changed

10 files changed

+51
-39
lines changed
84 Bytes
Binary file not shown.

docs/build/doctrees/index.doctree

-48 Bytes
Binary file not shown.

docs/build/doctrees/install.doctree

849 Bytes
Binary file not shown.

docs/build/html/_sources/index.rst.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ The software tools which we shall use throughout this tutorial are listed in the
1313
+---------------------------------------------+
1414
| Target Software versions |
1515
+==============+==============================+
16-
| OS | Windows 10, Ubuntu16.04 [*]_ |
16+
| OS | Windows, Linux [*]_ |
1717
+--------------+------------------------------+
1818
| Python | 3.6 |
1919
+--------------+------------------------------+
20-
| TensorFlow | 1.6 |
20+
| TensorFlow | 1.9 |
2121
+--------------+------------------------------+
2222
| CUDA Toolkit | v9.0 |
2323
+--------------+------------------------------+
@@ -26,7 +26,7 @@ The software tools which we shall use throughout this tutorial are listed in the
2626
| Anaconda | Python 3.6 (Optional) |
2727
+--------------+------------------------------+
2828

29-
.. [*] Even though this tutorial is based on Windows 10, most steps (excluding the setting of environmental variables) should apply for Ubuntu 16.04, too.
29+
.. [*] Even though this tutorial is based on Windows 10, most steps (excluding the setting of environmental variables) should apply for Linux, too.
3030
3131
.. toctree::
3232
:maxdepth: 5

docs/build/html/_sources/install.rst.txt

+9-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ Although having Anaconda is not a requirement in order to install and use Tensor
2424
TensorFlow Installation
2525
-----------------------
2626

27-
As mentioned in the Remarks section, there exist two generic variants of TensorFlow, which utilise different hardware on your computer to run their computationally heavy Machine Learning algorithms. The simplest to install, but also in most cases the slowest in terms of performance, is :ref:`tensorflow_cpu`, which runs directly on the CPU of your machine. Alternatively, if you own a (compatible) Nvidia graphics card, you can take advantage of the available CUDA cores to speed up the computations performed by TesnsorFlow, in which case you should follow the guidelines for installing :ref:`tensorflow_gpu`.
27+
As mentioned in the Remarks section, there exist two generic variants of TensorFlow, which utilise different hardware on your computer to run their computationally heavy Machine Learning algorithms.
28+
29+
1. The simplest to install, but also in most cases the slowest in terms of performance, is :ref:`tensorflow_cpu`, which runs directly on the CPU of your machine.
30+
2. Alternatively, if you own a (compatible) Nvidia graphics card, you can take advantage of the available CUDA cores to speed up the computations performed by TesnsorFlow, in which case you should follow the guidelines for installing :ref:`tensorflow_gpu`.
2831

2932
.. _tensorflow_cpu:
3033

@@ -62,7 +65,7 @@ Install TensorFlow CPU for Python
6265

6366
.. code-block:: posh
6467
65-
pip install --ignore-installed --upgrade tensorflow==1.7.0
68+
pip install --ignore-installed --upgrade tensorflow==1.9
6669
6770
- Wait for the installation to finish
6871

@@ -89,11 +92,11 @@ Test your Installation
8992
>>> hello = tf.constant('Hello, TensorFlow!')
9093
>>> sess = tf.Session()
9194
92-
- Once the above is run, if you see a print-out similar (but not identical) to the one below, it means that you could benefit from installing TensorFlow by building the sources that correspond to you specific CPU. Everything should still run as normal, just slower than if you had built TensorFlow from source.
95+
- Once the above is run, if you see a print-out similar (or identical) to the one below, it means that you could benefit from installing TensorFlow by building the sources that correspond to you specific CPU. Everything should still run as normal, just slower than if you had built TensorFlow from source.
9396

9497
.. code-block:: python
9598
96-
2018-03-21 22:10:18.682767: I C:\tf_jenkins\workspace\rel-win\M\windows\PY\36\tensorflow\core\platform\cpu_feature_guard.cc:140] Your CPU supports instructions that this TensorFlow binary was not compiled to use: AVX2
99+
2019-02-28 11:59:25.810663: I T:\src\github\tensorflow\tensorflow\core\platform\cpu_feature_guard.cc:141] Your CPU supports instructions that this TensorFlow binary was not compiled to use: AVX2
97100
98101
- Finally, for the sake of completing the test as described by TensorFlow themselves (see `here <https://www.tensorflow.org/install/install_windows#validate_your_installation>`_), let's run the following:
99102

@@ -191,7 +194,7 @@ Install TensorFlow GPU for Python
191194

192195
.. code-block:: posh
193196
194-
pip install --ignore-installed --upgrade tensorflow-gpu==1.8
197+
pip install --ignore-installed --upgrade tensorflow-gpu==1.9
195198
196199
- Wait for the installation to finish
197200

@@ -450,7 +453,7 @@ Test your Installation
450453
LabelImg Installation
451454
---------------------
452455

453-
For Windows and Linux you can download the precompiled binary at http://tzutalin.github.io/labelImg/.
456+
For Windows and Linux you can download the precompiled binary `here <http://tzutalin.github.io/labelImg/>`_ .
454457
The steps for installing from source follow below.
455458

456459
Create a new Conda virtual environment

docs/build/html/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ <h1>TensorFlow Object Detection API tutorial<a class="headerlink" href="#tensorf
162162
</thead>
163163
<tbody valign="top">
164164
<tr class="row-even"><td>OS</td>
165-
<td>Windows 10, Ubuntu16.04 <a class="footnote-reference" href="#id2" id="id1">[*]</a></td>
165+
<td>Windows, Linux <a class="footnote-reference" href="#id2" id="id1">[*]</a></td>
166166
</tr>
167167
<tr class="row-odd"><td>Python</td>
168168
<td>3.6</td>
169169
</tr>
170170
<tr class="row-even"><td>TensorFlow</td>
171-
<td>1.6</td>
171+
<td>1.9</td>
172172
</tr>
173173
<tr class="row-odd"><td>CUDA Toolkit</td>
174174
<td>v9.0</td>
@@ -184,7 +184,7 @@ <h1>TensorFlow Object Detection API tutorial<a class="headerlink" href="#tensorf
184184
<table class="docutils footnote" frame="void" id="id2" rules="none">
185185
<colgroup><col class="label" /><col /></colgroup>
186186
<tbody valign="top">
187-
<tr><td class="label"><a class="fn-backref" href="#id1">[*]</a></td><td>Even though this tutorial is based on Windows 10, most steps (excluding the setting of environmental variables) should apply for Ubuntu 16.04, too.</td></tr>
187+
<tr><td class="label"><a class="fn-backref" href="#id1">[*]</a></td><td>Even though this tutorial is based on Windows 10, most steps (excluding the setting of environmental variables) should apply for Linux, too.</td></tr>
188188
</tbody>
189189
</table>
190190
<div class="toctree-wrapper compound">
@@ -222,10 +222,10 @@ <h1>TensorFlow Object Detection API tutorial<a class="headerlink" href="#tensorf
222222
</ul>
223223
</li>
224224
<li class="toctree-l2"><a class="reference internal" href="install.html#labelimg-installation">LabelImg Installation</a><ul>
225-
<li class="toctree-l3"><a class="reference internal" href="install.html#id12">Create a new Conda virtual environment</a></li>
225+
<li class="toctree-l3"><a class="reference internal" href="install.html#id13">Create a new Conda virtual environment</a></li>
226226
<li class="toctree-l3"><a class="reference internal" href="install.html#downloading-labelimg">Downloading labelImg</a></li>
227227
<li class="toctree-l3"><a class="reference internal" href="install.html#installing-dependencies-and-compiling-package">Installing dependencies and compiling package</a></li>
228-
<li class="toctree-l3"><a class="reference internal" href="install.html#id17">Test your installation</a></li>
228+
<li class="toctree-l3"><a class="reference internal" href="install.html#id18">Test your installation</a></li>
229229
</ul>
230230
</li>
231231
</ul>

0 commit comments

Comments
 (0)