fixed spblas and added some flags for enabling fftpack (and preprocess)

jfdev001 · jfdev001 · commit a0e12219429e · 2025-03-23T16:07:21.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,11 +1,13 @@
 cmake_minimum_required(VERSION 3.15)
 
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-
 option(BUILD_TESTING "Build tests" OFF)
+
 option(ENABLE_SPBLAS "Build with SPBLAS" ON)
-option(PFUNIT "ON - using pFUnit for unit tests, OFF - skip building pfunit tests" OFF)
-option(TEST_DRIVE "ON - Using test-drive for unittests, OFF - skip building test-drive tests" OFF)
+
+option(ENABLE_FFTPACK "Build with fftpack" OFF)
+option(ENABLE_PFUNIT "Build with pFUnit" OFF)
+option(ENABLE_TEST_DRIVE "Build with test-drive" OFF)
 
 
 project(
@@ -16,60 +18,24 @@ project(
 )
 
 # Set paths to Intel oneAPI MKL
-# TODO: something wrong with spblas call??
 if(${ENABLE_SPBLAS})
     set(MKLROOT $ENV{MKLROOT})  # Assuming MKLROOT is already set in the environment
     if (NOT MKLROOT)
         message(FATAL_ERROR "MKLROOT environment variable is not set.")
     endif()
     set(MKLLIB ${MKLROOT}/lib CACHE PATH "Path to Intel MKL Libraries")
     set(MKLINCLUDE ${MKLROOT}/include CACHE PATH "Path to Intel MKL include files")
-
-    add_executable(
-        test_root_spblas 
-        test_root_spblas.f90
-    )
-
-    # Add include directories
-    target_include_directories(
-        test_root_spblas 
-        PRIVATE ${MKLINCLUDE}
-    )
-
-    # Specify the MKL libraries for linking
-    target_link_libraries(
-        test_root_spblas
-        PRIVATE
-            # must be static 
-            ${MKLLIB}/libmkl_blas95_ilp64.a
-            
-            # must shared 
-            ${MKLLIB}/libmkl_intel_ilp64.so
-            ${MKLLIB}/libmkl_sequential.so # or libmkl_intel_thread.so
-            ${MKLLIB}/libmkl_core.so
-
-            # standard shared libs 
-            pthread
-            m
-            dl
-    )
-
-    target_compile_options(
-        test_root_spblas 
-        PRIVATE
-            -i8 # required, otherwise segfaults
-    )
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 
 # build externals with specified version corresponding to git tag 
-#include(FetchContent)
-#message(STATUS "Build extern")
-#set(fftpack_GIT_TAG main)
-#set(pFUnit_GIT_TAG cf37fb694f7c015d3718c1b4f7f3e9a56613067a) # fixes fetch content
-#set(test-drive_GIT_TAG main)
-#add_subdirectory(extern)
+include(FetchContent)
+message(STATUS "Build extern")
+set(fftpack_GIT_TAG main)
+set(pFUnit_GIT_TAG cf37fb694f7c015d3718c1b4f7f3e9a56613067a) # fixes fetch content
+set(test-drive_GIT_TAG main)
+add_subdirectory(extern)
 
 message(STATUS "Build src")
 include(GNUInstallDirs)
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Demonstrate sparse matrix-vector multiplication with Intel MKL. Also has
 various cmake structural components that are intended to be for generic 
 projects.
 
-Use either `pFUnit` or `test-drive` for unit testing.
+Can easily use `pFUnit` or `test-drive` for unit testing.
 
 Make sure you have the [Intel oneAPI HPC Toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html?packages=hpc-toolkit&hpc-toolkit-os=linux&hpc-toolkit-lin=apt) or [Intel Fortran Essentials](https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html?packages=fortran-essentials&fortran-essentials-os=linux&fortran-essentials-lin=apt).
 
diff --git a/cmake/HelloSPBLASConfig.cmake.in b/cmake/HelloSPBLASConfig.cmake.in
@@ -6,13 +6,15 @@
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 
 include(CMakeFindDependencyMacro)
-find_dependency(fftpack REQUIRED)
+if(${ENABLE_FFTPACK})
+    find_dependency(fftpack REQUIRED)
+endif()
 
-if(${PFUNIT})
+if(${ENABLE_PFUNIT})
     find_dependency(PFUNIT REQUIRED)
 endif()
 
-if (${TEST_DRIVE})
+if (${ENABLE_TEST_DRIVE})
     find_dependency(test-drive REQUIRED)
 endif()
 
diff --git a/config/intel_levante_pfunit b/config/intel_levante_pfunit
@@ -8,7 +8,7 @@ cmake -S . -B build \
     -DCMAKE_Fortran_COMPILER=mpiifort \
     -DMKLLIB=/sw/spack-levante/intel-oneapi-mkl-2022.0.1-ttdktf/mkl/2022.0.1/lib/intel64/\
     -DCMAKE_INSTALL_PREFIX=build/installed\
-    -DPFUNIT=ON
+    -DENABLE_PFUNIT=ON
     
 cmake --build build
 cd build
diff --git a/config/intel_ubuntu_pfunit b/config/intel_ubuntu_pfunit
@@ -5,9 +5,13 @@ curdir=$(pwd)
 [[ $curdir == *"config"* ]] && echo "must be in root project dir" && exit 1 
 cmake -S . -B build\
     -DBUILD_TESTING=ON\
-    -DCMAKE_Fortran_COMPILER=mpiifx -DCMAKE_INSTALL_PREFIX=build/installed\
-    -DPFUNIT=ON
+    -DENABLE_PFUNIT=ON\
+    -DENABLE_SPBLAS=ON\
+    -DENABLE_TEST_DRIVE=OFF\
+    -DCMAKE_Fortran_COMPILER=mpiifx\
+    -DCMAKE_INSTALL_PREFIX=build/installed
 cmake --build build
 cd build
 ctest -L myproject 
+./build/test/test_spblas
 )
