Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make gfs-utils compile on CSPs with Rocky 8 #81

Merged
merged 10 commits into from
Oct 18, 2024
Merged

Make gfs-utils compile on CSPs with Rocky 8 #81

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5463313
Make gfs-util compile on CSPs with Rocky 8
weihuang-jedi Aug 30, 2024
e2559b0
Merge branch 'develop' of github.com:NOAA-EPIC/gfs-utils into csps-ro…
weihuang-jedi Sep 10, 2024
73b25f7
Merge branch 'develop' of github.com:NOAA-EPIC/gfs-utils into csps-ro…
weihuang-jedi Oct 1, 2024
008794d
Remove unneeded path
weihuang-jedi Oct 1, 2024
e5501fe
simplify modulefile
weihuang-jedi Oct 1, 2024
7c911e8
version added
weihuang-jedi Oct 17, 2024
2584c5f
get rid of WARNING: UNKNOWN PLATFORM on CSPs
weihuang-jedi Oct 17, 2024
8f65f5c
just check MACHINE_ID is noaacloud or not shuold be enough on CSPs
weihuang-jedi Oct 18, 2024
37624c1
Merge branch 'develop' of github.com:NOAA-EPIC/gfs-utils into csps-ro…
weihuang-jedi Oct 18, 2024
da0cc14
move local defines together, and keep load together to improve readib…
weihuang-jedi Oct 18, 2024
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
15 changes: 9 additions & 6 deletions modulefiles/gfsutils_noaacloud.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ help([[
Build environment for GFS utilities on NOAA Cloud
]])

prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.3.0"
local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/apps/modules/modulefiles")

load("gnu")
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
load(pathJoin("stack-intel", stack_intel_ver))
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
load(pathJoin("stack-intel", stack_intel_ver))
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"
local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
load(pathJoin("stack-intel", stack_intel_ver))
local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.10.0"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happened to the local change?

load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
unload("gnu")
weihuang-jedi marked this conversation as resolved.
Show resolved Hide resolved

local cmake_ver=os.getenv("cmake_ver") or "3.23.1"

load(pathJoin("cmake", cmake_ver))

load("gfsutils_common")
Expand Down
13 changes: 12 additions & 1 deletion ush/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,16 @@ elif [[ $MACHINE_ID = discover* ]]; then
. $SPACK_ROOT/share/spack/setup-env.sh

else
echo WARNING: UNKNOWN PLATFORM 1>&2
if [[ ! -v PW_CSP ]]; then
echo WARNING: UNKNOWN PLATFORM 1>&2
elif [[ -z "${PW_CSP}" ]]; then
echo WARNING: UNKNOWN PLATFORM 1>&2
else
if [[ "${PW_CSP}" == "aws" || "${PW_CSP}" == "azure" || "${PW_CSP}" == "google" ]]; then
module purge
else
echo WARNING: UNKNOWN PLATFORM 1>&2
fi
fi

weihuang-jedi marked this conversation as resolved.
Show resolved Hide resolved
fi
Loading