Skip to content

Commit

Permalink
Stop using tf-nightly-gpu since it broke the build. Use latest releas…
Browse files Browse the repository at this point in the history
…ed version instead (#730)

Signed-off-by: Joaquin Anton <[email protected]>
  • Loading branch information
jantonguirao authored and JanuszL committed Apr 9, 2019
1 parent 4d93fc8 commit ad8699d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
15 changes: 8 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ RUN pip install future numpy setuptools wheel && \
rm -rf /root/.cache/pip/

RUN if [ ${PYV} != "37" ] ; then \
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 && \
pip install tf-nightly-gpu --target /tensorflow/nightly; \
else \
# only nightly build of TF supports python 3.7 at that time
pip install tf-nightly-gpu; \
pip install tensorflow-gpu==1.7 && \
pip install tensorflow-gpu==1.11 --target /tensorflow/1_11 && \
pip install tensorflow-gpu==1.12 --target /tensorflow/1_12 && \
pip install tensorflow-gpu==1.13.1 --target /tensorflow/1_13 && \
pip install tensorflow-gpu --target /tensorflow/latest; \
else \
# Older versions not supported on python 3.7
pip install tensorflow-gpu; \
fi && \
rm -rf /root/.cache/pip/

Expand Down
7 changes: 3 additions & 4 deletions dali/python/nvidia/dali/plugin/tf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@

_tf_plugins = glob.glob(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'libdali_tf*.so'))
_dali_tf_module = None
# Order: 'current', numbered versions, nightly build
# Order: 'current', prebuilt versions
_dali_tf_current = list(filter(lambda x: 'current' in x, _tf_plugins))
_dali_tf_numbered = list(filter(lambda x: 'current' not in x and 'nightly' not in x, _tf_plugins))
_dali_tf_nightly = list(filter(lambda x: 'nightly' in x, _tf_plugins))
_processed_tf_plugins = _dali_tf_current + _dali_tf_numbered + _dali_tf_nightly
_dali_tf_prebuilt = list(filter(lambda x: 'current' not in x, _tf_plugins))
_processed_tf_plugins = _dali_tf_current + _dali_tf_prebuilt

for _libdali_tf in _processed_tf_plugins:
try:
Expand Down

0 comments on commit ad8699d

Please sign in to comment.