Skip to content

Commit 6f83feb

Browse files
committed
debugging
1 parent 42ed123 commit 6f83feb

File tree

5 files changed

+88
-5
lines changed

5 files changed

+88
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ if( NOT is_submodule )
1919

2020
set( BLT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/cmake/blt CACHE PATH "" )
2121
set( BLT_CXX_STD "c++17" CACHE STRING "Version of C++ standard" FORCE )
22+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
23+
set(CMAKE_CUDA_STANDARD_REQUIRED ON)
24+
2225
set( ENABLE_WARNINGS_AS_ERRORS "ON" CACHE PATH "" )
2326

2427
option( HPCREACT_ENABLE_UNIT_TESTS "Builds tests" ON )
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
#################################################################################
2+
# Generated host-config - Edit at own risk!
3+
#################################################################################
4+
#--------------------------------------------------------------------------------
5+
# SYS_TYPE: toss_4_x86_64_ib
6+
# Compiler Spec: gcc@=13.3.1
7+
# CMake executable path: /usr/tce/backend/installations/linux-rhel8-x86_64/gcc-10.3.1/cmake-3.26.3-nz532rvfpaf5lf74zxmplgiobuhol7lu/bin/cmake
8+
#--------------------------------------------------------------------------------
9+
10+
#--------------------------------------------------------------------------------
11+
# Compilers
12+
#--------------------------------------------------------------------------------
13+
14+
set(CMAKE_C_COMPILER "/usr/tce/packages/clang-tce/clang-19.1.3/bin/clang" CACHE PATH "")
15+
16+
set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang-tce/clang-19.1.3/bin/clang++" CACHE PATH "")
17+
18+
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "")
19+
20+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG" CACHE STRING "")
21+
22+
set(CMAKE_CXX_FLAGS_DEBUG "-g" CACHE STRING "")
23+
24+
#--------------------------------------------------------------------------------
25+
# CMake Standard
26+
#--------------------------------------------------------------------------------
27+
28+
set(BLT_CXX_STD "c++17" CACHE STRING "")
29+
30+
31+
#--------------------------------------------------------------------------------
32+
# Cuda
33+
#--------------------------------------------------------------------------------
34+
35+
set(ENABLE_CUDA ON CACHE BOOL "")
36+
37+
set(CMAKE_CUDA_STANDARD "17" CACHE PATH "")
38+
39+
set(CUDA_TOOLKIT_ROOT_DIR "/usr/tce/packages/cuda/cuda-12.9.1" CACHE PATH "")
40+
41+
set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc" CACHE PATH "")
42+
43+
set(CMAKE_CUDA_ARCHITECTURES "90" CACHE STRING "")
44+
45+
set(CMAKE_CUDA_FLAGS "-restrict --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations -arch sm_90" CACHE STRING "")
46+
47+
set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-g -lineinfo ${CMAKE_CUDA_FLAGS_RELEASE}" CACHE STRING "")
48+
49+
set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
50+
51+
52+
#--------------------------------------------------------------------------------
53+
# System Math Libraries
54+
#--------------------------------------------------------------------------------
55+
56+
set(ENABLE_MKL ON CACHE BOOL "")
57+
58+
set(MKL_INCLUDE_DIRS "/usr/tce/packages/mkl/mkl-2022.1.0/include" CACHE PATH "")
59+
60+
set(MKL_LIBRARIES /usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_intel_lp64.so
61+
/usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_gnu_thread.so
62+
/usr/tce/packages/mkl/mkl-2022.1.0/mkl/2022.1.0/lib/intel64/libmkl_core.so
63+
/usr/tce/backend/installations/linux-rhel8-x86_64/gcc-13.3.1/llvm-19.1.3-gy2lu5xbi4csr2k47emlajzfs5mlsd4g/bin/../lib/x86_64-unknown-linux-gnu/libomp.so
64+
/lib64/libpthread.so
65+
/lib64/libm.so
66+
/lib64/libdl.so CACHE STRING "")
67+
68+
69+
#--------------------------------------------------------------------------------
70+
# Documentation
71+
#--------------------------------------------------------------------------------
72+
73+
set(ENABLE_DOCS OFF CACHE BOOL "")
74+
75+
set(ENABLE_DOXYGEN OFF CACHE BOOL "")
76+
77+
set(ENABLE_SPHINX OFF CACHE BOOL "")
78+
79+
#--------------------------------------------------------------------------------
80+
# Development tools
81+
#--------------------------------------------------------------------------------
82+
83+
set(ENABLE_UNCRUSTIFY OFF CACHE BOOL "")

scripts/ci_build_and_test_in_container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fi
9595

9696

9797
if [[ "$*" == *--build-exe* ]]; then
98-
or_die make -j ${NPROC}
98+
or_die make -j ${NPROC} VERBOSE=1
9999

100100
if [[ "$*" != *--disable-unit-tests* ]]; then
101101
or_die ctest --output-on-failure -E "testUncrustifyCheck|testDoxygenCheck|testCppCheck|testClangTidy"

src/common/CArrayWrapper.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ template< typename T, int DIM0 >
3939
struct CArrayWrapper< T, DIM0 >
4040
{
4141
// default constructor
42-
HPCREACT_HOST_DEVICE
4342
constexpr CArrayWrapper() = default;
4443

4544
/**
@@ -127,7 +126,6 @@ template< typename T, int DIM0, int DIM1 >
127126
struct CArrayWrapper< T, DIM0, DIM1 >
128127
{
129128
// default constructor
130-
HPCREACT_HOST_DEVICE
131129
constexpr CArrayWrapper() = default;
132130

133131
/**
@@ -243,7 +241,6 @@ template< typename T, int DIM0, int DIM1, int DIM2 >
243241
struct CArrayWrapper< T, DIM0, DIM1, DIM2 >
244242
{
245243
// default constructor
246-
HPCREACT_HOST_DEVICE
247244
constexpr CArrayWrapper() = default;
248245

249246
/**

src/reactions/unitTestUtilities/equilibriumReactionsTestUtilities.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void computeResidualAndJacobianTest( PARAMS_DATA const & params,
5959
for( int i = 0; i < numSpecies; ++i )
6060
{
6161
data.speciesConcentration[i] = initialSpeciesConcentration[i];
62-
}
62+
}
6363

6464
pmpl::genericKernelWrapper( 1, &data, [params, temperature] HPCREACT_DEVICE ( auto * const dataCopy )
6565
{

0 commit comments

Comments
 (0)