Skip to content

Commit

Permalink
Per #2611, porting over Julie's changes from the feature_2611_oneapi …
Browse files Browse the repository at this point in the history
…branch to this new (limited) feature_2611_oneapi_met-basev3.1 branch. This includes updates to compile_MET_all.sh to compile Atlas/ecKit, updates to the development.docker environment, and the installation settings for derecho.
  • Loading branch information
JohnHalleyGotway committed Nov 14, 2023
1 parent 501bdeb commit 9ec3165
Show file tree
Hide file tree
Showing 4 changed files with 220 additions and 95 deletions.
4 changes: 2 additions & 2 deletions internal/scripts/docker/build_met_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LOG_FILE=/met/logs/MET-${MET_GIT_NAME}_configure.log
echo "Running bootstrap for MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}"
./bootstrap > ${LOG_FILE} 2>&1
echo "Configuring MET ${MET_GIT_NAME} and appending to log file ${LOG_FILE}"
./configure --enable-grib2 --enable-mode_graphics --enable-modis --enable-lidar2nc --enable-python CPPFLAGS="-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/cairo" LIBS="-ltirpc" >> ${LOG_FILE} 2>&1
./configure BUFRLIB_NAME=${BUFRLIB_NAME} GRIB2CLIB_NAME=${GRIB2CLIB_NAME} --enable-grib2 --enable-mode_graphics --enable-modis --enable-lidar2nc --enable-python CPPFLAGS="-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/cairo" LIBS="-ltirpc" >> ${LOG_FILE} 2>&1
if [ $? != 0 ]; then
cat ${LOG_FILE}
exit 1
Expand All @@ -22,7 +22,7 @@ fi

LOG_FILE=/met/logs/MET-${MET_GIT_NAME}_make_install.log
echo "Compiling MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}"
make ${MAKE_ARGS} install > ${LOG_FILE}
make ${MAKE_ARGS} install > ${LOG_FILE} 2>&1
if [ $? != 0 ]; then
cat ${LOG_FILE}
exit 1
Expand Down
7 changes: 6 additions & 1 deletion internal/scripts/environment/development.docker
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export MET_FONT_DIR=${MET_TEST_INPUT}/fonts
export MET_TEST_RSCRIPT=/usr/bin/Rscript

# set make arguments to build using multiple jobs
export MAKE_ARGS=-j
export MAKE_ARGS="-j 5"

export TEST_BASE=/met
export COMPILER=gnu_12.2.0
Expand All @@ -36,10 +36,15 @@ export USE_MODULES=FALSE

export MET_INSTALL_DIR=/usr/local

export COMPILE_ECKIT=1
export COMPILE_ATLAS=1
export COMPILE_HDF=1
export COMPILE_HDFEOS=1
export COMPILE_FREETYPE=1
export COMPILE_CAIRO=1

export SQLITE_INCLUDE_DIR=/usr/include
export SQLITE_LIB_DIR=/usr/lib/x86_64-linux-gnu

export BUFRLIB_NAME="-lbufr_4"
export GRIB2CLIB_NAME="-lg2c"
Loading

0 comments on commit 9ec3165

Please sign in to comment.