From 3caffb4cda40a119138a089495c6a289d9c59a83 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Mon, 29 Apr 2024 09:53:38 -0600 Subject: [PATCH] Feature 2753 comp script config (#2868) * set dynamic library file extension to .dylib if running on MacOS and .so otherwise * Added disabling of jasper documentation for compiliation on Hera * Updated * remove extra export of compiler env vars * include full path to log file so it is easier to file the log file to examine when a command fails * send cmake output to a log file * remove redundant semi-colon * use full path to log file so it is easier to examine on failure * use run_cmd to catch if rm command fails * Modifications for compilation on hera, gaea, and orion * Updating * fixed variable name * clean up if/else statements * set TIFF_LIBRARY_RELEASE argument to use full path to dynamic library file to prevent failure installing proj library * set LDFLAGS so that LDFLAGS value set in the user's environment will also be used * Updated based on gaea, orion, and hera installs * Updated * change extension of dynamic library files only if architecture is arm64 because older Macs still use .so * added netcdf library to args to prevent error installing NetCDF-CXX when PROJ has been installed in the same run of the script -- PATH is set in the COMPILE_PROJ if block that causes this flag from being added automatically * clean up how rpath and -L are added to LDFLAGS so that each entry is separate -- prevents errors installing on Mac arm64 because multiple rpath values aren't read using :. Also use MET_PROJLIB * Updated * removed -ltiff from MET libs * only add path to rpath and -L arguments if they are not already included in LDFLAGS * changed from using LIB_TIFF (full path to tiff lib file) to use TIFF_LIB_DIR (dir containing tiff lib file). Added TIFF_INCLUDE_DIR to proj compilation and -DJAS_ENABLE_DOC to jasper compliation taken from @jprestop branch * update comments * ensure all MET_* and MET_*LIB variables are added to the rpath for consistency * remove unnecessary if block and only export LDFLAGS at the end of setting locally * Updated * Added section for adding /lib64 and rearranged placement of ADDTL_DIR * Commenting out the running of the Jasper lib tests * Updating and/or removing files * Updating and/or removing files * Latest udpates which include the addition of the tiff library for proj * Remove commented out line. Co-authored-by: John Halley Gotway * Make indentation consistent. Co-authored-by: John Halley Gotway * Make indentation consistent. Co-authored-by: John Halley Gotway * Make indentation consistent. Co-authored-by: John Halley Gotway * Per 2753, added -lm to configure_lib_args for NetCDF-CXX * Per #2753 updating acorn files * Per #2753, update wcoss2 files * Per #2753, updating acorn file to include MET_PYTHON_EXE * Per #2753, updated files for 12.0.0 for derecho * Per #2753, updated derecho file adding MET_PYTHON_EXE and made corrections * Updating config files * Updating orion files * Updates for gaea's files * Updating gaea modulefile * Removing modulefile for cheyenne * Added MET_PYTHON_EXE * Added MET_PYTHON_EXE to hera too * Adding file for hercules * Removing equals sign from setenv * Adding file for hercules * Updated script to add libjpeg installation for grib2c * Per #2753, Adding file for casper --------- Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: John Halley Gotway --- .../scripts/installation/compile_MET_all.sh | 26 ++++++++- ...env.acorn_py3.10 => install_met_env.acorn} | 0 .../config/install_met_env.casper | 54 +++++++++++-------- .../config/install_met_env.derecho | 30 ++++++----- .../installation/config/install_met_env.gaea | 19 +++---- .../installation/config/install_met_env.hera | 4 +- .../config/install_met_env.hercules | 39 ++++++++++++++ .../installation/config/install_met_env.jet | 8 +-- .../installation/config/install_met_env.orion | 18 +++---- ...v.wcoss2_py3.10 => install_met_env.wcoss2} | 4 +- .../installation/modulefiles/11.1.0_cheyenne | 29 ---------- .../installation/modulefiles/12.0.0_acorn | 4 ++ .../installation/modulefiles/12.0.0_casper | 24 +++++++++ .../installation/modulefiles/12.0.0_derecho | 22 ++++++++ .../installation/modulefiles/12.0.0_gaea | 4 +- .../installation/modulefiles/12.0.0_hera | 2 + .../installation/modulefiles/12.0.0_hercules | 20 +++++++ .../installation/modulefiles/12.0.0_jet | 2 + .../installation/modulefiles/12.0.0_orion | 7 +-- 19 files changed, 222 insertions(+), 94 deletions(-) rename internal/scripts/installation/config/{install_met_env.acorn_py3.10 => install_met_env.acorn} (100%) create mode 100644 internal/scripts/installation/config/install_met_env.hercules rename internal/scripts/installation/config/{install_met_env.wcoss2_py3.10 => install_met_env.wcoss2} (98%) delete mode 100644 internal/scripts/installation/modulefiles/11.1.0_cheyenne create mode 100644 internal/scripts/installation/modulefiles/12.0.0_casper create mode 100644 internal/scripts/installation/modulefiles/12.0.0_derecho create mode 100644 internal/scripts/installation/modulefiles/12.0.0_hercules diff --git a/internal/scripts/installation/compile_MET_all.sh b/internal/scripts/installation/compile_MET_all.sh index 98d9fca899..6524aa8563 100755 --- a/internal/scripts/installation/compile_MET_all.sh +++ b/internal/scripts/installation/compile_MET_all.sh @@ -37,7 +37,7 @@ # The compile_MET_all.sh script will compile and install MET and its # external library dependencies, if needed, including: # PROJ (with dependency SQLITE >= 3.11), GSL, BUFRLIB, -# GRIB2C (with dependencies Z, PNG, JASPER), HDF5, NETCDF (C and CXX), +# GRIB2C (with dependencies Z, PNG, JASPER, JPEG), HDF5, NETCDF (C and CXX), # HDF4 (optional for MODIS-Regrid and lidar2nc), HDFEOS (optional for # MODIS-Regrid and lidar2nc), FREETYPE (optional for MODE Graphics), # and CAIRO (optional for MODE Graphics). @@ -51,7 +51,7 @@ # in the input environment configuration file (install_met_env.: # MET_GRIB2CLIB, MET_GRIB2CINC, GRIB2CLIB_NAME, MET_BUFRLIB, BUFRLIB_NAME, # MET_HDF5, MET_NETCDF, MET_PROJ, MET_GSL, LIB_JASPER, LIB_LIBPNG, LIB_Z, -# SQLITE_INCLUDE_DIR, SQLITE_LIB_DIR, TIFF_INCLUDE_DIR, TIFF_LIB_DIR. +# LIB_JPEG, SQLITE_INCLUDE_DIR, SQLITE_LIB_DIR, TIFF_INCLUDE_DIR, TIFF_LIB_DIR. # # The optional libraries ecKit and atlas offer support for unstructured # grids. The optional libraries HDF4, HDFEOS, FREETYPE, and CAIRO are @@ -176,11 +176,13 @@ if [[ -z ${MET_GRIB2CLIB} ]] && [[ -z ${MET_GRIB2C} ]]; then COMPILE_ZLIB=1 COMPILE_LIBPNG=1 COMPILE_JASPER=1 + COMPILE_JPEG=1 COMPILE_G2CLIB=1 else COMPILE_ZLIB=0 COMPILE_LIBPNG=0 COMPILE_JASPER=0 + COMPILE_JPEG=0 COMPILE_G2CLIB=0 fi @@ -269,6 +271,7 @@ if [ ! -z "${SKIP_LIBS}" ]; then COMPILE_ZLIB=0 COMPILE_LIBPNG=0 COMPILE_JASPER=0 + COMPILE_JPEG=0 COMPILE_G2CLIB=0 COMPILE_ECKIT=0 COMPILE_ATLAS=0 @@ -570,6 +573,7 @@ if [[ $COMPILE_LIBPNG -eq 1 && $HOST != ys* ]]; then run_cmd "make ${MAKE_ARGS} install > $(pwd)/libpng.make_install.log 2>&1" fi + # Compile JASPER if [ $COMPILE_JASPER -eq 1 ]; then @@ -594,6 +598,24 @@ if [ $COMPILE_JASPER -eq 1 ]; then run_cmd "make ${MAKE_ARGS} install > $(pwd)/jasper.make_install.log 2>&1" fi +# Compile JPEG +if [ $COMPILE_JPEG -eq 1 ]; then + + vrs="9e" + + echo + echo "Compiling JPEG at `date`" + mkdir -p ${LIB_DIR}/jpeg + rm -rf ${LIB_DIR}/jpeg/jpeg* + tar -xf ${TAR_DIR}/jpegsrc.v${vrs}.tar.gz -C ${LIB_DIR}/jpeg + cd ${LIB_DIR}/jpeg/jpeg-${vrs} + echo "cd `pwd`" + run_cmd "./configure --prefix=${LIB_DIR} LDFLAGS=-L${LIB_DIR}/lib CPPFLAGS=-I${LIB_DIR}/include > $(pwd)/libjpeg.configure.log 2>&1" + run_cmd "make ${MAKE_ARGS} > $(pwd)/libjpeg.make.log 2>&1" + run_cmd "make ${MAKE_ARGS} install > $(pwd)/libjpeg.make_install.log 2>&1" +fi + + # Compile G2CLIB if [ $COMPILE_G2CLIB -eq 1 ]; then diff --git a/internal/scripts/installation/config/install_met_env.acorn_py3.10 b/internal/scripts/installation/config/install_met_env.acorn similarity index 100% rename from internal/scripts/installation/config/install_met_env.acorn_py3.10 rename to internal/scripts/installation/config/install_met_env.acorn diff --git a/internal/scripts/installation/config/install_met_env.casper b/internal/scripts/installation/config/install_met_env.casper index c9e9f06a91..703be5e531 100644 --- a/internal/scripts/installation/config/install_met_env.casper +++ b/internal/scripts/installation/config/install_met_env.casper @@ -1,30 +1,40 @@ -module load ncarenv/1.3 -module load intel/2021.2 -module load netcdf/4.8.0 +module load ncarenv/23.10 +module load intel-classic/2023.2.1 +module load cmake/3.26.3 -export TEST_BASE=/glade/p/ral/jntp/MET/MET_releases/casper/11.1.0 -export COMPILER=intel_2021.2 +export TEST_BASE=/glade/work/dtcrt/METplus/casper/components/MET/installations/12.0.0 +export COMPILER=intel-classic_2023.2.1 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=v11.1.0.tar.gz +export MET_TARBALL=v12.0.0.tar.gz export USE_MODULES=TRUE -export MET_PYTHON=/glade/p/ral/jntp/MET/METplus/miniconda/miniconda3/envs/metplus_v5.1_py3.10 +export MET_PYTHON=/glade/work/dtcrt/METplus/casper/miniconda/miniconda3/envs/metplus_v5.1_py3.10 export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.10 export MET_PYTHON_LD=`${MET_PYTHON}/bin/python3-config --ldflags --embed` -export MET_NETCDF=/glade/u/apps/ch/opt/netcdf/4.8.0/intel/2021.2/ -export MET_HDF5=/glade/u/apps/ch/opt/netcdf/4.8.0/intel/2021.2/ +#export ADDTL_DIR=/usr/lib64 export EXTERNAL_LIBS=${TEST_BASE}/external_libs -#export MET_GSL=${EXTERNAL_LIBS} -#export MET_BUFRLIB=${EXTERNAL_LIBS} -#export BUFRLIB_NAME=-lbufr -#export MET_HDF5=${EXTERNAL_LIBS} -#export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib -#export MET_GRIB2CINC=${EXTERNAL_LIBS}/include -#export GRIB2CLIB_NAME=-lgrib2c -#export LIB_JASPER=${EXTERNAL_LIBS}/lib -#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib -#export LIB_Z=${EXTERNAL_LIBS}/lib -export SET_D64BIT=FALSE +#export COMPILE_ECKIT=1 +#export COMPILE_ATLAS=1 +export MET_PROJ=${EXTERNAL_LIBS} +export MET_ECKIT=${EXTERNAL_LIBS} +export MET_ATLAS=${EXTERNAL_LIBS} +export MET_GSL=${EXTERNAL_LIBS} +export MET_BUFRLIB=${EXTERNAL_LIBS} +export BUFRLIB_NAME=-lbufr_4 +export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib64 +export MET_GRIB2CINC=${EXTERNAL_LIBS}/include +export GRIB2CLIB_NAME=-lg2c +export LIB_JASPER=${EXTERNAL_LIBS}/lib64 +export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +export LIB_Z=${EXTERNAL_LIBS}/lib +export LIB_JPEG=${EXTERNAL_LIBS}/lib +export MET_NETCDF=${EXTERNAL_LIBS} +export MET_HDF5=${EXTERNAL_LIBS} +export TIFF_INCLUDE_DIR=${EXTERNAL_LIBS}/include +export TIFF_LIB_DIR=${EXTERNAL_LIBS}/lib +export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib +export MAKE_ARGS="-j 5" #export CFLAGS="-Wall -g" #export CXXFLAGS="-Wall -g" -export MAKE_ARGS=-j -export CXXFLAGS="-std=c++11" +#export CXXFLAGS="-std=c++11" +#export SKIP_MET=true diff --git a/internal/scripts/installation/config/install_met_env.derecho b/internal/scripts/installation/config/install_met_env.derecho index 5ad11f3eb7..eb02198760 100644 --- a/internal/scripts/installation/config/install_met_env.derecho +++ b/internal/scripts/installation/config/install_met_env.derecho @@ -1,36 +1,42 @@ -module load ncarenv/23.06 -module load intel-oneapi/2023.0.0 +module load ncarenv/23.09 +module load intel/2023.2.1 module load cmake/3.26.3 -module load hdf5/1.12.2 -module load netcdf/4.9.2 -export TEST_BASE=/glade/p/ral/jntp/MET/MET_releases/12.0.0 -export COMPILER=intel-oneapi_2023.0.0 +export CC=icx +export CXX=icpx +export FC=ifx +export F77=ifx +export F90=ifx + +export TEST_BASE=/glade/work/dtcrt/METplus/derecho/components/MET/installations/12.0.0 +export COMPILER=intel_2023.2.1 export MET_SUBDIR=${TEST_BASE} export MET_TARBALL=v12.0.0.tar.gz export USE_MODULES=TRUE -export MET_PYTHON=/glade/p/ral/jntp/MET/METplus/miniconda/miniconda3/envs/metplus_v5.1_py3.10 +export MET_PYTHON=/glade/work/dtcrt/METplus/derecho/miniconda/miniconda3/envs/metplus_v5.1_py3.10 export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.10 export MET_PYTHON_LD=`${MET_PYTHON}/bin/python3-config --ldflags --embed` -export MET_NETCDF=/glade/u/apps/derecho/23.06/spack/opt/spack/netcdf/4.9.2/oneapi/2023.0.0/iijr -export MET_HDF5=/glade/u/apps/derecho/23.06/spack/opt/spack/hdf5/1.12.2/oneapi/2023.0.0/d6xa -export ADDTL_DIR=/usr/lib64 export EXTERNAL_LIBS=${TEST_BASE}/external_libs -#export MET_PROJ=${EXTERNAL_LIBS} -#export LIB_TIFF=${ADDTL_DIR}/libtiff.so.5 export COMPILE_ECKIT=1 export COMPILE_ATLAS=1 +#export MET_PROJ=${EXTERNAL_LIBS} #export MET_ECKIT=${EXTERNAL_LIBS} #export MET_ATLAS=${EXTERNAL_LIBS} #export MET_GSL=${EXTERNAL_LIBS} #export MET_BUFRLIB=${EXTERNAL_LIBS} #export BUFRLIB_NAME=-lbufr_4 +#export MET_NETCDF=${EXTERNAL_LIBS} +#export MET_HDF5=${EXTERNAL_LIBS} #export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib64 #export MET_GRIB2CINC=${EXTERNAL_LIBS}/include #export GRIB2CLIB_NAME=-lg2c #export LIB_JASPER=${EXTERNAL_LIBS}/lib64 #export LIB_LIBPNG=${EXTERNAL_LIBS}/lib #export LIB_Z=${EXTERNAL_LIBS}/lib +#export TIFF_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export TIFF_LIB_DIR=${EXTERNAL_LIBS}/lib +#export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib export MAKE_ARGS=-j #export CFLAGS="-Wall -g" #export CXXFLAGS="-Wall -g" diff --git a/internal/scripts/installation/config/install_met_env.gaea b/internal/scripts/installation/config/install_met_env.gaea index 78052504da..8a60c93f84 100644 --- a/internal/scripts/installation/config/install_met_env.gaea +++ b/internal/scripts/installation/config/install_met_env.gaea @@ -5,21 +5,18 @@ export F77=ifx export F90=ifx export CC=icx export CXX=icpx -export TEST_BASE=/usw/met/12.0.0-beta2 +export TEST_BASE=/usw/met/12.0.0 export COMPILER=intel-oneapi_2022.0.2 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=v12.0.0-beta2.tar.gz +export MET_TARBALL=v12.0.0.tar.gz export USE_MODULES=TRUE -export MET_PYTHON=/lustre/f2/dev/esrl/Julie.Prestopnik/projects/miniconda/miniconda3/envs/metplus_v5.1_py3.10/ +export MET_PYTHON=/gpfs/f5/esrl/proj-shared/Julie.Prestopnik/projects/miniconda/miniconda3/envs/metplus_v5.1_py3.10/ export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.10 export MET_PYTHON_LD=-L${MET_PYTHON}/lib/python3.10/config-3.10-x86_64-linux-gnu\ -L${MET_PYTHON}/lib\ -lpython3.10\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lm -export ADDTL_DIR=/usr/lib64 -#export TIFF_INCLUDE_DIR=/lustre/f2/dev/esrl/Julie.Prestopnik/projects/miniconda/miniconda3/pkgs/libtiff-4.4.0-h82bc61c_5/include -#export LIB_TIFF=${ADDTL_DIR}/libtiff.so.5 -#export EXTERNAL_LIBS=/usw/met/12.0.0-beta2/external_libs +export EXTERNAL_LIBS=${TEST_BASE}/external_libs +COMPILE_ATLAS=1 +COMPILE_ECKIT=1 #export MET_PROJ=${EXTERNAL_LIBS} -#COMPILE_ATLAS=1 -#COMPILE_ECKIT=1 #export MET_ATLAS=${EXTERNAL_LIBS} #export MET_ECKIT=${EXTERNAL_LIBS} #export MET_GSL=${EXTERNAL_LIBS} @@ -33,5 +30,9 @@ export ADDTL_DIR=/usr/lib64 #export LIB_JASPER=${EXTERNAL_LIBS}/lib #export LIB_LIBPNG=${EXTERNAL_LIBS}/lib #export LIB_Z=${EXTERNAL_LIBS}/lib +#export TIFF_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export TIFF_LIB_DIR=${EXTERNAL_LIBS}/lib +#export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib export MAKE_ARGS="-j 5" diff --git a/internal/scripts/installation/config/install_met_env.hera b/internal/scripts/installation/config/install_met_env.hera index cddaa00f90..2b0b054190 100755 --- a/internal/scripts/installation/config/install_met_env.hera +++ b/internal/scripts/installation/config/install_met_env.hera @@ -1,6 +1,6 @@ module load gnu/9.2.0 module load intel/2022.1.2 -module load cmake/3.26.4 +module load cmake/3.28.1 export FC=ifort export F77=ifort @@ -34,6 +34,8 @@ export COMPILE_ATLAS=1 #export LIB_JASPER=${EXTERNAL_LIBS}/lib #export LIB_LIBPNG=${EXTERNAL_LIBS}/lib #export LIB_Z=${EXTERNAL_LIBS}/lib +#export TIFF_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export TIFF_LIB_DIR=${EXTERNAL_LIBS}/lib #export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include #export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib export MAKE_ARGS="-j 5" diff --git a/internal/scripts/installation/config/install_met_env.hercules b/internal/scripts/installation/config/install_met_env.hercules new file mode 100644 index 0000000000..dffb8fe186 --- /dev/null +++ b/internal/scripts/installation/config/install_met_env.hercules @@ -0,0 +1,39 @@ +module load intel-oneapi-compilers/2022.2.1 +module load cmake/3.26.3 + +export CC=icx +export CXX=icpx +export FC=ifx +export F77=ifx +export F90=ifx + +export TEST_BASE=/apps/contrib/MET/12.0.0-beta3 +export COMPILER=intel-oneapi-compilers_2022.2.1 +export MET_SUBDIR=${TEST_BASE}/ +export MET_TARBALL=v12.0.0-beta3.tar.gz +export USE_MODULES=TRUE +export MET_PYTHON=/work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.1_py3.10 +export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.10 +export MET_PYTHON_LD=-L${MET_PYTHON}/lib/python3.10/config-3.10-x86_64-linux-gnu\ -L${MET_PYTHON}/lib\ -lpython3.10\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -lm +export EXTERNAL_LIBS=${TEST_BASE}/external_libs +COMPILE_ATLAS=1 +COMPILE_ECKIT=1 +#export MET_PROJ=${EXTERNAL_LIBS} +#export MET_ATLAS=${EXTERNAL_LIBS} +#export MET_ECKIT=${EXTERNAL_LIBS} +#export MET_GSL=${EXTERNAL_LIBS} +#export MET_BUFRLIB=${EXTERNAL_LIBS} +#export BUFRLIB_NAME=-lbufr_4 +#export MET_HDF5=${EXTERNAL_LIBS} +#export MET_NETCDF=${EXTERNAL_LIBS} +#export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib +#export MET_GRIB2CINC=${EXTERNAL_LIBS}/include +#export GRIB2CLIB_NAME=-lg2c +#export LIB_JASPER=${EXTERNAL_LIBS}/lib +#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +#export LIB_Z=${EXTERNAL_LIBS}/lib +#export TIFF_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export TIFF_LIB_DIR=${EXTERNAL_LIBS}/lib +#export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib +export MAKE_ARGS="-j 5" diff --git a/internal/scripts/installation/config/install_met_env.jet b/internal/scripts/installation/config/install_met_env.jet index b3be597853..15b5563ac2 100644 --- a/internal/scripts/installation/config/install_met_env.jet +++ b/internal/scripts/installation/config/install_met_env.jet @@ -1,5 +1,5 @@ module load intel/2022.1.2 -module load cmake/3.26.4 +module load cmake/3.28.1 export FC=ifort export F77=ifort @@ -14,13 +14,11 @@ export USE_MODULES=TRUE export MET_PYTHON=/mnt/lfs1/HFIP/dtc-hurr/METplus/miniconda/miniconda3/envs/metplus_v5.1_py3.10 export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.10 export MET_PYTHON_LD=-L${MET_PYTHON}/lib/python3.10/config-3.10-x86_64-linux-gnu\ -L${MET_PYTHON}/lib\ -lpython3.10\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -lm -export ADDTL_DIR=/usr/lib64 +#export ADDTL_DIR=/usr/lib64 export EXTERNAL_LIBS=${TEST_BASE}/external_libs/ COMPILE_ATLAS=1 COMPILE_ECKIT=1 #export MET_PROJ=${EXTERNAL_LIBS} -export TIFF_INCLUDE_DIR=/usr/include -export TIFF_LIB_DIR=/usr/lib64 #export MET_ATLAS=${EXTERNAL_LIBS} #export MET_ECKIT=${EXTERNAL_LIBS} #export MET_GSL=${EXTERNAL_LIBS} @@ -34,6 +32,8 @@ export TIFF_LIB_DIR=/usr/lib64 #export LIB_JASPER=${EXTERNAL_LIBS}/lib #export LIB_LIBPNG=${EXTERNAL_LIBS}/lib #export LIB_Z=${EXTERNAL_LIBS}/lib +#export TIFF_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export TIFF_LIB_DIR=${EXTERNAL_LIBS}/lib #export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include #export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib export MAKE_ARGS="-j 5" diff --git a/internal/scripts/installation/config/install_met_env.orion b/internal/scripts/installation/config/install_met_env.orion index b951ee41f5..7ba320fe03 100644 --- a/internal/scripts/installation/config/install_met_env.orion +++ b/internal/scripts/installation/config/install_met_env.orion @@ -1,23 +1,19 @@ module load intel/2020.2 module load cmake/3.22.1 -export TEST_BASE=/apps/contrib/MET/12.0.0-beta2 +export TEST_BASE=/apps/contrib/MET/12.0.0 export COMPILER=intel_2020 export MET_SUBDIR=${TEST_BASE}/ -export MET_TARBALL=v12.0.0-beta2.tar.gz +export MET_TARBALL=v12.0.0.tar.gz export USE_MODULES=TRUE export MET_PYTHON=/work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.1_py3.10 export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.10 export MET_PYTHON_LD=-L${MET_PYTHON}/lib/python3.10/config-3.10-x86_64-linux-gnu\ -L${MET_PYTHON}/lib\ -lpython3.10\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -lm -export ADDTL_DIR=/usr/lib64 -#export TIFF_INCLUDE_DIR=${ADDTL_DIR} -#export LIB_TIFF=${ADDTL_DIR}/libtiff.so.5 +#export ADDTL_DIR=/usr/lib64 export EXTERNAL_LIBS=${TEST_BASE}/external_libs -#export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include -#export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib +COMPILE_ATLAS=1 +COMPILE_ECKIT=1 #export MET_PROJ=${EXTERNAL_LIBS} -#COMPILE_ATLAS=1 -#COMPILE_ECKIT=1 #export MET_ATLAS=${EXTERNAL_LIBS} #export MET_ECKIT=${EXTERNAL_LIBS} #export MET_GSL=${EXTERNAL_LIBS} @@ -31,4 +27,8 @@ export EXTERNAL_LIBS=${TEST_BASE}/external_libs #export LIB_JASPER=${EXTERNAL_LIBS}/lib #export LIB_LIBPNG=${EXTERNAL_LIBS}/lib #export LIB_Z=${EXTERNAL_LIBS}/lib +#export TIFF_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export TIFF_LIB_DIR=${EXTERNAL_LIBS}/lib +#export SQLITE_INCLUDE_DIR=${EXTERNAL_LIBS}/include +#export SQLITE_LIB_DIR=${EXTERNAL_LIBS}/lib export MAKE_ARGS="-j 5" diff --git a/internal/scripts/installation/config/install_met_env.wcoss2_py3.10 b/internal/scripts/installation/config/install_met_env.wcoss2 similarity index 98% rename from internal/scripts/installation/config/install_met_env.wcoss2_py3.10 rename to internal/scripts/installation/config/install_met_env.wcoss2 index f2f29e57df..86b73e0064 100644 --- a/internal/scripts/installation/config/install_met_env.wcoss2_py3.10 +++ b/internal/scripts/installation/config/install_met_env.wcoss2 @@ -21,13 +21,13 @@ export F77=ifort export F90=ifort export CC=icc export CXX=icpc -#export TEST_BASE=/apps/ops/para/libs/intel/19.1.3.304/met/12.0.0-beta1 +#export TEST_BASE=/apps/ops/para/libs/intel/19.1.3.304/met/12.0.0-beta3 export TEST_BASE=$(pwd) export LIB_DIR=${TEST_BASE}/external_libs export BIN_DIR_PATH=${TEST_BASE}/bin export COMPILER=intel_19.1.3.304 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=v12.0.0-beta1.tar.gz +export MET_TARBALL=v12.0.0-beta3.tar.gz export USE_MODULES=TRUE export ADDTL_DIR=/apps/spack/gettext/0.21/intel/19.1.3.304/at2kdo4edvuhyzrt5g6zhwrdb7bdui4s/lib64 export PYTHON_MODULE=python_3.10.4 diff --git a/internal/scripts/installation/modulefiles/11.1.0_cheyenne b/internal/scripts/installation/modulefiles/11.1.0_cheyenne deleted file mode 100644 index 70032e4f5d..0000000000 --- a/internal/scripts/installation/modulefiles/11.1.0_cheyenne +++ /dev/null @@ -1,29 +0,0 @@ -#%Module###################################################################### -## -## Model Evaluation Tools -## -proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v11.1.0 - *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" -} - -# If they exist, remove ncdump and ncgen from /glade/p/ral/jntp/MET/MET_releases/11.1.0/external_libs/bin - -# The intel compiler is required to run MET -module load ncarenv/1.3 -module load intel/2021.2 -module load netcdf/4.8.0 - -set base /glade/p/ral/jntp/MET/MET_releases/11.1.0 -set ver 11.1.0 -set share $base/share/met - -prepend-path PATH $base/bin:/glade/p/ral/jntp/MET/MET_releases/11.1.0/external_libs/bin:/glade/p/ral/jntp/MET/METplus/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin - -setenv METversion V$ver - -# setenv MET_BUFRLIB /glade/p/ral/jntp/MET/MET_releases/11.1.0/external_libs/libs -# setenv MET_GRIB2C /glade/p/ral/jntp/MET/MET_releases/11.1.0/external_libs -# setenv MET_GSL /glade/p/ral/jntp/MET/MET_releases/11.1.0/external_libs - - diff --git a/internal/scripts/installation/modulefiles/12.0.0_acorn b/internal/scripts/installation/modulefiles/12.0.0_acorn index c97f4e92ed..5d7a98dcd7 100644 --- a/internal/scripts/installation/modulefiles/12.0.0_acorn +++ b/internal/scripts/installation/modulefiles/12.0.0_acorn @@ -22,6 +22,9 @@ module load libpng/1.6.37 module load gsl/2.7 module load g2c/1.6.4 module load proj/7.1.0 +module use /apps/dev/lmodules/intel/19.1.3.304/ +module load atlas/0.30.0 +module load eckit/1.20.2 set base /apps/sw_review/emc/MET/12.0.0 set ver 12.0.0 @@ -32,3 +35,4 @@ prepend-path PATH $base/bin setenv METversion V$ver setenv MET_ROOT $base +setenv MET_PYTHON_EXE /apps/dev/ve/evs/2.0/bin/python \ No newline at end of file diff --git a/internal/scripts/installation/modulefiles/12.0.0_casper b/internal/scripts/installation/modulefiles/12.0.0_casper new file mode 100644 index 0000000000..1c270efb3e --- /dev/null +++ b/internal/scripts/installation/modulefiles/12.0.0_casper @@ -0,0 +1,24 @@ +#%Module###################################################################### +## +## Model Evaluation Tools +## +proc ModulesHelp { } { + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v12.0.0 + *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" +} + + +# The intel compiler is required to run MET + +module load ncarenv/23.10 +module load intel-classic/2023.2.1 + +set base /glade/work/dtcrt/METplus/casper/components/MET/installations/12.0.0 +set ver 12.0.0 +set share $base/share/met + +prepend-path PATH $base/bin:/glade/work/dtcrt/METplus/casper/components/MET/installations/12.0.0/external_libs/bin:/glade/work/dtcrt/METplus/casper/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin + +setenv METversion V$ver + + diff --git a/internal/scripts/installation/modulefiles/12.0.0_derecho b/internal/scripts/installation/modulefiles/12.0.0_derecho new file mode 100644 index 0000000000..bfbe555e99 --- /dev/null +++ b/internal/scripts/installation/modulefiles/12.0.0_derecho @@ -0,0 +1,22 @@ +#%Module###################################################################### +## +## Model Evaluation Tools +## +proc ModulesHelp { } { + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v12.0.0 + *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" +} + +# The intel compiler is required to run MET + +module load ncarenv/23.09 +module load intel/2023.2.1 + +set base /glade/work/dtcrt/METplus/derecho/components/MET/installations/12.0.0 +set ver 12.0.0 +set share $base/share/met + +prepend-path PATH $base/bin:/glade/work/dtcrt/METplus/derecho/components/MET/installations/12.0.0/external_libs/bin:/glade/work/dtcrt/METplus/derecho/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin + +setenv METversion V$ver +setenv MET_PYTHON_EXE /glade/work/dtcrt/METplus/derecho/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin/python3 diff --git a/internal/scripts/installation/modulefiles/12.0.0_gaea b/internal/scripts/installation/modulefiles/12.0.0_gaea index 1ce4cd13c3..00b4625114 100644 --- a/internal/scripts/installation/modulefiles/12.0.0_gaea +++ b/internal/scripts/installation/modulefiles/12.0.0_gaea @@ -14,4 +14,6 @@ set ver 12.0.0 set share $base/$ver/share/met set lib_base $base/12.0.0 -prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin:/lustre/f2/dev/esrl/Julie.Prestopnik/projects/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin +prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin:/gpfs/f5/esrl/proj-shared/Julie.Prestopnik/projects/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin + +setenv MET_PYTHON_EXE /gpfs/f5/esrl/proj-shared/Julie.Prestopnik/projects/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin/python \ No newline at end of file diff --git a/internal/scripts/installation/modulefiles/12.0.0_hera b/internal/scripts/installation/modulefiles/12.0.0_hera index 2548513892..a97925d7e2 100644 --- a/internal/scripts/installation/modulefiles/12.0.0_hera +++ b/internal/scripts/installation/modulefiles/12.0.0_hera @@ -19,6 +19,8 @@ setenv MET_ROOT $base/$ver prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin:/scratch1/BMC/dtc/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin +setenv MET_PYTHON_EXE /scratch1/BMC/dtc/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin/python + #setenv METversion $ver #setenv MET_CONFIG $share/config #setenv MET_POLY $share/poly diff --git a/internal/scripts/installation/modulefiles/12.0.0_hercules b/internal/scripts/installation/modulefiles/12.0.0_hercules new file mode 100644 index 0000000000..deec9e17e9 --- /dev/null +++ b/internal/scripts/installation/modulefiles/12.0.0_hercules @@ -0,0 +1,20 @@ +#%Module###################################################################### +## +## Model Evaluation Tools +## +proc ModulesHelp { } { + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v12.0.0 + *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" +} + +prereq intel-oneapi-compilers/2022.2.1 + +set base /apps/contrib/MET +set ver 12.0.0 +set share $base/$ver/share/met +set lib_base $base/12.0.0 +setenv MET_ROOT $base/$ver/MET-12.0.0 + +prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin:/work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin + +setenv MET_PYTHON_EXE /work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin/python diff --git a/internal/scripts/installation/modulefiles/12.0.0_jet b/internal/scripts/installation/modulefiles/12.0.0_jet index 430bd27113..0ab7b873ce 100644 --- a/internal/scripts/installation/modulefiles/12.0.0_jet +++ b/internal/scripts/installation/modulefiles/12.0.0_jet @@ -15,3 +15,5 @@ set share $base/share/met setenv MET_ROOT $base/$ver/MET-12.0.0 prepend-path PATH $base/bin:$base/external_libs/bin:/mnt/lfs1/HFIP/dtc-hurr/METplus/miniconda/miniconda3/envs/metplus_v5.1_py3.10 + +setenv MET_PYTHON_EXE /mnt/lfs1/HFIP/dtc-hurr/METplus/miniconda/miniconda3/envs/metplus_v5.1_py3.10_intel/bin/python \ No newline at end of file diff --git a/internal/scripts/installation/modulefiles/12.0.0_orion b/internal/scripts/installation/modulefiles/12.0.0_orion index ed0dd56805..a78bfe25bb 100644 --- a/internal/scripts/installation/modulefiles/12.0.0_orion +++ b/internal/scripts/installation/modulefiles/12.0.0_orion @@ -10,10 +10,11 @@ proc ModulesHelp { } { prereq intel/2020.2 set base /apps/contrib/MET -set ver 12.0.0-beta2 +set ver 12.0.0 set share $base/$ver/share/met -set lib_base $base/12.0.0-beta2 -setenv MET_ROOT $base/$ver/MET-12.0.0-beta2 +set lib_base $base/12.0.0 +setenv MET_ROOT $base/$ver/MET-12.0.0 prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin:/work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin +setenv MET_PYTHON_EXE /work/noaa/ovp/miniconda/miniconda3/envs/metplus_v5.1_py3.10/bin/python