Skip to content

Commit

Permalink
Merge branch 'main' into feature/mathomp4/intel2023-openmpi416
Browse files Browse the repository at this point in the history
  • Loading branch information
mathomp4 authored Mar 6, 2024
2 parents aa8a0b8 + 72cea46 commit 2302a7d
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 9 deletions.
56 changes: 55 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,65 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed
### Added

## [4.27.0] - 2024-03-04

### Changed

- Move to use GEOSpyD Min23.5.2 on GMAO desktops

## [4.26.0] - 2024-02-22

### Changed

- Move to Baselibs 7.18.1
- HDF5 1.14.3
- curl 8.6.0
- zlib 1.3.1

## [4.25.1] - 2024-01-24

### Fixed

- Fix incorrect Open MPI module at NCCS SLES15

## [4.25.0] - 2024-01-22

### Changed

- Moved to Baselibs 7.17.1
- Fix for NAG and ESMF 8.6.0
- Update `g5_modules` to use GCC 11.4 as the backing C compiler on SLES 15 at NCCS
- This was done as it was discovered that xgboost was not building on SLES15 with Intel when using GCC 12. Until xgboost can be
updated to a newer version, this is the workaround.

## [4.24.0] - 2023-12-01

### Changed

- Moved to Baselibs 7.17.0
- GFE v1.12.0
- gFTL v1.11.0
- gFTL-shared v1.7.0
- fArgParse v1.6.0
- pFUnit v4.8.0
- yaFyaml v1.2.0
- pFlogger v1.11.0

## [4.23.0] - 2023-11-30

### Changed

- Moved to Baselibs 7.16.0
- ESMF v8.6.0
- NCO 5.1.9
- CDO 2.3.0
- Move to Open MPI 4.1.6 with Intel on SLES 15 at NCCS.

## [4.22.0] - 2023-11-21

### Changed

- Move back to Open MPI 4.1.5 with Intel on NCCS. This avoids a bug between GEOS' Intel debugging flags and MPI_Init with Open MPI 5.0.0 (see https://github.com/open-mpi/ompi/issues/12113)
- Move back to Open MPI 4.1.5 with Intel on SLES 15 on NCCS. This avoids a bug between GEOS' Intel debugging flags and MPI_Init with Open MPI 5.0.0 (see https://github.com/open-mpi/ompi/issues/12113)

## [4.21.0] - 2023-11-20

Expand Down
16 changes: 8 additions & 8 deletions g5_modules
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,16 @@ if ( $site == NCCS ) then
set mod3 = comp/intel/2021.6.0
set mod4 = mpi/impi/2021.6.0
set mod5 = python/GEOSpyD/Min4.11.0_py3.9_AND_Min4.8.3_py2.7
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0-SLES12
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.18.1/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0-SLES12
set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES12

else

set mod2 = comp/gcc/12.3.0
set mod3 = comp/intel/2023.2.1
set mod4 = mpi/openmpi/4.1.6/intel-2023.2.1
set mod2 = comp/gcc/11.4.0
set mod3 = comp/intel/2024.0.0
set mod4 = mpi/impi/2021.11
set mod5 = python/GEOSpyD/Min23.5.2-0_py3.11
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2023.2.1-openmpi_4.1.6-SLES15
set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-7.18.1/x86_64-pc-linux-gnu/ifort_2021.11.0-intelmpi_2021.11.0-SLES15
set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES15

endif
Expand All @@ -160,7 +160,7 @@ else if ( $site == NAS ) then

set mod1 = GEOSenv

set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.28_25Apr23_rhel87-TOSS4
set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-7.18.1/x86_64-pc-linux-gnu/ifort_2022.1.0-mpt_2.28_25Apr23_rhel87-TOSS4
set mod2 = comp-gcc/11.2.0-TOSS4
set mod3 = comp-intel/2022.1.0
set mod4 = mpi-hpe/mpt
Expand All @@ -182,14 +182,14 @@ else if ( $site == NAS ) then
#=================#
else if ( $site == GMAO.desktop ) then

set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-7.15.1/x86_64-pc-linux-gnu/ifort_2022.1.0-intelmpi_2022.1.0
set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-7.18.1/x86_64-pc-linux-gnu/ifort_2022.1.0-intelmpi_2022.1.0

set mod1 = GEOSenv

set mod2 = comp/gcc/11.2.0
set mod3 = comp/intel/2022.1.0
set mod4 = mpi/impi/2022.1.0
set mod5 = other/python/GEOSpyD/Min4.11.0_py3.9_AND_Min4.8.3_py2.7
set mod5 = other/python/GEOSpyD/Min23.5.2-0_py3.11

set mods = ( $mod1 $mod2 $mod3 $mod4 $mod5 )
set modinit = /usr/share/Modules/init/tcsh
Expand Down

0 comments on commit 2302a7d

Please sign in to comment.