Skip to content

Commit e9a5726

Browse files
author
Jared Frazier
committed
better preproc name, link fftpack fuixed
1 parent c200713 commit e9a5726

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

config/intel_levante_spblas_fftpack

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/bash
2+
[[ -d build-spblas-levante ]] && rm -rf build-spblas-levante
3+
cmake -S . -B build-spblas-levante\
4+
-DCMAKE_Fortran_COMPILER=ifx\
5+
-DMKLROOT=/sw/spack-levante/intel-oneapi-mkl-2022.0.1-ttdktf/mkl/2022.0.1\
6+
-DMKLLIB=/sw/spack-levante/intel-oneapi-mkl-2022.0.1-ttdktf/mkl/2022.0.1/lib/intel64/\
7+
-DMKLINCLUDE=/sw/spack-levante/intel-oneapi-mkl-2022.0.1-ttdktf/mkl/2022.0.1/include\
8+
-DBUILD_TESTING=ON\
9+
-DENABLE_SPBLAS=ON\
10+
-DENABLE_FFTPACK=ON\
11+
-DENABLE_PFUNIT=OFF\
12+
-DENABLE_TEST_DRIVE=OFF
13+
14+
cmake --build build-spblas-levante
15+
16+
./build-spblas-levante/test/test_spblas

src/CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ target_include_directories(${PROJECT_NAME} PUBLIC
2727
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
2828
)
2929

30-
# Could use cmake/helpers.cmake::link_libraries but fftpack include dir is not needed
3130
if(${ENABLE_FFTPACK})
32-
target_compile_definitions(${PROJECT_NAME} PRIVATE __FFTPACK)
33-
target_link_libraries(${PROJECT_NAME} fftpack)
31+
target_compile_definitions(${PROJECT_NAME} PRIVATE FFTPACK)
32+
target_link_libraries(${PROJECT_NAME} PRIVATE fftpack)
3433
endif()
3534

3635
if(${ENABLE_SPBLAS})
37-
target_compile_definitions(${PROJECT_NAME} PRIVATE __INTEL_SPBLAS)
38-
link_spblas(${PROJECT_NAME})
36+
target_compile_definitions(${PROJECT_NAME} PRIVATE INTEL_SPBLAS)
37+
link_spblas(${PROJECT_NAME})
3938
endif()
4039

4140
# installation/configuration steps (modified from fotran-lang/stdlib)

src/mo_square.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
!! This module defines a function to compute the square of a given real number.
55
!!
66

7-
#ifdef __INTEL_SPBLAS
7+
#ifdef INTEL_SPBLAS
88
INCLUDE "mkl_spblas.f90"
99
#endif
1010
MODULE mo_square
11-
#ifdef __FFTPACK
11+
#ifdef FFTPACK
1212
USE fftpack
1313
#endif
14-
#ifdef __INTEL_SPBLAS
14+
#ifdef INTEL_SPBLAS
1515
USE mkl_spblas
1616
#endif
1717
IMPLICIT NONE

0 commit comments

Comments
 (0)