diff --git a/config/intel_ubuntu_spblas b/config/intel_ubuntu_spblas
@@ -1,5 +1,5 @@
 #!/usr/bin/bash
+[[ -d build-spblas ]] && rm -rf build-spblas 
 cmake -S . -B build-spblas -DCMAKE_Fortran_COMPILER=ifx -DBUILD_TESTING=ON
 cmake --build build-spblas
 ./build-spblas/test/test_spblas 
-./build-spblas/test_root_spblas
diff --git a/config/intel_ubuntu_test_drive b/config/intel_ubuntu_test_drive
@@ -6,13 +6,16 @@ curdir=$(pwd)
 #[[ -d build ]] && rm -rf build
 cmake -S . -B build\
     -DBUILD_TESTING=ON\
-    -DCMAKE_Fortran_COMPILER=ifx -DPFUNIT=OFF -DTEST_DRIVE=ON\
+    -DENABLE_SPBLAS=ON\
+    -DENABLE_PFUNIT=OFF\
+    -DENABLE_TEST_DRIVE=ON\
+    -DCMAKE_Fortran_COMPILER=ifx\
     -DCMAKE_INSTALL_PREFIX=build/installed
 cmake --build build
 cd build
 # name from test/CMakeLists.txt build_tests(FIRST_ARG ...)
 ctest -R test_drive_square_tests
-./test/test_spblas
+./build/test/test_spblas
 # build docs
 #cmake --build . --target doxygen_docs 
 )
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -1,18 +1,20 @@
 # from dynamics 
 # Get FFTPACK
-message(STATUS "Building fftpack")
-add_subdirectory(fftpack)
+if(${ENABLE_FFTPACK})
+    message(STATUS "Building fftpack")
+    add_subdirectory(fftpack)
+endif()
 
 # Get test drive
-if (${TEST_DRIVE})
+if (${ENABLE_TEST_DRIVE})
     message(STATUS "Building test-drive")
     add_subdirectory(test-drive)
     set(test-drive_LIBRARY ${test-drive_LIBRARY} PARENT_SCOPE)
     set(test-drive_INCLUDE_DIR ${test-drive_INCLUDE_DIR} PARENT_SCOPE)
 endif()
 
 # Get pfunit
