Fix TF 1.11 compatibility (#237)

* Add support for multiple TensorFlow plugins

Signed-off-by: Janusz Lisiecki <[email protected]>

* Add tests for 1.12.0rc1

Signed-off-by: Janusz Lisiecki <[email protected]>

* Add 1.12rc1 support

Signed-off-by: Janusz Lisiecki <[email protected]>

* Add TF 1.12.rc2 support

Signed-off-by: Janusz Lisiecki <[email protected]>

* Reduce number of tested TF versions

Signed-off-by: Janusz Lisiecki <[email protected]>

Author: JanuszL

Dockerfile

@@ -18,7 +18,10 @@ ENV PATH=${PYBIN}:${PATH} \
 
 RUN ln -s /opt/python/cp${PYV}* /opt/python/v
 
-RUN pip install future numpy setuptools wheel tensorflow-gpu==1.7 && \
+RUN pip install future numpy setuptools wheel && \
+    pip install tensorflow-gpu==1.7 && \
+    pip install tensorflow-gpu==1.11 --target /tensorflow/1_11 && \
+    pip install tensorflow-gpu==1.12rc2 --target /tensorflow/1_12 && \
     rm -rf /root/.cache/pip/
 
 RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/libcuda.so.1 && \

dali/CMakeLists.txt

@@ -132,27 +132,51 @@ endif()
 ################################################
 if (BUILD_TENSORFLOW)
 
-  execute_process(
-    COMMAND python -c "from __future__ import print_function; import sys; paths = sys.path; f = [p for p in paths if \"-packages\" in p] ; print(f[0], end=\"\")"
-    OUTPUT_VARIABLE DIST_PACKAGES_DIR)
-
   add_subdirectory(tensorflow)
-
-  set(customop_lib "dali_tf")
-
-  cuda_add_library(${customop_lib} SHARED ${DALI_TF_SRCS})
-
-  separate_arguments(TF_CFLAGS UNIX_COMMAND "-I${DIST_PACKAGES_DIR}/tensorflow/include -I${DIST_PACKAGES_DIR}/external/nsync/public -D_GLIBCXX_USE_CXX11_ABI=0")
-  target_compile_options(${customop_lib} PRIVATE ${TF_CFLAGS})
-
-  message(STATUS "Adding dependencies to ${customop_lib}: '${dali_lib}'")
-  add_dependencies(${customop_lib} ${dali_lib})
-
-  target_link_libraries(${customop_lib} PRIVATE -L${DIST_PACKAGES_DIR}/tensorflow -ltensorflow_framework)
-  target_link_libraries(${customop_lib} PRIVATE ${dali_lib})
-
-  set_target_properties(${customop_lib} PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/dali/python/nvidia/dali/plugin")
+ 
+  # get default TF installation path
+   execute_process(
+     COMMAND python -c "from __future__ import print_function; import sys; paths = sys.path; f = [p for p in paths if \"-packages\" in p] ; print(f[0], end=\"\")"
+     OUTPUT_VARIABLE DIST_PACKAGES_DIR)
+ 
+  set(TF_PATHS)
+  set(TF_VER)
+  # obtain custom versions of TF we want to build aganist
+  file(GLOB TF_VERSIONS RELATIVE /tensorflow /tensorflow/*)
+  foreach(VER ${TF_VERSIONS})
+    set(FULL_PATH /tensorflow/${VER})
+    if(IS_DIRECTORY ${FULL_PATH})
+      list(APPEND TF_PATHS ${FULL_PATH})
+      list(APPEND TF_VER "_${VER}")
+    ENDIF()
+  ENDFOREACH()
+
+  # append default TF version
+  list(APPEND TF_PATHS ${DIST_PACKAGES_DIR})
+  list(APPEND TF_VER "")
+
+  # build TF plugin for each TF version we want to support
+  list(LENGTH TF_PATHS TF_LIST_L)
+  math(EXPR TF_LIST_L_ITER "${TF_LIST_L} - 1")
+  foreach(IDX RANGE ${TF_LIST_L_ITER})
+    list(GET TF_PATHS ${IDX} FULL_PATH)
+    list(GET TF_VER ${IDX} VER)
+    set(customop_lib "dali_tf${VER}")
+
+    cuda_add_library(${customop_lib} SHARED ${DALI_TF_SRCS})
+
+    separate_arguments(TF_CFLAGS UNIX_COMMAND "-I${FULL_PATH}/tensorflow/include -I${FULL_PATH}/external/nsync/public -D_GLIBCXX_USE_CXX11_ABI=0")
+    target_compile_options(${customop_lib} PRIVATE ${TF_CFLAGS})
+
+    message(STATUS "Adding dependencies to ${customop_lib}: '${dali_lib}'")
+    add_dependencies(${customop_lib} ${dali_lib})
+
+    target_link_libraries(${customop_lib} PRIVATE -L${FULL_PATH}/tensorflow -ltensorflow_framework)
+    target_link_libraries(${customop_lib} PRIVATE ${dali_lib})
+
+    set_target_properties(${customop_lib} PROPERTIES
+      LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/dali/python/nvidia/dali/plugin")
+  ENDFOREACH()
 endif()
 
 

dali/python/CMakeLists.txt

@@ -18,10 +18,6 @@ set(dali_python_lib "backend_impl")
 pybind11_add_module(${dali_python_lib} MODULE ${tmp})
 message(STATUS "Adding dependencies to ${dali_python_lib}: '${dali_lib}'")
 add_dependencies(${dali_python_lib} ${dali_lib})
-if (BUILD_TENSORFLOW)
-  message(STATUS "Adding dependencies to ${dali_python_lib}: '${customop_lib}'")
-  add_dependencies(${dali_python_lib} ${customop_lib})
-endif()
 
 # Link libdali.so, libprotobuf.a and libcudart_static.a into backend_impl (dali_python_lib)
 target_link_libraries(${dali_python_lib} PRIVATE ${CUDA_LIBRARIES} ${dali_lib})

dali/python/nvidia/dali/plugin/tf.py

@@ -14,9 +14,20 @@
 
 import tensorflow as tf
 import os
+import glob
+
+_tf_plugins = glob.glob(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'libdali_tf*.so'))
+_dali_tf_module = None
+for _libdali_tf in _tf_plugins:
+  try:
+    _dali_tf_module = tf.load_op_library(_libdali_tf)
+    break
+  # if plugin is not compatible skip it
+  except tf.errors.NotFoundError:
+    pass
+else:
+  raise Exception('No matching DALI plugin found for installed TensorFlow version')
 
-_libdali_tf = os.path.dirname(os.path.realpath(__file__)) + '/libdali_tf.so'
-_dali_tf_module = tf.load_op_library(_libdali_tf)
 _dali_tf = _dali_tf_module.dali
 
 def DALIIterator():

dali/tensorflow/daliop.cc

@@ -27,7 +27,6 @@
 #endif
 
 #include "dali/common.h"
-#include "dali/pipeline/dali.pb.h"
 #include "dali/pipeline/pipeline.h"
 #include "dali/c_api/c_api.h"
 #include "dali/error_handling.h"

qa/setup_packages.py

@@ -20,7 +20,7 @@
 packages = {"numpy" : ["1.11.1"],
             "opencv-python" : ["3.1.0"],
             "mxnet-cu90" : ["1.3.0"],
-            "tensorflow-gpu" : ["1.7", "1.8", "1.9", "1.10.1"],
+            "tensorflow-gpu" : ["1.7", "1.11", "1.12.0rc2"],
             "torch" : ["http://download.pytorch.org/whl/cu90/torch-0.4.0-{0}.whl"]
              }