GEOS-ESM · mathomp4 · Jun 3, 2022 · Jun 2, 2022 · Jun 2, 2022 · Jun 2, 2022
@@ -43,3 +43,6 @@
 [submodule "GFE"]
 	path = GFE
 	url = https://github.com/Goddard-Fortran-Ecosystem/GFE.git
+[submodule "xgboost"]
+	path = xgboost
+	url = https://github.com/dmlc/xgboost.git
@@ -8,6 +8,24 @@
 ### Removed
 ### Added
 
+## [7.2.0] - 2022-06-03
+
+### Added
+
+* xgboost v1.6.0
+
+### Updates
+
+* GFE v1.3.1
+* curl 7.83.1
+* HDF5 1.10.9
+* NCO 5.0.7
+* CDO 2.0.5
+
+### Removed
+
+- Removed NAG HDF5 patch as 1.10.9 does not seem to need it anymore
+
 ## [7.1.0] - 2022-05-10
 
 ### Updates

@@ -244,7 +244,7 @@ RELEASE_FILE = $(MKFILE_DIRNAME)-$(DATE)
 #                  --------------------------------
 
 ALLDIRS = antlr2 gsl jpeg zlib szlib curl hdf4 hdf5 netcdf netcdf-fortran netcdf-cxx4 \
-          udunits2 nco cdo nccmp esmf \
+          udunits2 nco cdo nccmp esmf xgboost \
           GFE \
           FLAP hdfeos hdfeos5 SDPToolkit
 
@@ -268,7 +268,7 @@ endif
 
 GFE_DIRS = GFE
 
-ESSENTIAL_DIRS = jpeg zlib szlib hdf4 hdf5 netcdf netcdf-fortran esmf \
+ESSENTIAL_DIRS = jpeg zlib szlib hdf4 hdf5 netcdf netcdf-fortran esmf xgboost \
                  $(GFE_DIRS) FLAP
 
 ifeq ($(MACH),aarch64)
@@ -445,7 +445,7 @@ clean:
 	  done
 
 distclean:
-	@/bin/rm -rf *.config *.install *.check
+	@/bin/rm -rf *.config *.install *.check *.python
 	@ t=$@; argv="$(SUBDIRS)" ;\
 	  for d in $$argv; do			      \
 	    ( $(MAKE) $$d.$$t ) \
@@ -499,13 +499,7 @@ hdf4.config: hdf4/README.txt jpeg.install zlib.install szlib.install
                       CFLAGS="$(CFLAGS) $(NO_IMPLICIT_FUNCTION_ERROR)" FFLAGS="$(NAG_FCFLAGS) $(NAG_DUSTY) $(ALLOW_ARGUMENT_MISMATCH)" CC=$(CC) FC=$(FC) CXX=$(CXX) )
 	touch $@
 
-ifeq ($(findstring nagfor,$(notdir $(FC))),nagfor)
-hdf5.config :: hdf5/README.txt
-	@echo Patching HDF5 for NAG
-	patch -f -p1 < ./patches/hdf5/nag.configure.patch
-endif
-
-hdf5.config :: hdf5/README.txt szlib.install zlib.install
+hdf5.config :: hdf5/README.md szlib.install zlib.install
 	echo Configuring hdf5
 	(cd hdf5; \
           export PATH="$(prefix)/bin:$(PATH)" ;\
@@ -520,12 +514,6 @@ hdf5.config :: hdf5/README.txt szlib.install zlib.install
                       CFLAGS="$(CFLAGS) $(HDF5_NCCS_MPT_CFLAG)" FCFLAGS="$(NAG_FCFLAGS)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) )
 	touch $@
 
-ifeq ($(findstring nagfor,$(notdir $(FC))),nagfor)
-hdf5.config :: hdf5/README.txt
-	@echo Unpatching HDF5 for NAG
-	patch -f -p1 -R < ./patches/hdf5/nag.configure.patch
-endif
-
 ifneq ("$(wildcard $(prefix)/bin/curl-config)","")
 BUILD_DAP = --enable-dap
 LIB_CURL = $(shell $(prefix)/bin/curl-config --libs) $(DARWIN_ST_LIBS)
@@ -722,6 +710,13 @@ nccmp.config: nccmp/configure netcdf.install
                       FCFLAGS="$(NAG_FCFLAGS)" CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77) )
 	@touch $@
 
