Skip to content

Commit ed3be7f

Browse files
committed
Merge pull request #15 from naveen-rn/master
Check Machine Type for Navier-Stokes Tests
2 parents 19c4ffd + 1ae587f commit ed3be7f

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,13 @@ if(opencoarrays_aware_compiler)
140140
add_mpi_test(coarray_burgers_pde 2 ${tests_root}/integration/pde_solvers/coarrayBurgers/coarray_burgers_pde)
141141
add_mpi_test(co_heat 2 ${tests_root}/integration/pde_solvers/coarrayHeatSimplified/co_heat)
142142

143+
execute_process (COMMAND uname -m
144+
OUTPUT_VARIABLE MACHINE_TYPE)
143145
if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux" )
144-
add_mpi_test(coarray_navier_stokes 2 ${tests_root}/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
145-
set_property(TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
146+
if ("${MACHINE_TYPE}" MATCHES "x86_64")
147+
add_mpi_test(coarray_navier_stokes 2 ${tests_root}/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
148+
set_property(TEST coarray_navier_stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
149+
endif()
146150
endif()
147151
else()
148152
add_test(co_sum_extension ${tests_root}/unit/extensions/test-co_sum-extension.sh)
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
2-
3-
# Default to older SSE-instruction-based FFT library
4-
if (LEGACY_ARCHITECTURE OR (NOT DEFINED(LEGACY_ARCHITECTURE)))
5-
set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_sse.a )
6-
else()
7-
message(WARNING "Attempting to use libfft_avx.a, which only works on recent x86 architectures.")
8-
set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_avx.a )
2+
execute_process (COMMAND uname -m
3+
OUTPUT_VARIABLE MACHINE_TYPE)
4+
# checking whether the machine is of type 64-bit before proceeding further
5+
if ("${MACHINE_TYPE}" MATCHES "x86_64")
6+
# Default to older SSE-instruction-based FFT library
7+
if (LEGACY_ARCHITECTURE OR (NOT DEFINED(LEGACY_ARCHITECTURE)))
8+
set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_sse.a )
9+
else()
10+
message(WARNING "Attempting to use libfft_avx.a, which only works on recent x86 architectures.")
11+
set(fft_library ${CMAKE_CURRENT_SOURCE_DIR}/libfft_avx.a )
12+
endif()
13+
add_executable( coarray_navier_stokes
14+
coarray-shear_coll.F90
15+
${walltime_o}
16+
)
17+
target_link_libraries(coarray_navier_stokes OpenCoarrays ${fft_library})
918
endif()
10-
add_executable( coarray_navier_stokes
11-
coarray-shear_coll.F90
12-
${walltime_o}
13-
)
14-
target_link_libraries(coarray_navier_stokes OpenCoarrays ${fft_library})
1519
else()
1620
# Skip Navier-Stokes build until an appropriate FFT has been found.
1721
endif()

0 commit comments

Comments
 (0)