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

Update workflow_utils build modules and remove ncio module hack #412

Merged
merged 6 commits into from
Aug 17, 2021
Merged

Update workflow_utils build modules and remove ncio module hack #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d8c272c
Add ncio/1.0.0, landsfcutil/2.4.1, and wgrib2/2.0.8 modules to workfl…
KateFriedman-NOAA Aug 13, 2021
ac0bc5f
Remove ncio library hack from workflow_utils build
KateFriedman-NOAA Aug 13, 2021
f87c019
Add ncio/1.0.0, landsfcutil/2.4.1, and wgrib2/2.0.8 modules to workfl…
KateFriedman-NOAA Aug 13, 2021
b587121
Merge branch 'NOAA-EMC:develop' into feature/issue407
KateFriedman-NOAA Aug 17, 2021
4e84b77
Adjust workflow_utils modulefiles for all platforms
KateFriedman-NOAA Aug 17, 2021
938420f
Move hdf5 and netcdf module load order up in workflow_utils build mod…
KateFriedman-NOAA Aug 17, 2021
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
7 changes: 3 additions & 4 deletions modulefiles/workflow_utils.hera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ module load hpc-impi/2018.0.4
module load jasper/2.0.25
module load zlib/1.2.11
module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4

module load bacio/2.4.1
module load w3nco/2.4.1
Expand All @@ -20,10 +22,7 @@ module load sp/2.3.3
module load ip/3.3.3
module load nemsio/2.5.2
module load nemsiogfs/2.5.3
#module load ncio/1.0.0
module load ncio/1.0.0
module load sigio/2.3.2
module load g2/3.4.1
module load bufr/11.4.0

module load hdf5/1.10.6
module load netcdf/4.7.4
6 changes: 3 additions & 3 deletions modulefiles/workflow_utils.jet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ module load hpc-impi/2018.4.274
module load jasper/2.0.25
module load zlib/1.2.11
module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4

module load bacio/2.4.1
module load w3nco/2.4.1
Expand All @@ -24,9 +26,7 @@ module load sp/2.3.3
module load ip/3.3.3
module load nemsio/2.5.2
module load nemsiogfs/2.5.3
module load ncio/1.0.0
module load sigio/2.3.2
module load g2/3.4.1
module load bufr/11.4.0

module load hdf5/1.10.6
module load netcdf/4.7.4
7 changes: 3 additions & 4 deletions modulefiles/workflow_utils.orion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ module load hpc-impi/2018.4
module load jasper/2.0.25
module load zlib/1.2.11
module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4

module load bacio/2.4.1
module load w3nco/2.4.1
Expand All @@ -20,10 +22,7 @@ module load sp/2.3.3
module load ip/3.3.3
module load nemsio/2.5.2
module load nemsiogfs/2.5.3
#module load ncio/1.0.0
module load ncio/1.0.0
module load sigio/2.3.2
module load g2/3.4.1
module load bufr/11.4.0

module load hdf5/1.10.6
module load netcdf/4.7.4
7 changes: 3 additions & 4 deletions modulefiles/workflow_utils.wcoss_dell_p3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ module load hpc-impi/18.0.1
module load jasper/2.0.25
module load zlib/1.2.11
module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4

module load bacio/2.4.1
module load w3nco/2.4.1
Expand All @@ -20,10 +22,7 @@ module load sp/2.3.3
module load ip/3.3.3
module load nemsio/2.5.2
module load nemsiogfs/2.5.3
#module load ncio/1.0.0
module load ncio/1.0.0
module load sigio/2.3.2
module load g2/3.4.1
module load bufr/11.4.0

module load hdf5/1.10.6
module load netcdf/4.7.4
18 changes: 0 additions & 18 deletions sorc/build_workflow_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,6 @@ if [[ -f $modulefile ]]; then
fi
# End adaptation

# Begin hack
# In place until nceplibs-ncio is in hpc-stack and available as a module
# After nceplibs-ncio is in hpc-stack, add the following line to
# ${UTILS_DIR}/../modulefiles/workflow_utils.<platform>
# "module load ncio/<ncio-version>"
# and remove this hack

[[ -d nceplibs-ncio ]] && rm -rf nceplibs-ncio
git clone -b develop https://github.com/noaa-emc/nceplibs-ncio
cd nceplibs-ncio
mkdir -p build && cd build
cmake -DCMAKE_INSTALL_PREFIX=../install ..
make -j ${BUILD_JOBS:-4} VERBOSE=${BUILD_VERBOSE:-}
make install
cd ../..
export ncio_ROOT=$PWD/nceplibs-ncio/install
# End hack

BUILD_DIR=${BUILD_DIR:-${UTILS_DIR}/build}
[[ -d $BUILD_DIR ]] && rm -rf $BUILD_DIR
mkdir -p ${BUILD_DIR}
Expand Down