zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py-tensorboard: force use of spack's python, force build of ijar (#20059)

Browse Source 
(same fix for py-tensorboard-plugin-wit)
This commit is contained in:
Andrew W Elble 2020-11-23 21:56:33 -05:00 committed by GitHub
parent fd07decd27
commit 3f0984e5e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py
View File

@ -53,6 +53,12 @@ def setup(self, spec, prefix):
filter_file(r'virtualenv venv', filter_file(r'virtualenv venv',
'', '',
'tensorboard_plugin_wit/pip_package/build_pip_package.sh') '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): def build(self, spec, prefix):
tmp_path = env['TEST_TMPDIR'] tmp_path = env['TEST_TMPDIR']
@ -60,6 +66,8 @@ def build(self, spec, prefix):
'--nosystem_rc', '--nosystem_rc',
'--output_user_root=' + tmp_path, '--output_user_root=' + tmp_path,
'run', 'run',
# watch https://github.com/bazelbuild/bazel/issues/7254
'--define=EXECUTOR=remote',
'--verbose_failures', '--verbose_failures',
'--subcommands=pretty_print', '--subcommands=pretty_print',
'tensorboard_plugin_wit/pip_package:build_pip_package') 'tensorboard_plugin_wit/pip_package:build_pip_package')

8
var/spack/repos/builtin/packages/py-tensorboard/package.py
View File

@ -75,6 +75,12 @@ def configure(self, spec, prefix):
filter_file('trap cleanup EXIT', filter_file('trap cleanup EXIT',
'', '',
'tensorboard/pip_package/build_pip_package.sh') '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): def build(self, spec, prefix):
tmp_path = env['TEST_TMPDIR'] tmp_path = env['TEST_TMPDIR']
@ -82,6 +88,8 @@ def build(self, spec, prefix):
'--nosystem_rc', '--nosystem_rc',
'--output_user_root=' + tmp_path, '--output_user_root=' + tmp_path,
'build', 'build',
# watch https://github.com/bazelbuild/bazel/issues/7254
'--define=EXECUTOR=remote',
'--verbose_failures', '--verbose_failures',
'--spawn_strategy=local', '--spawn_strategy=local',
'--subcommands=pretty_print', '--subcommands=pretty_print',