Skip to content

Commit

Permalink
Add env var ATDM_CONFIG_USE_SPARC_TPL_FIND_SETTINGS (#3632)
Browse files Browse the repository at this point in the history
This allows you to switch to the EMPIRE way of pulling in the HDF5 and Netcdf
TPLs.  This was added to aid in the debugging of apparent changing of behavior
of SEACAS when using the SPARC way vs. th EMPIRE way of specifiying the HDF5
and Netcdf TPLs (see #3632).
  • Loading branch information
bartlettroscoe committed Oct 30, 2018
1 parent d71b6e0 commit 49d7dad
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
6 changes: 4 additions & 2 deletions cmake/std/atdm/ATDMDevEnvSettings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ IF (NOT "$ENV{ATDM_CONFIG_COMPLETED_ENV_SETUP}" STREQUAL "TRUE")
ENDIF()

ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(ENABLE_SPARC_SETTINGS OFF)
ATDM_SET_ATDM_VAR_FROM_ENV_AND_DEFAULT(USE_SPARC_TPL_FIND_SETTINGS
${ATDM_ENABLE_SPARC_SETTINGS})

ASSERT_DEFINED(ENV{ATDM_CONFIG_JOB_NAME})

Expand Down Expand Up @@ -287,7 +289,7 @@ ATDM_SET_CACHE(CGNS_INCLUDE_DIRS "$ENV{CGNS_ROOT}/include" CACHE FILEPATH)
ATDM_SET_CACHE(CGNS_LIBRARY_DIRS "$ENV{CGNS_ROOT}/lib" CACHE FILEPATH)

# HDF5
IF (ATDM_ENABLE_SPARC_SETTINGS)
IF (ATDM_USE_SPARC_TPL_FIND_SETTINGS)
# SPARC ATDM Trilinos configuration does not actually enable HDF5 TPL!
ATDM_SET_ENABLE(TPL_ENABLE_HDF5 OFF)
ELSE()
Expand All @@ -303,7 +305,7 @@ ENDIF()

# Netcdf
ATDM_SET_ENABLE(TPL_ENABLE_Netcdf ON)
IF (ATDM_ENABLE_SPARC_SETTINGS)
IF (ATDM_USE_SPARC_TPL_FIND_SETTINGS)
# SPARC ATDM Trilinos configuration has SEACAS-customized FindNetCDF.cmake
# module recurrsively find PNetCDF and HDF5 internally!
ATDM_SET_CACHE(HDF5_ROOT "$ENV{HDF5_ROOT}" CACHE FILEPATH)
Expand Down
7 changes: 7 additions & 0 deletions cmake/std/atdm/cee-rhel6/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,13 @@ export ATDM_CONFIG_LAPACK_LIBS=${ATDM_CONFIG_BLAS_LIBS}
# NOTE: HDF5_ROOT and NETCDF_ROOT should already be set in env from above
# module loads!

# Set the direct libs for HDF5 and NetCDF in case we use that option for
# building (see env var ATDM_CONFIG_USE_SPARC_TPL_FIND_SETTINGS).

export ATDM_CONFIG_HDF5_LIBS="-L${HDF5_ROOT}/lib;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl"

export ATDM_CONFIG_NETCDF_LIBS="-L${BOOST_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${NETCDF_ROOT}/lib;-L${SEMS_PNETCDF_ROOT}/lib;-L${HDF5_ROOT}/lib;${BOOST_ROOT}/lib/libboost_program_options.a;${BOOST_ROOT}/lib/libboost_system.a;${NETCDF_ROOT}/lib/libnetcdf.a;${PNETCDF_ROOT}/lib/libpnetcdf.a;${HDF5_ROOT}/lib/libhdf5_hl.a;${HDF5_ROOT}/lib/libhdf5.a;-lz;-ldl;-lcurl"

export ATDM_CONFIG_MPI_PRE_FLAGS="--bind-to;none"

export ATDM_CONFIG_COMPLETED_ENV_SETUP=TRUE

0 comments on commit 49d7dad

Please sign in to comment.