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

Consistent docs and usage of env mod methods (#3351)

Browse Source
This commit is contained in:
Adam J. Stewart
2017-03-15 00:26:44 -05:00
committed by Todd Gamblin
parent 560d28ac7f
commit dca4d2b15e
26 changed files with 123 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/r/package.py
View File

@@ -149,11 +149,11 @@ def filter_compilers(self):
def r_lib_dir(self):
return join_path('rlib', 'R', 'library')
def setup_dependent_environment(self, spack_env, run_env, extension_spec):
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
# Set R_LIBS to include the library dir for the
# extension and any other R extensions it depends on.
r_libs_path = []
for d in extension_spec.traverse(
for d in dependent_spec.traverse(
deptype=('build', 'run'), deptype_query='run'):
if d.package.extends(self.spec):
r_libs_path.append(join_path(d.prefix, self.r_lib_dir))
@@ -167,11 +167,11 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
# determine how many jobs can actually be started.
spack_env.set('MAKEFLAGS', '-j{0}'.format(make_jobs))
# For run time environment set only the path for extension_spec and
# For run time environment set only the path for dependent_spec and
# prepend it to R_LIBS
if extension_spec.package.extends(self.spec):
if dependent_spec.package.extends(self.spec):
run_env.prepend_path('R_LIBS', join_path(
extension_spec.prefix, self.r_lib_dir))
dependent_spec.prefix, self.r_lib_dir))
def setup_environment(self, spack_env, run_env):
run_env.prepend_path('LIBRARY_PATH',
@@ -181,7 +181,7 @@ def setup_environment(self, spack_env, run_env):
run_env.prepend_path('CPATH',
join_path(self.prefix, 'rlib', 'R', 'include'))
def setup_dependent_package(self, module, ext_spec):
def setup_dependent_package(self, module, dependent_spec):
"""Called before R modules' install() methods. In most cases,
extensions will only need to have one line:
R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir),
@@ -191,9 +191,9 @@ def setup_dependent_package(self, module, ext_spec):
module.R = Executable(join_path(self.spec.prefix.bin, 'R'))
# Add variable for library directry
module.r_lib_dir = join_path(ext_spec.prefix, self.r_lib_dir)
module.r_lib_dir = join_path(dependent_spec.prefix, self.r_lib_dir)
# Make the site packages directory for extensions, if it does not exist
# already.
if ext_spec.package.is_extension:
if dependent_spec.package.is_extension:
mkdirp(module.r_lib_dir)