Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bd2d636
Use new python env on orion
CoryMartin-NOAA Mar 21, 2022
b9d6e10
Start of CI cron scripts
CoryMartin-NOAA Mar 22, 2022
14a2d1e
Add writing of comment message
CoryMartin-NOAA Mar 22, 2022
52a0c02
Make it a login shell for modules
CoryMartin-NOAA Mar 22, 2022
4a19577
Merge branch 'feature/new_orion_modules' into feature/orion_cron_rt
CoryMartin-NOAA Mar 22, 2022
5d9a9ef
Fix typo
CoryMartin-NOAA Mar 22, 2022
d54c8c6
Commit to save
CoryMartin-NOAA Mar 22, 2022
3135026
move files to ci/
CoryMartin-NOAA Mar 22, 2022
3189c35
Comment out repos for testing/debugging
CoryMartin-NOAA Mar 22, 2022
4bfc5c7
Remove CRTM
CoryMartin-NOAA Mar 22, 2022
9f11f28
Add scrubber and change of labels
CoryMartin-NOAA Mar 22, 2022
39dab94
Changes to the CI script
CoryMartin-NOAA Mar 22, 2022
86d99c2
Add back all repos
CoryMartin-NOAA Mar 22, 2022
78484ef
Update comment format
CoryMartin-NOAA Mar 22, 2022
6d84e38
Merge branch 'develop' into feature/orion_cron_rt
CoryMartin-NOAA Mar 23, 2022
d78686c
Add back unit tests on push
CoryMartin-NOAA Mar 23, 2022
a25b6a3
Changes to hera modules, and add hera ci config
CoryMartin-NOAA Mar 23, 2022
2ff4158
Address reviewer comments round 1
CoryMartin-NOAA Mar 23, 2022
2559339
Merge branch 'feature/orion_cron_rt' into feature/hera_cron_rt
CoryMartin-NOAA Mar 23, 2022
e1de501
Change test names
CoryMartin-NOAA Mar 23, 2022
276e6d5
Remove ulimit
CoryMartin-NOAA Mar 23, 2022
5374a7a
Merge branch 'feature/orion_cron_rt' into feature/hera_cron_rt
CoryMartin-NOAA Mar 23, 2022
b92580f
Merge branch 'develop' into feature/hera_cron_rt
CoryMartin-NOAA Mar 23, 2022
baf9baf
Reviewer comments
CoryMartin-NOAA Mar 23, 2022
99b9c58
have pycodestyle only check certain dirs
CoryMartin-NOAA Mar 23, 2022
db7ee8b
Remove dirs that donot exist yet
CoryMartin-NOAA Mar 23, 2022
ae9633d
make extract verbose
CoryMartin-NOAA Mar 23, 2022
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: 7 additions & 0 deletions ci/hera.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
GDAS_CI_ROOT=/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp
GDAS_CI_HOST='hera'
export GDAS_MODULE_USE=$GDAS_CI_ROOT/repo/modulefiles
export SLURM_ACCOUNT=da-cpu
export SALLOC_ACCOUNT=$SLURM_ACCOUNT
export SBATCH_ACCOUNT=$SLURM_ACCOUNT
export SLURM_QOS=debug
51 changes: 46 additions & 5 deletions modulefiles/GDAS/hera.lua
Original file line number Diff line number Diff line change
@@ -1,24 +1,65 @@
-- NOAA RDHPCS Hera Modulefile for UFS-DA
help([[
Load environment for running the GDAS application with Intel compilers and MPI.
]])

local pkgName = myModuleName()
local pkgVersion = myModuleVersion()
local pkgNameVer = myModuleFullName()

conflict(pkgName)

local jedi_opt = '/scratch1/NCEPDEV/jcsda/jedipara/opt/modules'
setenv('JEDI_OPT', jedi_opt)
local jedi_core = pathJoin(jedi_opt, 'modulefiles/core')
prepend_path("MODULEPATH", jedi_core)

load('jedi/intel-impi/2020.2')
prepend_path("MODULEPATH", '/scratch1/NCEPDEV/da/python/opt/modulefiles/stack')

load("cmake/3.20.1")
load("git-lfs/2.11.0")

load("jedi-intel/2020.2")
load("szip/2.1.1")
load("zlib/1.2.11")
load("udunits/2.2.28")
load("gsl_lite/0.37.0")
load("jedi-impi/2020.2")

load("hdf5/1.12.0")
load("pnetcdf/1.12.1")
load("netcdf/4.7.4")

load("boost-headers/1.68.0")
load("eigen/3.3.7")
load("bufr/noaa-emc-11.5.0")

load("nccmp/1.8.7.0")
load("pio/2.5.1-debug")

load("ecbuild/ecmwf-3.6.1")
load("eckit/ecmwf-1.16.0")
load("fckit/ecmwf-0.9.2")
load("atlas/ecmwf-0.24.1")
load("nco/4.9.1")

load("pybind11/2.7.0")
load("json/3.9.1")
load("json-schema-validator/2.1.0")

load("hpc/1.2.0")
load("miniconda3/4.6.14")
load("gdasapp/1.0.0")

setenv("CC","mpiicc")
setenv("FC","mpiifort")
setenv("CXX","mpiicpc")

local mpiexec = '/apps/slurm/default/bin/srun'
local mpinproc = '-n'
setenv('MPIEXEC_EXEC', mpiexec)
setenv('MPIEXEC_NPROC', mpinproc)

whatis("Name: ".. pkgName)
whatis("Version: " .. pkgVersion)
whatis("Category: UFS-DA")
whatis("Description: Load JEDI-Stack for UFS-DA")
whatis("Version: ".. pkgVersion)
whatis("Category: GDASApp")
whatis("Description: Load all libraries needed for GDASApp")
2 changes: 1 addition & 1 deletion modulefiles/GDAS/orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ prepend_path("MODULEPATH", jedi_core)

prepend_path("MODULEPATH", '/work2/noaa/da/python/opt/modulefiles/stack')

load("cmake/3.18.1")
load("cmake/3.22.1")
load("git/2.28.0")
load("git-lfs/2.13.2")

Expand Down
5 changes: 3 additions & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ file(DOWNLOAD
EXPECTED_HASH SHA256=${SHA}
)
# Extract downloaded tarball.
file(ARCHIVE_EXTRACT INPUT ${TAR})
file(ARCHIVE_EXTRACT INPUT ${TAR}
VERBOSE)

# list of test files to install
list(APPEND test_data
Expand All @@ -29,7 +30,7 @@ install(FILES ${test_data}
##### unit tests
# test for python coding norms
add_test(NAME test_gdasapp_check_python_norms
COMMAND pycodestyle -v --config ./.pycodestyle .
COMMAND pycodestyle -v --config ./.pycodestyle ./ush
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
# test for ush/check_yaml_keys.py
add_test(NAME test_gdasapp_check_yaml_keys
Expand Down