Skip to content

Commit e7bf109

Browse files
rrsettgastrrsettgast
authored
Cleanup/macros geosx xxx to geos xxx (#324)
* GEOSX_TPL to GEOS_TPL * GEOSX_ to GEOS_ excluding .py and .sub
1 parent 5082ef8 commit e7bf109

8 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎cmake/CMakeBasics.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ blt_append_custom_compiler_flag( FLAGS_VAR CMAKE_CXX_FLAGS_DEBUG
2828
CLANG "-fstandalone-debug"
2929
)
3030

31-
blt_append_custom_compiler_flag(FLAGS_VAR GEOSX_NINJA_FLAGS
31+
blt_append_custom_compiler_flag(FLAGS_VAR GEOS_NINJA_FLAGS
3232
DEFAULT " "
3333
GNU "-fdiagnostics-color=always"
3434
CLANG "-fcolor-diagnostics"
@@ -40,6 +40,6 @@ blt_append_custom_compiler_flag(FLAGS_VAR GEOSX_NINJA_FLAGS
4040
#set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
4141

4242
if( ${CMAKE_MAKE_PROGRAM} STREQUAL "ninja" OR ${CMAKE_MAKE_PROGRAM} MATCHES ".*/ninja$" )
43-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GEOSX_NINJA_FLAGS}")
43+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GEOS_NINJA_FLAGS}")
4444
endif()
4545

‎host-configs/LLNL/lassen-base.cmake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# Set up the tpls
22
include(${CMAKE_CURRENT_LIST_DIR}/llnl-tpls-base.cmake)
33

4-
set(CAMP_DIR ${GEOSX_TPL_DIR}/raja CACHE PATH "")
5-
set(RAJA_DIR ${GEOSX_TPL_DIR}/raja CACHE PATH "")
4+
set(CAMP_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "")
5+
set(RAJA_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "")
66

77
set(ENABLE_UMPIRE ON CACHE BOOL "")
8-
set(UMPIRE_DIR ${GEOSX_TPL_DIR}/chai CACHE PATH "")
8+
set(UMPIRE_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "")
99

1010
set(ENABLE_CHAI ON CACHE BOOL "")
11-
set(CHAI_DIR ${GEOSX_TPL_DIR}/chai CACHE PATH "")
11+
set(CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "")
1212

1313
set(ENABLE_CALIPER ON CACHE BOOL "")
1414
set(ENABLE_ADIAK ON CACHE BOOL "" )
15-
set(CALIPER_DIR ${GEOSX_TPL_DIR}/caliper CACHE PATH "")
15+
set(CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "")
1616

1717
set(ENABLE_ADDR2LINE ON CACHE BOOL "")
1818

‎host-configs/LLNL/llnl-cpu-base.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ set(ENABLE_FORTRAN OFF CACHE BOOL "")
22

33
include(${CMAKE_CURRENT_LIST_DIR}/llnl-tpls-base.cmake)
44

5-
set(CAMP_DIR ${GEOSX_TPL_DIR}/raja CACHE PATH "")
6-
set(RAJA_DIR ${GEOSX_TPL_DIR}/raja CACHE PATH "")
5+
set(CAMP_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "")
6+
set(RAJA_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "")
77

88
set(ENABLE_UMPIRE ON CACHE BOOL "")
9-
set(UMPIRE_DIR ${GEOSX_TPL_DIR}/chai CACHE PATH "")
9+
set(UMPIRE_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "")
1010

1111
set(ENABLE_CHAI ON CACHE BOOL "")
12-
set(CHAI_DIR ${GEOSX_TPL_DIR}/chai CACHE PATH "")
12+
set(CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "")
1313

1414
set(ENABLE_CALIPER ON CACHE BOOL "")
15-
set(CALIPER_DIR ${GEOSX_TPL_DIR}/caliper CACHE PATH "")
15+
set(CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "")
1616

1717
# set(ENABLE_PYLVARRAY ON CACHE BOOL "")
1818
# set(PYTHON_DIR /usr/tce/packages/python/python-3.7.2 CACHE PATH "")
1919

2020
# VPM: Need to be updated!
2121
set(SPHINX_EXECUTABLE /collab/usr/gapps/python/build/spack-toss3.2/opt/spack/linux-rhel7-x86_64/gcc-4.9.3/python-2.7.14-7rci3jkmuht2uiwp433afigveuf4ocnu/bin/sphinx-build CACHE PATH "")
2222

23-
set(DOXYGEN_EXECUTABLE ${GEOSX_TPL_DIR}/doxygen/bin/doxygen CACHE PATH "")
23+
set(DOXYGEN_EXECUTABLE ${GEOS_TPL_DIR}/doxygen/bin/doxygen CACHE PATH "")
2424

2525
set(ENABLE_GTEST_DEATH_TESTS ON CACHE BOOL "")
2626

‎host-configs/LLNL/llnl-tpls-base.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
set(GEOSX_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "")
2-
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/2024-07-16/install-${CONFIG_NAME}-release CACHE PATH "")
1+
set(GEOS_TPL_ROOT_DIR /usr/gapps/GEOSX/thirdPartyLibs CACHE PATH "")
2+
set(GEOS_TPL_DIR ${GEOS_TPL_ROOT_DIR}/2024-07-16/install-${CONFIG_NAME}-release CACHE PATH "")

‎host-configs/LLNL/tioga-cce-15.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ include( ${CMAKE_CURRENT_LIST_DIR}/tioga-base.cmake )
44

55
# Set up the tpls
66
set(TPL_INSTALL_DATE 2023-05-17)
7-
set(GEOSX_TPL_DIR "/usr/WS1/GEOS/GEOSX/TPLs_${TPL_INSTALL_DATE}/install-${CONFIG_NAME}" CACHE PATH "")
7+
set(GEOS_TPL_DIR "/usr/WS1/GEOS/GEOSX/TPLs_${TPL_INSTALL_DATE}/install-${CONFIG_NAME}" CACHE PATH "")
88

9-
set(CAMP_DIR "${GEOSX_TPL_DIR}/camp-main" CACHE PATH "" )
10-
set(RAJA_DIR "${GEOSX_TPL_DIR}/raja-develop" CACHE PATH "" )
9+
set(CAMP_DIR "${GEOS_TPL_DIR}/camp-main" CACHE PATH "" )
10+
set(RAJA_DIR "${GEOS_TPL_DIR}/raja-develop" CACHE PATH "" )
1111

1212
set(ENABLE_UMPIRE TRUE CACHE BOOL "" )
13-
set(UMPIRE_DIR "${GEOSX_TPL_DIR}/umpire-develop" CACHE PATH "" )
13+
set(UMPIRE_DIR "${GEOS_TPL_DIR}/umpire-develop" CACHE PATH "" )
1414

1515
set(ENABLE_CHAI TRUE CACHE BOOL "" )
16-
set(CHAI_DIR "${GEOSX_TPL_DIR}/chai-develop" CACHE PATH "" )
16+
set(CHAI_DIR "${GEOS_TPL_DIR}/chai-develop" CACHE PATH "" )
1717

18-
set(METIS_DIR "${GEOSX_TPL_DIR}/metis-5.1.0" CACHE PATH "" )
19-
set(PARMETIS_DIR "${GEOSX_TPL_DIR}/parmetis-4.0.3" CACHE PATH "" )
18+
set(METIS_DIR "${GEOS_TPL_DIR}/metis-5.1.0" CACHE PATH "" )
19+
set(PARMETIS_DIR "${GEOS_TPL_DIR}/parmetis-4.0.3" CACHE PATH "" )
2020

2121
# C++ options
2222
set(CRAYPE_VERSION "2.7.19")

‎host-configs/ORNL/[email protected]‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set(CONFIG_NAME "[email protected]" CACHE PATH "")
22

33
# Set up the tpls
4-
set(GEOSX_TPL_ROOT_DIR "/ccsopen/proj/gen136/GEOSX/thirdPartyLibs" CACHE PATH "")
5-
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/install-${CONFIG_NAME}-release CACHE PATH "")
4+
set(GEOS_TPL_ROOT_DIR "/ccsopen/proj/gen136/GEOSX/thirdPartyLibs" CACHE PATH "")
5+
set(GEOS_TPL_DIR ${GEOS_TPL_ROOT_DIR}/install-${CONFIG_NAME}-release CACHE PATH "")
66

