diff options
| author | Andrew W Elble <aweits@rit.edu> | 2020-04-23 12:14:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 11:14:09 -0500 |
| commit | d5d232e20767b8c0abc56ba75f07c4537449e333 (patch) | |
| tree | 0b1dc6fc729f0f1956053f48d811773542bb52e5 /var | |
| parent | ca67df6e3d61cdbc615d85cc223dcc2314bc6b6c (diff) | |
| download | spack-d5d232e20767b8c0abc56ba75f07c4537449e333.tar.gz spack-d5d232e20767b8c0abc56ba75f07c4537449e333.tar.bz2 spack-d5d232e20767b8c0abc56ba75f07c4537449e333.tar.xz spack-d5d232e20767b8c0abc56ba75f07c4537449e333.zip | |
tensorflow: compile against spack-provided protobuf (#16258)
This allows horovod to be built with frameworks=pytorch,tensorflow.
I tracked down the crash I observed in #15719, where loading torch
before tensorflow would cause a crash in:
google::protobuf::internal::(anonymous
namespace)::InitSCC_DFS(google::protobuf::internal::SCCInfoBase*)
The solution is to make tensorflow compile against the protobuf
version Spack provides, instead of allowing it to use it's own.
It's likely we'll want to go after some of the others
that are listed in third_party/systemlibs/syslibs_configure.bzl
in the future.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-tensorflow/package.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index 64b97b05b2..b46cfbb4ce 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -152,6 +152,7 @@ class PyTensorflow(Package, CudaPackage): depends_on('py-protobuf@3.0.0', type=('build', 'run'), when='@0.11.0') depends_on('py-protobuf@3.0.0b2', type=('build', 'run'), when='@0.7.1:0.10') depends_on('py-protobuf@3.0.0a3', type=('build', 'run'), when='@0.6:0.7.0') + depends_on('protobuf') # tensorboard # tensorflow-estimator depends_on('py-termcolor@1.1.0:', type=('build', 'run'), when='@1.6:') @@ -498,6 +499,11 @@ class PyTensorflow(Package, CudaPackage): mkdirp(tmp_path) env.set('TEST_TMPDIR', tmp_path) + env.set('TF_SYSTEM_LIBS', 'com_google_protobuf') + # NOTE: INCLUDEDIR is not just relevant to protobuf + # see third_party/systemlibs/jsoncpp.BUILD + env.set('INCLUDEDIR', spec['protobuf'].prefix.include) + def configure(self, spec, prefix): # NOTE: configure script is interactive. If you set the appropriate # environment variables, this interactivity is skipped. If you don't, @@ -626,6 +632,7 @@ class PyTensorflow(Package, CudaPackage): # Ask bazel to explain what it's up to # Needs a filename as argument '--explain=explainlogfile.txt', + '--incompatible_no_support_tools_in_action_inputs=false', # Increase verbosity of explanation, '--verbose_explanations', ] @@ -679,9 +686,6 @@ class PyTensorflow(Package, CudaPackage): if spec.satisfies('@2:'): args.append('--config=v2') - if spec.satisfies('%gcc@5:'): - args.append('--cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0') - args.append('//tensorflow/tools/pip_package:build_pip_package') bazel(*args) |