From ed62ac8203999513dfae03498e871ea35eb60cc4 Mon Sep 17 00:00:00 2001 From: Gunhan Gulsoy Date: Tue, 16 Jul 2019 17:29:43 -0700 Subject: [PATCH] Do not import contrib.cloud if it is not available. Hopefully Fixes #29617 PiperOrigin-RevId: 258473584 --- tensorflow/contrib/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py index d273a214390..0d510a16601 100644 --- a/tensorflow/contrib/__init__.py +++ b/tensorflow/contrib/__init__.py @@ -35,8 +35,6 @@ from tensorflow.contrib import autograph from tensorflow.contrib import batching from tensorflow.contrib import bayesflow from tensorflow.contrib import checkpoint -if os.name != "nt" and platform.machine() != "s390x": - from tensorflow.contrib import cloud from tensorflow.contrib import cluster_resolver from tensorflow.contrib import compiler from tensorflow.contrib import constrained_optimization @@ -106,6 +104,12 @@ from tensorflow.contrib.remote_fused_graph import pylib as remote_fused_graph from tensorflow.contrib.specs import python as specs from tensorflow.contrib.summary import summary +if os.name != "nt" and platform.machine() != "s390x": + try: + from tensorflow.contrib import cloud + except ImportError: + pass + from tensorflow.python.util.lazy_loader import LazyLoader ffmpeg = LazyLoader("ffmpeg", globals(), "tensorflow.contrib.ffmpeg") -- GitLab