77
# C++ options
88
set(CMAKE_CXX_COMPILER "/sw/ascent/gcc/8.1.1/bin/g++" CACHE PATH "")

‎host-configs/ORNL/[email protected]‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ set(CCE_VERSION 15.0.0)
44
set(CONFIG_NAME "frontier-cce@${CCE_VERSION}" CACHE PATH "")
55

66
# Set up the tpls
7-
set( GEOSX_TPL_DATE 2023-04-04 )
8-
set( GEOSX_TPL_DIR "/lustre/orion/geo127/world-shared/tpls/${GEOSX_TPL_DATE}/install-${CONFIG_NAME}/" CACHE PATH "")
7+
set( GEOS_TPL_DATE 2023-04-04 )
8+
set( GEOS_TPL_DIR "/lustre/orion/geo127/world-shared/tpls/${GEOS_TPL_DATE}/install-${CONFIG_NAME}/" CACHE PATH "")
99

10-
set(CAMP_DIR "${GEOSX_TPL_DIR}/camp-2022.03.2" CACHE PATH "" )
11-
set(RAJA_DIR "${GEOSX_TPL_DIR}/raja-2022.03.0" CACHE PATH "" )
10+
set(CAMP_DIR "${GEOS_TPL_DIR}/camp-2022.03.2" CACHE PATH "" )
11+
set(RAJA_DIR "${GEOS_TPL_DIR}/raja-2022.03.0" CACHE PATH "" )
1212

1313
set(ENABLE_UMPIRE TRUE CACHE BOOL "" )
14-
set(UMPIRE_DIR "${GEOSX_TPL_DIR}/umpire-2022.03.0" CACHE PATH "" )
14+
set(UMPIRE_DIR "${GEOS_TPL_DIR}/umpire-2022.03.0" CACHE PATH "" )
1515

1616
set(ENABLE_CHAI TRUE CACHE BOOL "" )
17-
set(CHAI_DIR "${GEOSX_TPL_DIR}/chai-2022.03.0" CACHE PATH "" )
17+
set(CHAI_DIR "${GEOS_TPL_DIR}/chai-2022.03.0" CACHE PATH "" )
1818

19-
set(METIS_DIR "${GEOSX_TPL_DIR}/metis-5.1.0" CACHE PATH "" )
20-
set(PARMETIS_DIR "${GEOSX_TPL_DIR}/parmetis-4.0.3" CACHE PATH "" )
19+
set(METIS_DIR "${GEOS_TPL_DIR}/metis-5.1.0" CACHE PATH "" )
20+
set(PARMETIS_DIR "${GEOS_TPL_DIR}/parmetis-4.0.3" CACHE PATH "" )
2121

2222
# C++ options
2323
set(CRAYPE_VERSION "2.7.16")

‎host-configs/corigpu-gcc.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
set(CONFIG_NAME "corigpu-gcc7" CACHE PATH "")
22

33
# Set up the tpls
4-
set(GEOSX_TPL_ROOT_DIR /global/cscratch1/sd/settgast/thirdPartyLibs/ CACHE PATH "")
5-
set(GEOSX_TPL_DIR ${GEOSX_TPL_ROOT_DIR}/install-${CONFIG_NAME}-release CACHE PATH "")
4+
set(GEOS_TPL_ROOT_DIR /global/cscratch1/sd/settgast/thirdPartyLibs/ CACHE PATH "")
5+
set(GEOS_TPL_DIR ${GEOS_TPL_ROOT_DIR}/install-${CONFIG_NAME}-release CACHE PATH "")
66

77
# C++ options
88
set(CMAKE_CXX_COMPILER /opt/gcc/7.3.0/bin/g++ CACHE PATH "")

0 commit comments

Comments
 (0)