bump to latest tf version 1.4.0 and opencv 3.3.1, include cleanup of previous build for opencv when recompiling, added option to enable/disable build opencv examples and forec recompilation

Author: sjentzsch

ansible/roles/opencv/tasks/main.yml

@@ -75,6 +75,36 @@
   register: opencv_extra_repo_state
 
 - block:
+    - name: Check if there is a previous OpenCV build
+      stat: path="../../opencv/build/install_manifest.txt"
+      register: opencv_prev_build
+
+    - block:
+        - name: Uninstall previous OpenCV build
+          make: target=uninstall
+          args:
+            chdir: "../../opencv/build"
+          become: yes
+
+        - name: Remove old OpenCV build folder
+          file: path="../../opencv/build" state=absent
+      when: opencv_prev_build.stat.exists
+
+    - name: Remove remainings from previous OpenCV build (1/2)
+      file: path="{{ item }}" state=absent
+      with_items:
+        - /usr/local/include/opencv
+        - /usr/local/include/opencv2
+        - /usr/local/share/OpenCV
+      become: yes
+
+      # with_fileglob unfortunately seems to ignore symlinks, but they should not cause harm ...
+    - name: Remove remainings from previous OpenCV build (2/2)
+      file: path="{{ item }}" state=absent
+      with_fileglob:
+        - /usr/local/lib/libopencv_*
+      become: yes
+
     - name: Ensure build folder inside OpenCV repo
       file: path="../../opencv/build" state=directory
 
@@ -96,7 +126,9 @@
         -D BUILD_PERF_TESTS=OFF
         -D BUILD_TESTS=OFF
         -D BUILD_DOCS=OFF
-        -D ENABLE_FAST_MATH=1 .."
+        -D BUILD_EXAMPLES={{ opencv_build_examples }}
+        -D ENABLE_FAST_MATH=1
+        -D PROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc .."
       args:
         chdir: "../../opencv/build"
 
@@ -111,7 +143,7 @@
         chdir: "../../opencv/build"
       become: yes
   when:
-    - not opencv_installed.stat.exists
+    - not opencv_installed.stat.exists or opencv_repo_state.changed or opencv_force_rebuild
 
 - name: Add /usr/local/lib to system library paths
   lineinfile:

config/config.local.sample.yml

@@ -9,7 +9,7 @@ tf_enable_gpu: false
 
 tf_build_from_source: false
 tf_repo_name: tensorflow
-tf_repo_branch: v1.3.1
+tf_repo_branch: v1.4.0
 
 tf_models_repo_name: tensorflow_models
 tf_models_repo_url: tensorflow/models
@@ -19,7 +19,9 @@ tf_models_repo_branch: master
 
 # Note: Before switching to a new version, you can cleanup the previous by simply running 'sudo make uninstall' inside opencv/build/ folder
 
-opencv_version: 3.3.0
-opencv_repo_branch: 3.3.0
-opencv_contrib_repo_branch: 3.3.0
-opencv_extra_repo_branch: 3.3.0
+opencv_version: 3.3.1
+opencv_repo_branch: 3.3.1
+opencv_contrib_repo_branch: 3.3.1
+opencv_extra_repo_branch: 3.3.1
+opencv_build_examples: OFF
+opencv_force_rebuild: false