Skip to content

Commit

Permalink
Updates for Baselibs 8.6.0 (#221)
Browse files Browse the repository at this point in the history 
* Update to CDO 2.4.2

* Update to HDF5 1.14.4.3

* Update to jpeg 9f

* Update to curl 8.9.1

* Update to NCO 5.2.7

* Update gcc c++ std

* More fixes for CDO C++20

* Update to FMS 2024.03

* You can't build SDPToolkit without HDF4

* No longer require downloading all packages at start

* Prepare for 8.6.0 Release
  • Loading branch information
@mathomp4
mathomp4 authored Sep 10, 2024
1 parent 609468d commit 1c0eb1c
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 19 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,22 @@
### Removed
### Added

## [8.6.0] - 2024-09-10

### Updates

- FMS 2024.03
- HDF5 1.14.4.3
- curl 8.9.1
- NCO 5.2.7
- CDO 2.4.2
- jpeg 9f

### Fixed

- Fixed GNU Make so that we don't require downloading all non-git libraries even if you are only building a few. Rather, we now
download at the config step for each library

## [8.5.0] - 2024-07-11

### Updates
Expand Down
2 changes: 1 addition & 1 deletion FMS
Submodule FMS updated 100 files
17 changes: 13 additions & 4 deletions GNUmakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ MAKEJOBS := $(if $(MAKEJOBS),$(MAKEJOBS),1)
COMMON_FLAG := -fcommon
export ALLOW_ARGUMENT_MISMATCH ALLOW_INVALID_BOZ
endif
# CDO needs C++20 standard
CDO_STD := -std=c++20
export CDO_STD
endif

# Clang has issues with some libraries due to strict C99
Expand All @@ -184,8 +187,8 @@ MAKEJOBS := $(if $(MAKEJOBS),$(MAKEJOBS),1)
export MMACOS_MIN

# There is an issue with clang++ and cdo
CLANG_STDC17 := -std=c++17
export CLANG_STDC17
CDO_STD := -std=c++20
export CDO_STD

# We might need to add -Wl,-ld_classic to LDFLAGS but only for certain versions of macOS/XCode
# This command:
Expand All @@ -211,6 +214,10 @@ MAKEJOBS := $(if $(MAKEJOBS),$(MAKEJOBS),1)
export NO_IMPLICIT_INT_ERROR
NO_INT_CONVERSION_ERROR := -Wno-int-conversion
export NO_INT_CONVERSION_ERROR

# CDO needs C++20 standard
CDO_STD := -std=c++20
export CDO_STD
endif

# HDF4 plus ifx does not work with Fortran bindings
Expand Down Expand Up @@ -338,6 +345,8 @@ else
LIB_HDF4 =
# Also need to remove hdfeos if no hdf4
SUBDIRS := $(filter-out hdfeos,$(SUBDIRS))
# and remove SDPToolkit
SUBDIRS := $(filter-out SDPToolkit,$(SUBDIRS))
endif

# Since we do not build the Fortran interface
Expand Down Expand Up @@ -446,7 +455,7 @@ verify:

.NOTPARALLEL: baselibs-config

prelim: echo-compilers baselibs-config versions download
prelim: echo-compilers baselibs-config versions

echo-compilers:
@mkdir -p $(prefix)/etc
Expand Down Expand Up @@ -784,7 +793,7 @@ cdo.config: cdo.download cdo/configure netcdf.install udunits2.install
--with-udunits2=$(prefix) \
--disable-grib --disable-openmp \
--disable-shared --enable-static \
CXXFLAGS="$(CLANG_STDC17)" FCFLAGS="$(NAG_FCFLAGS)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) )
CXXFLAGS="$(CDO_STD)" FCFLAGS="$(NAG_FCFLAGS)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) )
@touch $@

nccmp.config: nccmp/configure netcdf.install
Expand Down
12 changes: 6 additions & 6 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ NASA/GSFC.
| Library | Version |
| --- | --- |
| [ESMF](https://github.com/esmf-org/esmf) | v8.6.1 |
| [FMS](https://github.com/NOAA-GFDL/FMS/) | 2024.01.02 |
| [FMS](https://github.com/NOAA-GFDL/FMS/) | 2024.03 |
| [netCDF](https://github.com/Unidata/netcdf-c) | 4.9.2 |
| [netCDF Fortran](https://github.com/Unidata/netcdf-fortran) | 4.6.1 |
| [netCDF C++](https://github.com/Unidata/netcdf-cxx4) | 4.3.1 |
| [HDF5](https://portal.hdfgroup.org/display/support) | 1.10.11 |
| [HDF5](https://portal.hdfgroup.org/display/support) | 1.14.4.3 |
| [HDF4](https://portal.hdfgroup.org/display/support) | 4.2.16-2 |
| [GFE](https://github.com/Goddard-Fortran-Ecosystem/GFE) | v1.16.0 |
| [xgboost](https://github.com/dmlc/xgboost) | v1.6.0 |
| [libyaml](https://github.com/yaml/libyaml.git) | 0.2.5 |
| [antlr2](https://www.antlr2.org/) | 2.7.7 |
| [GSL](https://www.gnu.org/software/gsl/) | 2.7 |
| [jpeg](http://www.ijg.org/) | 9e |
| [jpeg](http://www.ijg.org/) | 9f |
| [zlib](http://www.zlib.net/) | 1.3.1 |
| [szip](https://support.hdfgroup.org/doc_resource/SZIP/) | 2.1.1 |
| [cURL](https://curl.haxx.se/) | 8.8.0 |
| [curl](https://curl.haxx.se/) | 8.9.1 |
| [UDUNITS2](https://github.com/GMAO-SI-Team/UDUNITS-2.git) | 2.2.28 |
| [NCO](http://nco.sourceforge.net/) | 5.2.6 |
| [CDO](https://code.mpimet.mpg.de/projects/cdo) | 2.3.0 |
| [NCO](http://nco.sourceforge.net/) | 5.2.7 |
| [CDO](https://code.mpimet.mpg.de/projects/cdo) | 2.4.2 |
| [nccmp](https://gitlab.com/remikz/nccmp) | 1.9.1.0 |
| [HDF-EOS2](https://wiki.earthdata.nasa.gov/display/DAS) | 3.0 |
| [HDF-EOS5](https://wiki.earthdata.nasa.gov/display/DAS) | 2.0 |
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.5.0
8.6.0
2 changes: 1 addition & 1 deletion curl
Submodule curl updated 1388 files
2 changes: 1 addition & 1 deletion hdf5
Submodule hdf5 updated 3724 files
2 changes: 1 addition & 1 deletion jpeg
Submodule jpeg updated 73 files
+10 −9 Makefile.am
+11 −9 Makefile.in
+5 −5 README
+144 −150 aclocal.m4
+3 −3 cdaltui.txt
+11 −0 change.log
+6 −6 cjpeg.1
+2 −2 cjpegalt.c
+1,299 −833 configure
+1 −1 configure.ac
+2 −2 djpegalt.c
+72 −76 install.txt
+4 −4 jccoefct.c
+16 −19 jccolor.c
+144 −128 jchuff.c
+4 −3 jconfig.st
+16 −4 jconfig.vc
+62 −0 jconfig.xc
+6 −10 jdatadst.c
+10 −13 jdatasrc.c
+42 −51 jdcolor.c
+2 −2 jdct.h
+15 −16 jdmerge.c
+63 −3 jinclude.h
+21 −10 jmorecfg.h
+2 −2 jpeglib.h
+3 −3 jversion.h
+7 −6 libjpeg.txt
+572 −283 ltmain.sh
+84 −0 makajpeg.bcb
+982 −0 makcjpeg.bcb
+3 −3 makcjpeg.st
+982 −0 makdjpeg.bcb
+3 −3 makdjpeg.st
+11 −0 makeasln.v16
+57 −18 makecvcx.v16
+0 −195 makecvcx.v17
+57 −18 makedvcx.v16
+0 −195 makedvcx.v17
+10 −9 makefile.ansi
+143 −37 makefile.b32
+345 −0 makefile.b64
+17 −14 makefile.bcc
+348 −0 makefile.c32
+349 −0 makefile.d32
+10 −9 makefile.dj
+10 −9 makefile.manx
+10 −9 makefile.mc6
+10 −9 makefile.mms
+10 −9 makefile.sas
+10 −9 makefile.unix
+13 −46 makefile.vc
+13 −46 makefile.vs
+10 −9 makefile.wat
+345 −0 makefile.x32
+262 −0 makefile.xc
+3 −0 makejsln.v16
+50 −14 makejvcx.v16
+0 −222 makejvcx.v17
+52 −14 makervcx.v16
+0 −178 makervcx.v17
+57 −18 maketvcx.v16
+0 −193 maketvcx.v17
+52 −14 makewvcx.v16
+0 −178 makewvcx.v17
+1,031 −0 makljpeg.bcb
+2 −2 makljpeg.st
+912 −0 makrjpeg.bcb
+976 −0 maktjpeg.bcb
+3 −3 maktjpeg.st
+912 −0 makwjpeg.bcb
+18 −19 transupp.c
+1 −1 usage.txt
2 changes: 1 addition & 1 deletion nco
Submodule nco updated 33 files
+29 −16 Makefile.in
+286 −129 aclocal.m4
+3 −0 bld/nco.spec
+15 −15 bld/nco_dst.pl
+18 −17 bm/NCO_rgr.pm
+257 −100 configure
+1 −1 configure.ac
+21 −11 data/Makefile.in
+8 −2 data/ncclimo
+9 −7 data/ncremap
+8 −2 debian/changelog
+55 −119 doc/ANNOUNCE
+72 −1 doc/ChangeLog
+22 −13 doc/Makefile.in
+1 −2 doc/VERSION
+81 −81 doc/debian.txt
+31 −26 doc/index.shtml
+22 −4 doc/nco.texi
+18 −8 man/Makefile.in
+15 −4 src/Makefile.in
+23 −17 src/nco++/Makefile.in
+73 −39 src/nco/Makefile.in
+11 −2 src/nco/ncks.c
+3 −2 src/nco/nco.h
+21 −18 src/nco/nco_flt.c
+11 −11 src/nco/nco_grp_utl.c
+16 −6 src/nco/nco_map.c
+26 −4 src/nco/nco_netcdf.c
+200 −17 src/nco/nco_rgr.c
+1 −0 src/nco/nco_rgr.h
+1 −1 src/nco/nco_scm.c
+4 −4 src/nco/nco_var_utl.c
+71 −37 src/nco_c++/Makefile.in
2 changes: 1 addition & 1 deletion scripts/cdo.sha512
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dd4f73a3beacc84bd5f8da56a86b58a69169602259cc98f0d6bc80156b7842996e4b082b1554197e7a82b49b2afc8de67f6365dd2449e4bcb44bed1565ac9e1c cdo-2.3.0.tar.gz
7b11d47e208bebab83a4e9e83d106600c168e2922887573a1bbb589de43acb05604f7a0914b8a4d620a5254ad12ec8b04afe14aa81e473f01349d84f387bbaa4 cdo-2.4.2.tar.gz
4 changes: 2 additions & 2 deletions scripts/download_cdo.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# --------------

package_name='cdo'
tarball='cdo-2.3.0.tar.gz'
tarball='cdo-2.4.2.tar.gz'
# NOTE NOTE The last node of this URL changes with each new version
base_url='https://code.mpimet.mpg.de/attachments/download/29019/'
base_url='https://code.mpimet.mpg.de/attachments/download/29481/'

export LMOD_SH_DBG_ON=0

Expand Down

0 comments on commit 1c0eb1c

Please sign in to comment.