Skip to content

Commit

Permalink
Remove explicit disable for the NOX package.
Browse files Browse the repository at this point in the history
Also made changes suggested in
trilinos#11109 (comment)
to fix failing NOX tests. I was able to successfully build and test
the CUDA 11 build with these changes.
  • Loading branch information
srbdev committed Oct 18, 2022
1 parent 3428aa2 commit 2f85732
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions packages/framework/ini-files/config-specs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1622,7 +1622,6 @@ use PACKAGE-ENABLES|PR-FRAMEWORK
[RHEL7_SEMS_CUDA_UVM_OFF_DISABLES]

# Package Disables
opt-set-cmake-var Trilinos_ENABLE_NOX BOOL FORCE : OFF
opt-set-cmake-var Trilinos_ENABLE_PanzerAdaptersSTK BOOL FORCE : OFF
opt-set-cmake-var Trilinos_ENABLE_PanzerMiniEM BOOL FORCE : OFF
opt-set-cmake-var Trilinos_ENABLE_Piro BOOL FORCE : OFF
Expand Down Expand Up @@ -2388,14 +2387,14 @@ opt-set-cmake-var TPL_ENABLE_SuperLUDist BOOL FORCE : OFF
opt-set-cmake-var TPL_ENABLE_Zlib BOOL FORCE : ON

#TPL_*_LIBRARIES
opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lopenblas;-lgfortran;-lgomp
opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : /lib64/libblas.so.3
opt-set-cmake-var TPL_BoostLib_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
opt-set-cmake-var TPL_Boost_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
opt-set-cmake-var TPL_DLlib_LIBRARIES FILEPATH FORCE : "-ldl"
opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.a;${ZLIB_LIB|ENV}/libz.a;-ldl
opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lopenblas;-lgfortran;-lgomp
opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : /lib64/liblapack.so.3
opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so
opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_ROOT|ENV}/lib64;${NETCDF_C_ROOT|ENV}/lib/libnetcdf.a;${PARALLEL_NETCDF_ROOT|ENV}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES|CMAKE}

Expand Down

0 comments on commit 2f85732

Please sign in to comment.