diff options
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) |