-if (${PFUNIT})
+if(${ENABLE_PFUNIT})
     message(STATUS "Building pFUnit")
     add_subdirectory(pFUnit)
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(${PROJECT_NAME} ${HelloSPBLAS_SOURCES})
 set_target_properties(
     ${PROJECT_NAME}
     PROPERTIES
+        Fortran_PREPROCESS ON
         POSITION_INDEPENDENT_CODE ON
         VERSION ${PROJECT_VERSION}
         Fortran_MODULE_DIRECTORY ${Fortran_MODULE_DIRECTORY}
@@ -27,8 +28,10 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 )
 
 # Could use cmake/helpers.cmake::link_libraries but fftpack include dir is not needed
-# TODO: 
-#target_link_libraries(${PROJECT_NAME} fftpack)
+if(${ENABLE_FFTPACK})
+    target_compile_definitions(${PROJECT_NAME} PRIVATE __FFTPACK)
+    target_link_libraries(${PROJECT_NAME} fftpack)
+endif()
 
 # installation/configuration steps (modified from fotran-lang/stdlib)
 install(
diff --git a/src/mo_square.f90 b/src/mo_square.f90
@@ -5,7 +5,9 @@
 !!
 
 MODULE mo_square
-    !USE fftpack
+    #ifdef __FFTPACK
+    USE fftpack
+    #endif
     IMPLICIT NONE
 
 CONTAINS
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -44,6 +44,12 @@ if(${ENABLE_SPBLAS})
             m
             dl
     )
+
+    target_compile_options(
+        test_spblas 
+        PRIVATE
+            -i8 # required, otherwise segfaults
+    )
 endif()
 
 # Add pfunit tests
diff --git a/test/test_spblas.f90 b/test/test_spblas.f90
@@ -18,69 +18,65 @@
 ! solved... could use that also as a reference.
 INCLUDE "mkl_spblas.f90"
 PROGRAM TEST_SPBLAS
-    USE mkl_spblas
-    !ONLY: sparse_matrix_t, matrix_descr, &
-                          !mkl_sparse_s_create_csr, mkl_sparse_s_create_coo, mkl_sparse_s_mv, &
-                          !SPARSE_INDEX_BASE_ONE, SPARSE_MATRIX_TYPE_GENERAL, &
-                          !SPARSE_OPERATION_NON_TRANSPOSE
-
+    USE mkl_spblas, ONLY: sparse_matrix_t, matrix_descr, &
+        mkl_sparse_s_create_csr, mkl_sparse_s_create_coo, mkl_sparse_s_mv, &
+        SPARSE_INDEX_BASE_ONE, SPARSE_MATRIX_TYPE_GENERAL, &
+        SPARSE_OPERATION_NON_TRANSPOSE
+         
     IMPLICIT NONE
 
     INTEGER, PARAMETER :: rows = 4
     INTEGER, PARAMETER :: cols = 6
 
     INTEGER, PARAMETER :: nnz = 8
 
-    INTEGER :: ia(rows + 1), ja(nnz), stat
+    INTEGER :: ia(rows+1), ja(nnz), stat
     REAL :: values(nnz), x(6), y(4), y_coo(4)
 
     TYPE(sparse_matrix_t) :: a
     TYPE(matrix_descr) :: descr
 
     TYPE(sparse_matrix_t) :: A_coo
 
-    INTEGER, ALLOCATABLE :: row_indx(:)
-    INTEGER, ALLOCATABLE :: col_indx(:)
+    INTEGER, ALLOCATABLE :: row_indx(:)     
+    INTEGER, ALLOCATABLE :: col_indx(:) 
 
-    ! Matrix example taken from:
+    ! Matrix example taken from: 
     ! https://en.wikipedia.org/wiki/Sparse_matrix#Compressed_sparse_row_(CSR,_CRS_or_Yale_format)
     !
     !     | 10  20  0  0  0  0 |
     ! A = |  0  30  0 40  0  0 |
     !     |  0   0 50 60 70  0 |
