diff options
| author | Andrew W Elble <aweits@rit.edu> | 2020-11-23 21:56:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 20:56:33 -0600 |
| commit | 3f0984e5e168555bbb23f3ea1892d42622f88478 (patch) | |
| tree | 5b9fcbf1f784d02124be59ceb3fa59671377e61f /var | |
| parent | fd07decd27b88748c7c9e99fc165c57c463649ce (diff) | |
| download | spack-3f0984e5e168555bbb23f3ea1892d42622f88478.tar.gz spack-3f0984e5e168555bbb23f3ea1892d42622f88478.tar.bz2 spack-3f0984e5e168555bbb23f3ea1892d42622f88478.tar.xz spack-3f0984e5e168555bbb23f3ea1892d42622f88478.zip | |
py-tensorboard: force use of spack's python, force build of ijar (#20059)
(same fix for py-tensorboard-plugin-wit)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-tensorboard/package.py | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py b/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py index 53f4130e98..9bb5c9a377 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py @@ -53,6 +53,12 @@ class PyTensorboardPluginWit(Package): filter_file(r'virtualenv venv', '', 'tensorboard_plugin_wit/pip_package/build_pip_package.sh') + filter_file('unset PYTHON_HOME', + 'export PYTHONPATH="{0}"'.format(env['PYTHONPATH']), + 'tensorboard_plugin_wit/pip_package/build_pip_package.sh') + filter_file('python setup.py', + '{0} setup.py'.format(spec['python'].command.path), + 'tensorboard_plugin_wit/pip_package/build_pip_package.sh') def build(self, spec, prefix): tmp_path = env['TEST_TMPDIR'] @@ -60,6 +66,8 @@ class PyTensorboardPluginWit(Package): '--nosystem_rc', '--output_user_root=' + tmp_path, 'run', + # watch https://github.com/bazelbuild/bazel/issues/7254 + '--define=EXECUTOR=remote', '--verbose_failures', '--subcommands=pretty_print', 'tensorboard_plugin_wit/pip_package:build_pip_package') diff --git a/var/spack/repos/builtin/packages/py-tensorboard/package.py b/var/spack/repos/builtin/packages/py-tensorboard/package.py index 3ce199fb6f..c60189702b 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard/package.py @@ -75,6 +75,12 @@ class PyTensorboard(Package): filter_file('trap cleanup EXIT', '', 'tensorboard/pip_package/build_pip_package.sh') + filter_file('unset PYTHON_HOME', + 'export PYTHONPATH="{0}"'.format(env['PYTHONPATH']), + 'tensorboard/pip_package/build_pip_package.sh') + filter_file('python setup.py', + '{0} setup.py'.format(spec['python'].command.path), + 'tensorboard/pip_package/build_pip_package.sh') def build(self, spec, prefix): tmp_path = env['TEST_TMPDIR'] @@ -82,6 +88,8 @@ class PyTensorboard(Package): '--nosystem_rc', '--output_user_root=' + tmp_path, 'build', + # watch https://github.com/bazelbuild/bazel/issues/7254 + '--define=EXECUTOR=remote', '--verbose_failures', '--spawn_strategy=local', '--subcommands=pretty_print', |