Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,3 +239,8 @@ jobs:
module load ewok-env
module load soca-env
module list

# https://github.com/JCSDA/spack-stack/issues/1903
module show stack-intel-oneapi-compilers/2024.2.0
which llvm-ar
llvm-ar --version
5 changes: 5 additions & 0 deletions .github/workflows/ubuntu-ci-x86_64-oneapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,3 +239,8 @@ jobs:
module load ewok-env
module load soca-env
module list

# https://github.com/JCSDA/spack-stack/issues/1903
module show stack-intel-oneapi-compilers/2024.2.0
which llvm-ar
llvm-ar --version
13 changes: 12 additions & 1 deletion spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ def custom_sort_key(entry):
logging.debug(" ... ... CC : {}".format(substitutes["CC"]))
logging.debug(" ... ... CXX : {}".format(substitutes["CXX"]))
logging.debug(" ... ... F77 : {}".format(substitutes["F77"]))
logging.debug(" ... ... FC' : {}".format(substitutes["FC"]))
logging.debug(" ... ... FC : {}".format(substitutes["FC"]))

# Compiler flags; names are lowercase in spack
if "flags" in compiler.extra_attributes.keys():
Expand All @@ -422,6 +422,17 @@ def custom_sort_key(entry):
env_name,
env_values
)
# https://github.com/JCSDA/spack-stack/issues/1903
# Attempt to locate directory "compiler" in the same directory where
# "icx" resides. If found, add it to PATH in the compiler module
if compiler.name=="intel-oneapi-compilers":
path_to_icx = os.path.dirname(substitutes["CC"])
if os.path.isdir(os.path.join(path_to_icx, "compiler")):
substitutes["ENVVARS"] += prepend_path_command(
module_choice,
"PATH",
os.path.join(path_to_icx, "compiler"),
)
substitutes["ENVVARS"] = substitutes["ENVVARS"].rstrip("\n")
logging.debug(" ... ... ENVVARS : {}".format(substitutes["ENVVARS"]))

Expand Down