From 6aa785ebae180929f81f25a59b3ebf365e766185 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 5 Oct 2018 16:57:05 +0200 Subject: [PATCH 1/3] Fix some typos --- docs/source/install.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/source/install.rst b/docs/source/install.rst index 72863ab..02dac85 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -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 ~~~~~~~~~~~~~~~~~~~~~ @@ -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 | +--------------+------------------------------+ @@ -273,6 +273,7 @@ Alternatively, if you don't want to use Anaconda you can install the packages us pip install (=) +but you will need to install ``opencv-python`` instead of ``opencv``. Downloading the TensorFlow Models ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From f3ff0d4fbb59790ae2bba5dfa3dcd66c4d7e98f0 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 5 Oct 2018 16:57:32 +0200 Subject: [PATCH 2/3] Add instruction for protobuf >=3.5 Windows --- docs/source/install.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/source/install.rst b/docs/source/install.rst index 02dac85..e83a906 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -350,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: From 86ac31794bc16ab798b4ec6a8817ccf81e118148 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 16 Oct 2018 15:20:45 +0200 Subject: [PATCH 3/3] Some more typos --- docs/source/install.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/install.rst b/docs/source/install.rst index e83a906..a780c87 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -406,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 @@ -415,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 `_ to clone the `labelImg repo `_ inside the ``TensorFlow\addons`` folder, or you can simply download it as a `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: