From b1349f80924e414ab7d0bc10f0cc5ed88af1a487 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 17 Feb 2026 11:45:09 -0700 Subject: [PATCH 1/3] spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py: for intel-oneapi-compilers, attempt to add subdirectory 'compiler' of 'bin' to PATH; test in CI --- .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml | 3 +++ .github/workflows/ubuntu-ci-x86_64-oneapi.yaml | 3 +++ .../jcsda-emc/spack-stack/stack/meta_modules.py | 14 +++++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml index 2e12da6c6..967b6e373 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml @@ -239,3 +239,6 @@ jobs: module load ewok-env module load soca-env module list + + # https://github.com/JCSDA/spack-stack/issues/1903 + llvm-ar --version diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml index f6f59d18e..6951f0802 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml @@ -239,3 +239,6 @@ jobs: module load ewok-env module load soca-env module list + + # https://github.com/JCSDA/spack-stack/issues/1903 + llvm-ar --version diff --git a/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py b/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py index a31fb1d92..f5907ed72 100755 --- a/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py +++ b/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py @@ -399,7 +399,8 @@ 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(): @@ -422,6 +423,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"])) From 63d9a9a27e04706bd7cde9de4427de97366b9095 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 19 Feb 2026 05:12:42 -0700 Subject: [PATCH 2/3] Update spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py --- spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py | 1 - 1 file changed, 1 deletion(-) diff --git a/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py b/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py index f5907ed72..f5aa30ee2 100755 --- a/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py +++ b/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py @@ -401,7 +401,6 @@ def custom_sort_key(entry): logging.debug(" ... ... F77 : {}".format(substitutes["F77"])) logging.debug(" ... ... FC : {}".format(substitutes["FC"])) - # Compiler flags; names are lowercase in spack if "flags" in compiler.extra_attributes.keys(): for flag_name in compiler.extra_attributes["flags"].keys(): From 450025726823ac536842e7ac7c890b690e2a93d4 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 19 Feb 2026 05:15:46 -0700 Subject: [PATCH 3/3] More diagnostics in .github/workflows/ for llvm-ar --- .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml | 2 ++ .github/workflows/ubuntu-ci-x86_64-oneapi.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml index 967b6e373..0c5f42c62 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml @@ -241,4 +241,6 @@ jobs: 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 diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml index 6951f0802..55e18196f 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml @@ -241,4 +241,6 @@ jobs: 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