Skip to content

Commit ab0a0d9

Browse files
committed
rank1 ROM works again
1 parent e37cf1d commit ab0a0d9

File tree

1,649 files changed

+320456
-1322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,649 files changed

+320456
-1322
lines changed

CMakeLists.txt

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,38 @@ message(STATUS ${YAML_CPP_INCLUDE_DIR})
2525
include_directories(${YAML_CPP_INCLUDE_DIR})
2626

2727
find_package(KokkosKernels REQUIRED)
28-
link_libraries(dl ${YAML_CPP_LIBRARIES} Kokkos::kokkoskernels)
2928

3029
# executables
3130
add_executable(
3231
shawExe
33-
${CMAKE_CURRENT_SOURCE_DIR}/src/kokkos/main_fom.cc)
32+
${CMAKE_CURRENT_SOURCE_DIR}/src/kokkos/main.cc)
33+
target_link_libraries(shawExe dl ${YAML_CPP_LIBRARIES} Kokkos::kokkoskernels)
3434

3535
add_executable(
3636
extractStateFromSnaps
3737
${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_extract_state_from_snaps.cc)
38+
target_link_libraries(extractStateFromSnaps dl ${YAML_CPP_LIBRARIES} Kokkos::kokkoskernels)
39+
40+
add_executable(
41+
reconstructFomState
42+
${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_reconstruct_fom_state.cc)
43+
target_link_libraries(reconstructFomState dl ${YAML_CPP_LIBRARIES} Kokkos::kokkoskernels)
44+
45+
add_executable(
46+
reconstructSeismogram
47+
${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_reconstruct_seismo.cc)
48+
target_link_libraries(reconstructSeismogram dl ${YAML_CPP_LIBRARIES} Kokkos::kokkoskernels)
49+
50+
add_executable(computeThinSVD ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_eigen_svd.cc)
51+
target_compile_options(computeThinSVD PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-march=native>)
52+
target_include_directories(computeThinSVD PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/eigen)
3853

3954
# tests
4055
enable_testing()
4156
add_subdirectory(tests)
4257

4358

44-
45-
# ---------------------
46-
# REMOVE at some point
47-
# ---------------------
48-
# Kokkos::BLAS Kokkos::LAPACK)
49-
#include_directories(${EIGEN_INCLUDE_DIR} ${YAMLCPP_INCLUDE_DIR} ${KOKKOS_INCLUDE_DIR})
59+
# REMOVE BELOW
5060
#link_directories (${BLAS_LIB_DIR} ${YAMLCPP_LIB_DIR})
5161
#link_libraries (dl ${OMPLINK} yaml-cpp Kokkos::kokkoskernels ${BLASLIBNAME} gfortran)
5262
#link_directories (${YAMLCPP_LIB_DIR})
@@ -56,12 +66,6 @@ add_subdirectory(tests)
5666
# target_include_directories(${exeName} PRIVATE ${EIGEN_INCLUDE_DIR})
5767
# target_compile_definitions(${exeName} PRIVATE SHW_ENABLE_TPL_EIGEN)
5868
# target_compile_options (${exeName} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-march=native>)
59-
# set(exeName shwave_rom)
60-
# add_executable (${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/kokkos/main_rom.cc)
61-
# set(exeName reconstructFomState)
62-
# add_executable (${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/tools/main_reconstruct_fom_state.cc)
63-
# set(exeName reconstructSeismogram)
64-
# add_executable (${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/tools/main_reconstruct_seismo.cc)
6569
# set(exeName computeThinSVD)
6670
# add_executable (${exeName} ${CMAKE_CURRENT_SOURCE_DIR}/src/tools/main_eigen_svd.cc)
6771
# target_compile_options (${exeName} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-march=native>)

eigen/.hgeol

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[patterns]
2+
*.sh = LF
3+
*.MINPACK = CRLF
4+
scripts/*.in = LF
5+
debug/msvc/*.dat = CRLF
6+
debug/msvc/*.natvis = CRLF
7+
unsupported/test/mpreal/*.* = CRLF
8+
** = native
9+
10+
[repository]
11+
native = LF

eigen/.hgignore

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
syntax: glob
2+
qrc_*cxx
3+
*.orig
4+
*.pyc
5+
*.diff
6+
diff
7+
*.save
8+
save
9+
*.old
10+
*.gmo
11+
*.qm
12+
core
13+
core.*
14+
*.bak
15+
*~
16+
*build*
17+
*.moc.*
18+
*.moc
19+
ui_*
20+
CMakeCache.txt
21+
tags
22+
.*.swp
23+
activity.png
24+
*.out
25+
*.php*
26+
*.log
27+
*.orig
28+
*.rej
29+
log
30+
patch
31+
a
32+
a.*
33+
lapack/testing
34+
lapack/reference

0 commit comments

Comments
 (0)