Skip to content

Commit ad8699d

Browse files
jantonguiraoJanuszL
authored andcommitted
Stop using tf-nightly-gpu since it broke the build. Use latest released version instead (#730)
Signed-off-by: Joaquin Anton <janton@nvidia.com>
1 parent 4d93fc8 commit ad8699d

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ RUN pip install future numpy setuptools wheel && \
2222
rm -rf /root/.cache/pip/
2323

2424
RUN if [ ${PYV} != "37" ] ; then \
25-
pip install tensorflow-gpu==1.7 && \
26-
pip install tensorflow-gpu==1.11 --target /tensorflow/1_11 && \
27-
pip install tensorflow-gpu==1.12rc2 --target /tensorflow/1_12 && \
28-
pip install tf-nightly-gpu --target /tensorflow/nightly; \
29-
else \
30-
# only nightly build of TF supports python 3.7 at that time
31-
pip install tf-nightly-gpu; \
25+
pip install tensorflow-gpu==1.7 && \
26+
pip install tensorflow-gpu==1.11 --target /tensorflow/1_11 && \
27+
pip install tensorflow-gpu==1.12 --target /tensorflow/1_12 && \
28+
pip install tensorflow-gpu==1.13.1 --target /tensorflow/1_13 && \
29+
pip install tensorflow-gpu --target /tensorflow/latest; \
30+
else \
31+
# Older versions not supported on python 3.7
32+
pip install tensorflow-gpu; \
3233
fi && \
3334
rm -rf /root/.cache/pip/
3435

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919

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

2827
for _libdali_tf in _processed_tf_plugins:
2928
try:

0 commit comments

Comments
 (0)