+xgboost.config:
+	@echo "Configuring xgboost"
+	@mkdir -p ./xgboost/build
+	@(cd ./xgboost/build; \
+		cmake -DCMAKE_INSTALL_PREFIX=$(prefix) .. )
+	@touch $@
+
 GFE.config:
 	@echo "Configuring GFE"
 	@mkdir -p ./GFE/build
@@ -896,6 +891,12 @@ nccmp.install: nccmp.config
           $(MAKE) install CC=$(NC_CC) FC=$(NC_FC) CXX=$(NC_CXX) F77=$(NC_F77))
 	@touch $@
 
+xgboost.install: xgboost.config
+	@echo "Installing xgboost"
+	@(cd ./xgboost/build; \
+		$(MAKE) install )
+	@touch $@
+
 GFE.install: GFE.config
 	@echo "Installing GFE"
 	@(cd ./GFE/build; \
@@ -1051,6 +1052,14 @@ netcdf-cxx4.distclean:
 	@echo "Cleaning netcdf-cxx4"
 	@rm -rf ./netcdf-cxx4/build
 
+xgboost.clean:
+	@echo "Cleaning xgboost"
+	@rm -rf ./xgboost/build
+
+xgboost.distclean:
+	@echo "Cleaning xgboost"
+	@rm -rf ./xgboost/build
+
 GFE.clean:
 	@echo "Cleaning GFE"
 	@rm -rf ./GFE/build
@@ -1095,6 +1104,9 @@ curl.check: curl.install
 	@echo "Checking curl"
 	@echo "We explicitly do not check cURL due to how long it takes"
 
+xgboost.check: xgboost.install
+	@echo "Not sure how to check xgboost"
+
 GFE.check: GFE.install
 	@echo "Checking GFE"
 	@echo "This requires a re-CMake to enable testing"

@@ -16,18 +16,19 @@ NASA/GSFC.
 | [netCDF](https://github.com/Unidata/netcdf-c)                           | 4.8.1        |
 | [netCDF Fortran](https://github.com/Unidata/netcdf-fortran)             | 4.5.4        |
 | [netCDF C++](https://github.com/Unidata/netcdf-cxx4)                    | 4.3.1        |
-| [HDF5](https://portal.hdfgroup.org/display/support)                     | 1.10.8       |
+| [HDF5](https://portal.hdfgroup.org/display/support)                     | 1.10.9       |
 | [HDF4](https://portal.hdfgroup.org/display/support)                     | 4.2.15       |
-| [GFE](https://github.com/Goddard-Fortran-Ecosystem/GFE)                 | v1.2.0       |
+| [GFE](https://github.com/Goddard-Fortran-Ecosystem/GFE)                 | v1.3.1       |
+| [xgboost](https://github.com/dmlc/xgboost)                              | v1.6.0       |
 | [antlr2](https://www.antlr2.org/)                                       | 2.7.7        |
 | [GSL](https://www.gnu.org/software/gsl/)                                | 2.7          |
 | [jpeg](http://www.ijg.org/)                                             | 9e           |
 | [zlib](http://www.zlib.net/)                                            | 1.2.11       |
 | [szip](https://support.hdfgroup.org/doc_resource/SZIP/)                 | 2.1.1        |
-| [cURL](https://curl.haxx.se/)                                           | 7.80.0       |
+| [cURL](https://curl.haxx.se/)                                           | 7.83.1       |
 | [UDUNITS2](https://github.com/Unidata/UDUNITS-2)                        | 2.2.26       |
-| [NCO](http://nco.sourceforge.net/)                                      | 5.0.6        |
-| [CDO](https://code.mpimet.mpg.de/projects/cdo)                          | 2.0.4        |
+| [NCO](http://nco.sourceforge.net/)                                      | 5.0.7        |
+| [CDO](https://code.mpimet.mpg.de/projects/cdo)                          | 2.0.5        |
 | [nccmp](https://gitlab.com/remikz/nccmp)                                | 1.9.1.0      |
 | [FLAP](https://github.com/mathomp4/FLAP)                                | geos/v1.10.0 |
 | [HDF-EOS2](https://wiki.earthdata.nasa.gov/display/DAS)                 | 3.0          |

@@ -1 +1 @@
-7.1.0
+7.2.0
@@ -1 +1 @@
-ad6a666eb99631a829139a07e0eda0e93ff09d9cdbc329ec4413af7fe234305e9565899f54424ed8871c5734d4d70264d2ea16e09686c9152ca50553d96c1975  cdo-2.0.4.tar.gz
+7aaa8b7c536085f4e4a328a6f49891e00a4662357cd2923cf331c4ae61bb7fb2691d8740dbd75384f1e2d41a3660f79a1122ff2983a7c0c373d6a63a3af9e2c8  cdo-2.0.5.tar.gz
@@ -5,9 +5,9 @@
 # --------------
 
 package_name='cdo'
-tarball='cdo-2.0.4.tar.gz'
+tarball='cdo-2.0.5.tar.gz'
 # NOTE NOTE The last node of this URL changes with each new version
-base_url='https://code.mpimet.mpg.de/attachments/download/26761/'
+base_url='https://code.mpimet.mpg.de/attachments/download/26823/'
 
 export LMOD_SH_DBG_ON=0
+1 −1		CMakeLists.txt
+12 −0		ChangeLog.md
+1 −1		fArgParse
+1 −1		gFTL
+1 −1		gFTL-shared
+1 −1		pFUnit
+1 −1		pFlogger
+1 −1		yaFyaml
+1 −0		Makefile.in
+641 −549		autobld/config.guess
+376 −279		autobld/config.sub
+3,497 −2,011		autobld/ltmain.sh
+4 −7		bld/Makefile
+7 −4		bld/nco.spec
+15 −15		bld/nco_dst.pl
+20 −10		bm/NCO_rgr.pm
+1 −2		config.h.in
+1,865 −1,362		configure
+3 −2		configure.ac
+10 −44		configure.eg
+1 −0		data/Makefile.in
+20 −0		data/in.cdl
+21 −5		data/ncap2_tst.nco
+4 −4		data/ncclimo
+16 −13		data/ncremap
+2 −3		data/tpt_brt.nco
+6 −0		debian/changelog
+54 −22		doc/ANNOUNCE
+124 −0		doc/ChangeLog
+1 −0		doc/Makefile.in
+1 −1		doc/VERSION
+81 −81		doc/debian.txt
+34 −29		doc/index.shtml
+48 −33		doc/nco.texi
+1,480 −1,117		m4/libtool.m4
+90 −37		m4/ltoptions.m4
+6 −6		m4/ltversion.m4
+1 −0		man/Makefile.in
+1 −0		src/Makefile.in
+1 −0		src/nco++/Makefile.in
+6 −2		src/nco++/ncoGrammar.g
+1 −1		src/nco++/ncoParserTokenTypes.hpp
+1 −0		src/nco/Makefile.in
+12 −3		src/nco/ncks.c
+8 −3		src/nco/nco.h
+20 −16		src/nco/nco_att_utl.c
+2 −3		src/nco/nco_aux.c
+3 −3		src/nco/nco_ctl.c
+45 −0		src/nco/nco_flt.c
+8 −0		src/nco/nco_flt.h
+4 −2		src/nco/nco_grp_utl.c
+43 −37		src/nco/nco_map.c
+84 −84		src/nco/nco_mta.c
+9 −9		src/nco/nco_mta.h
+19 −14		src/nco/nco_ppc.c
+18 −7		src/nco/nco_prn.c
+81 −12		src/nco/nco_rgr.c
+0 −8		src/nco/nco_rth_flt.c
+0 −4		src/nco/nco_rth_flt.h
+1 −1		src/nco/nco_scm.c
+3 −2		src/nco/nco_var_lst.c
+75 −47		src/nco/nco_var_utl.c
+1 −1		src/nco/nco_var_utl.h
+1 −0		src/nco_c++/Makefile.in
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ad6a666eb99631a829139a07e0eda0e93ff09d9cdbc329ec4413af7fe234305e9565899f54424ed8871c5734d4d70264d2ea16e09686c9152ca50553d96c1975 cdo-2.0.4.tar.gz
		7aaa8b7c536085f4e4a328a6f49891e00a4662357cd2923cf331c4ae61bb7fb2691d8740dbd75384f1e2d41a3660f79a1122ff2983a7c0c373d6a63a3af9e2c8 cdo-2.0.5.tar.gz