-    !     |  0   0  0  0  0 80 |
-
-    x = [1, 1, 1, 1, 1, 1] ! for spmv
-    values = [10, 20, 30, 40, 50, 60, 70, 80] ! for matrix values 
+    !     |  0   0  0  0  0 80 | 
 
-    !! create csr
-    ia = [1, 3, 5, 8, 9]
-    ja = [1, 2, 2, 4, 3, 4, 5, 6]
+    ! create csr
+    ia = [1,3,5,8,9]
+    ja = [1,2,2,4,3,4,5,6]
+    values = [10, 20, 30, 40, 50, 60, 70, 80]
 
     stat = mkl_sparse_s_create_csr(&
-        a, SPARSE_INDEX_BASE_ONE, rows, cols, ia(1:4), ia(2:5), ja, values)
-
-    !PRINT *, "stat create = ", stat
-    descr%TYPE = SPARSE_MATRIX_TYPE_GENERAL
+        a,SPARSE_INDEX_BASE_ONE,rows,cols,ia(1:4),ia(2:5),ja,values)
 
+    print *, "stat create = ", stat
+    descr%type = SPARSE_MATRIX_TYPE_GENERAL
+    
     ! create coo
-    !row_indx = [1, 1, 2, 2, 3, 3, 3, 4]
-    !col_indx = [1, 2, 2, 4, 3, 4, 5, 6]
-    !stat = mkl_sparse_s_create_coo(A_coo, SPARSE_INDEX_BASE_ONE, rows, cols, nnz, row_indx, col_indx, values)
-
-    !PRINT *, "stat create = ", stat
-    !descr%TYPE = SPARSE_MATRIX_TYPE_GENERAL
-    !PRINT *, "descr%TYPE", descr%TYPE
-
-    ! spmv csr
-    !stat = mkl_sparse_s_mv(SPARSE_OPERATION_NON_TRANSPOSE, 1.0, a, descr, x, 0.0, y)
-    !PRINT *, "stat mv = ", stat
-    !PRINT *, "result csr  = ", y
-    !PRINT *, "expected = ", [30., 70., 180., 80.]
-
-    !! spmv coo
-    !stat = mkl_sparse_s_mv( &
-           !SPARSE_OPERATION_NON_TRANSPOSE, 1.0, A_coo, descr, x, 0.0, y_coo)
-    !PRINT *, "result coo  = ", y_coo
-
-END PROGRAM TEST_SPBLAS
+    row_indx = [1, 1, 2, 2, 3, 3, 3, 4] 
+    col_indx = [1, 2, 2, 4, 3, 4, 5, 6]
+    stat = mkl_sparse_s_create_coo(&
+        A_coo, SPARSE_INDEX_BASE_ONE, rows, cols, nnz, row_indx, col_indx,&
+        values) 
+
+    ! spmv csr 
+    x = [1,1,1,1,1,1]
+    stat = mkl_sparse_s_mv(SPARSE_OPERATION_NON_TRANSPOSE,1.0,a,descr,x,0.0,y)
+    print *, "stat mv = ", stat
+    print *, "result csr  = ", y
+    print *, "expected = ", [30., 70., 180., 80.]
+
+    ! spmv coo
+    stat = mkl_sparse_s_mv(&
+        SPARSE_OPERATION_NON_TRANSPOSE, 1.0, A_coo, descr, x, 0.0, y_coo)
+    print *, "result coo  = ", y_coo
+
+END PROGRAM TEST_SPBLAS 
diff --git a/test_root_spblas.f90 b/test_root_spblas.f90

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,12 @@ if(${ENABLE_SPBLAS})`
`44`	`44`	`m`
`45`	`45`	`dl`
`46`	`46`	`)`
	`47`	`+`
	`48`	`+ target_compile_options(`
	`49`	`+ test_spblas`
	`50`	`+ PRIVATE`
	`51`	`+ -i8 # required, otherwise segfaults`
	`52`	`+ )`
`47`	`53`	`endif()`
`48`	`54`
`49`	`55`	`# Add pfunit tests`