Compare commits
3 Commits
fix/troubl
...
e4s-21.05
Author | SHA1 | Date | |
---|---|---|---|
![]() |
b98a21056d | ||
![]() |
abed824555 | ||
![]() |
e1a831816e |
21
etc/spack/defaults/cray/modules.yaml
Normal file
21
etc/spack/defaults/cray/modules.yaml
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# -------------------------------------------------------------------------
|
||||||
|
# This is the default configuration for Spack's module file generation.
|
||||||
|
#
|
||||||
|
# Settings here are versioned with Spack and are intended to provide
|
||||||
|
# sensible defaults out of the box. Spack maintainers should edit this
|
||||||
|
# file to keep it current.
|
||||||
|
#
|
||||||
|
# Users can override these settings by editing the following files.
|
||||||
|
#
|
||||||
|
# Per-spack-instance settings (overrides defaults):
|
||||||
|
# $SPACK_ROOT/etc/spack/modules.yaml
|
||||||
|
#
|
||||||
|
# Per-user settings (overrides default and site settings):
|
||||||
|
# ~/.spack/modules.yaml
|
||||||
|
# -------------------------------------------------------------------------
|
||||||
|
modules:
|
||||||
|
prefix_inspections:
|
||||||
|
lib:
|
||||||
|
- LD_LIBRARY_PATH
|
||||||
|
lib64:
|
||||||
|
- LD_LIBRARY_PATH
|
@@ -11,8 +11,8 @@
|
|||||||
import os.path
|
import os.path
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from six import string_types
|
|
||||||
import six.moves.urllib.parse as urllib_parse
|
import six.moves.urllib.parse as urllib_parse
|
||||||
|
from six import string_types
|
||||||
|
|
||||||
import spack.util.path
|
import spack.util.path
|
||||||
|
|
||||||
@@ -151,21 +151,21 @@ def join(base_url, path, *extra, **kwargs):
|
|||||||
for x in itertools.chain((base_url, path), extra)]
|
for x in itertools.chain((base_url, path), extra)]
|
||||||
n = len(paths)
|
n = len(paths)
|
||||||
last_abs_component = None
|
last_abs_component = None
|
||||||
scheme = None
|
scheme = ''
|
||||||
for i in range(n - 1, -1, -1):
|
for i in range(n - 1, -1, -1):
|
||||||
obj = urllib_parse.urlparse(
|
obj = urllib_parse.urlparse(
|
||||||
paths[i], scheme=None, allow_fragments=False)
|
paths[i], scheme='', allow_fragments=False)
|
||||||
|
|
||||||
scheme = obj.scheme
|
scheme = obj.scheme
|
||||||
|
|
||||||
# in either case the component is absolute
|
# in either case the component is absolute
|
||||||
if scheme is not None or obj.path.startswith('/'):
|
if scheme or obj.path.startswith('/'):
|
||||||
if scheme is None:
|
if not scheme:
|
||||||
# Without a scheme, we have to go back looking for the
|
# Without a scheme, we have to go back looking for the
|
||||||
# next-last component that specifies a scheme.
|
# next-last component that specifies a scheme.
|
||||||
for j in range(i - 1, -1, -1):
|
for j in range(i - 1, -1, -1):
|
||||||
obj = urllib_parse.urlparse(
|
obj = urllib_parse.urlparse(
|
||||||
paths[j], scheme=None, allow_fragments=False)
|
paths[j], scheme='', allow_fragments=False)
|
||||||
|
|
||||||
if obj.scheme:
|
if obj.scheme:
|
||||||
paths[i] = '{SM}://{NL}{PATH}'.format(
|
paths[i] = '{SM}://{NL}{PATH}'.format(
|
||||||
|
@@ -167,7 +167,8 @@ def patch(self):
|
|||||||
'fortran/src/H5Fff_F03.f90',
|
'fortran/src/H5Fff_F03.f90',
|
||||||
string=True, ignore_absent=True)
|
string=True, ignore_absent=True)
|
||||||
|
|
||||||
filter_compiler_wrappers('h5cc', 'h5c++', 'h5fc', relative_root='bin')
|
filter_compiler_wrappers('h5cc', 'h5c++', 'h5fc',
|
||||||
|
'h5pcc', 'h5pfc', relative_root='bin')
|
||||||
|
|
||||||
def url_for_version(self, version):
|
def url_for_version(self, version):
|
||||||
url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{0}/hdf5-{1}/src/hdf5-{1}.tar.gz"
|
url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-{0}/hdf5-{1}/src/hdf5-{1}.tar.gz"
|
||||||
|
Reference in New Issue
Block a user