Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modification to enable Cray fortran build #538

Merged
merged 1 commit into from
Aug 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions scripts/build_spock_offload_cce.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ export CXX=${CXX:=CC}
export BLAS_VENDOR=${BLAS_VENDOR:=Auto}
export BML_OPENMP=${BML_OPENMP:=yes}
export INSTALL_DIR=${INSTALL_DIR:="${MY_PATH}/install"}
export BML_MAGMA=${BML_MAGMA:=yes}
export BML_MAGMA=${BML_MAGMA:=no}
export MAGMA_ROOT=${MAGMA_HOME}
export BML_TESTING=${BML_TESTING:=yes}
export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:=Release}
export CMAKE_Fortran_FLAGS=${CMAKE_Fortran_FLAGS:="-ef -DCRAY_SDK"}
#export EXTRA_CFLAGS=${EXTRA_CFLAGS:="-Ofast -DUSE_OMP_OFFLOAD -DCRAY_SDK"}
export CMAKE_C_FLAGS=${CMAKE_C_FLAGS:="-Ofast -DUSE_OMP_OFFLOAD -DCRAY_SDK"}
export EXTRA_LINK_FLAGS=${EXTRA_LINK_FLAGS:="-L${LIBSCI_BASE_DIR}/cray/9.0/x86_64/lib"}

Expand Down
4 changes: 3 additions & 1 deletion tests/Fortran-tests/scale_matrix_typed.F90
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function test_scale_matrix_typed(matrix_type, element_kind, element_precision, n
integer, intent(in) :: n, m
logical :: test_result

real(DUMMY_PREC), parameter :: alpha = 1.2_MP
real(DUMMY_PREC) :: alpha
real(DUMMY_PREC) :: abs_tol

type(bml_matrix_t) :: a
Expand All @@ -27,6 +27,8 @@ function test_scale_matrix_typed(matrix_type, element_kind, element_precision, n
DUMMY_KIND(DUMMY_PREC), allocatable :: a_dense(:, :)
DUMMY_KIND(DUMMY_PREC), allocatable :: c_dense(:, :)

alpha = 1.2_MP

if(element_precision == sp)then
abs_tol = 1e-6
elseif(element_precision == dp)then
Expand Down