Skip to content

Some typos (and changes from a protobuf update) #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2018
Merged

Some typos (and changes from a protobuf update) #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aa785e
Fix some typos
PHPirates Oct 5, 2018
f3ff0d4
Add instruction for protobuf >=3.5 Windows
PHPirates Oct 5, 2018
86ac317
Some more typos
PHPirates Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions docs/source/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ Test your Installation
TensorFlow Models Installation
------------------------------

Now that you have installed TensorFlow, it is time to install the models used b TesnorFlow to do it's magic.
Now that you have installed TensorFlow, it is time to install the models used by TensorFlow to do its magic.

Install Prerequisites
~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -254,7 +254,7 @@ Building on the assumption that you have just created your new virtual environme
+--------------+------------------------------+
| jupyter | 1.0.0-py36_4 |
+--------------+------------------------------+
| matlplotlib | 2.2.2-py36h153e9ff_0 |
| matplotlib | 2.2.2-py36h153e9ff_0 |
+--------------+------------------------------+
| opencv | 3.3.1-py36h20b85fd_1 |
+--------------+------------------------------+
Expand All @@ -273,6 +273,7 @@ Alternatively, if you don't want to use Anaconda you can install the packages us

pip install <package_name>(=<version>)

but you will need to install ``opencv-python`` instead of ``opencv``.

Downloading the TensorFlow Models
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -349,6 +350,13 @@ This should be done as follows:
# From TensorFlow/models/research/
protoc object_detection/protos/*.proto --python_out=.

If you are on Windows and using version 3.5 or later, the wildcard will not work and you have to run this in the command prompt:

.. code-block:: python

# From TensorFlow/models/research/
for /f %i in ('dir /b object_detection\protos\*.proto') do protoc object_detection\protos\%i --python_out=.

.. [#] NOTE: You MUST open a new `Anaconda/Command Prompt` for the changes in the environment variables to take effect.

.. _test_tf_models:
Expand Down Expand Up @@ -398,7 +406,7 @@ To deal with the fact that ``labelImg`` (on Windows) requires the use of ``pyqt4

activate labelImg

Once you have activated your virtual environment, the name of the environment should be displayed within brackets at the beggining of your cmd path specifier, e.g.:
Once you have activated your virtual environment, the name of the environment should be displayed within brackets at the beginning of your cmd path specifier, e.g.:

.. code-block:: ps1con

Expand All @@ -407,7 +415,7 @@ Once you have activated your virtual environment, the name of the environment sh
Downloading labelImg
~~~~~~~~~~~~~~~~~~~~

- Inside you ``TesnorFlow`` folder, create a new directory, name it ``addons`` and then ``cd`` into it.
- Inside you ``TensorFlow`` folder, create a new directory, name it ``addons`` and then ``cd`` into it.
- To download the package you can either use `Git <https://git-scm.com/downloads>`_ to clone the `labelImg repo <https://github.com/tzutalin/labelImg>`_ inside the ``TensorFlow\addons`` folder, or you can simply download it as a `ZIP <https://github.com/tzutalin/labelImg/archive/master.zip>`_ and extract it's contents inside the ``TensorFlow\addons`` folder. To keep things consistent, in the latter case you will have to rename the extracted folder ``labelImg-master`` to ``labelImg``. [#]_
- You should now have a single folder named ``addons\labelImg`` under your ``TensorFlow`` folder, which contains another 4 folders as such:

Expand Down