diff --git a/.gitmodules b/.gitmodules index 5cff343..28ba972 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 399de94..dcc2593 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/GFE b/GFE index 614e7d0..3306949 160000 --- a/GFE +++ b/GFE @@ -1 +1 @@ -Subproject commit 614e7d01ff7af43023735cb88901b3bc5384edfd +Subproject commit 3306949fb4ee1254ddbf0c1398468498a4afbed4 diff --git a/GNUmakefile b/GNUmakefile index 71e1339..bcacc9f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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" diff --git a/README.md b/README.md index 7664c3d..97581cd 100644 --- a/README.md +++ b/README.md @@ -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 | diff --git a/VERSION b/VERSION index a3fcc71..0ee843c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.1.0 +7.2.0 diff --git a/curl b/curl index 9e560d1..462196e 160000 --- a/curl +++ b/curl @@ -1 +1 @@ -Subproject commit 9e560d11aad028de74addc0d1edfefa5667884f4 +Subproject commit 462196e6b4a47f924293a0e26b8e9c23d37ac26f diff --git a/hdf5 b/hdf5 index 111c7ae..1d90890 160000 --- a/hdf5 +++ b/hdf5 @@ -1 +1 @@ -Subproject commit 111c7ae9ac2efc29e8b399e6951253af9110b81a +Subproject commit 1d90890a7b38834074169ce56720b7ea7f4b01ae diff --git a/nco b/nco index b41087f..aa843e6 160000 --- a/nco +++ b/nco @@ -1 +1 @@ -Subproject commit b41087f09ed5785e8b1e779aed90699efdbda65e +Subproject commit aa843e6bd190452eb949c91916c32f5a8c4f6d1a diff --git a/patches/hdf5/nag.configure.patch b/patches/hdf5/nag.configure.patch deleted file mode 100644 index 702a677..0000000 --- a/patches/hdf5/nag.configure.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/hdf5/configure -+++ b/hdf5/configure -@@ -7925,7 +7925,8 @@ if ac_fn_fc_try_run "$LINENO"; then : - - - pac_validIntKinds="`sed -n '1p' pac_fconftest.out`" -- pac_validRealKinds="`sed -n '2p' pac_fconftest.out`" -+ #pac_validRealKinds="`sed -n '2p' pac_fconftest.out`" -+ pac_validRealKinds="1,2,3" - PAC_FC_MAX_REAL_PRECISION="`sed -n '3p' pac_fconftest.out`" - - cat >>confdefs.h <<_ACEOF -@@ -8097,7 +8098,8 @@ if ac_fn_fc_try_run "$LINENO"; then : - - - pac_validIntKinds="`sed -n '1p' pac_fconftest.out`" -- pac_validRealKinds="`sed -n '2p' pac_fconftest.out`" -+ #pac_validRealKinds="`sed -n '2p' pac_fconftest.out`" -+ pac_validRealKinds="1,2,3" - PAC_FC_MAX_REAL_PRECISION="`sed -n '3p' pac_fconftest.out`" - - cat >>confdefs.h <<_ACEOF - diff --git a/scripts/cdo.sha512 b/scripts/cdo.sha512 index 2bd4a68..5a046e6 100644 --- a/scripts/cdo.sha512 +++ b/scripts/cdo.sha512 @@ -1 +1 @@ -ad6a666eb99631a829139a07e0eda0e93ff09d9cdbc329ec4413af7fe234305e9565899f54424ed8871c5734d4d70264d2ea16e09686c9152ca50553d96c1975 cdo-2.0.4.tar.gz +7aaa8b7c536085f4e4a328a6f49891e00a4662357cd2923cf331c4ae61bb7fb2691d8740dbd75384f1e2d41a3660f79a1122ff2983a7c0c373d6a63a3af9e2c8 cdo-2.0.5.tar.gz diff --git a/scripts/download_cdo.bash b/scripts/download_cdo.bash index aa04be0..d21601c 100755 --- a/scripts/download_cdo.bash +++ b/scripts/download_cdo.bash @@ -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 diff --git a/xgboost b/xgboost new file mode 160000 index 0000000..f75c007 --- /dev/null +++ b/xgboost @@ -0,0 +1 @@ +Subproject commit f75c007f27ae2a3b0f8b4db7930a2179431ea55f