Skip to content

Commit

Permalink
Merge pull request #1 from sparcityeu/dev
Browse files Browse the repository at this point in the history 
Dev Merge
  • Loading branch information
@delbek
delbek authored Jul 25, 2024
2 parents da20cd1 + d320e51 commit ad1ec2c
Show file tree
Hide file tree
Showing 82 changed files with 2,451 additions and 7,442 deletions.
202 changes: 122 additions & 80 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,81 @@ cmake_minimum_required(VERSION 3.22)
project(SparseViz)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_BUILD_TYPE DEBUG)
set(CMAKE_BUILD_TYPE Debug)

include(FindOpenMP)
if(OPENMP_FOUND)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
# OpenMP
find_package(OpenMP REQUIRED)
if(OpenMP_FOUND)
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler ${OpenMP_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
endif()

# Cuda
include(CheckLanguage)
check_language(CUDA)
if(CMAKE_CUDA_COMPILER)
enable_language(CUDA)
add_definitions(-DCUDA_ENABLED)
# set(CMAKE_CUDA_FLAGS_DEBUG "${CMAKE_CUDA_FLAGS_DEBUG} -G -lineinfo")
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler ${OpenMP_CXX_FLAGS}")
find_package(CUDAToolkit REQUIRED)
endif()

# MPI
check_language(MPI)
if(MPI_FOUND)
find_package(MPI REQUIRED)
add_definitions(-DMPI_AVAILABLE)
include_directories(${MPI_INCLUDE_PATH})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MPI_CXX_COMPILE_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_CXX_LINK_FLAGS}")
endif()

#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")

include_directories(lib)
include_directories(include)
include_directories(include/ConfigurationFiles)
include_directories(include/Matrix)
include_directories(include/Matrix/Base)
include_directories(include/Matrix/Orderings)
include_directories(include/Matrix/Visualization)
include_directories(include/Tensor)
include_directories(include/Tensor/Base)
include_directories(include/Tensor/Orderings)
include_directories(include/Tensor/Visualization)
include_directories(include/Kernel)
include_directories(include/Kernel/Matrix)
include_directories(include/Kernel/Matrix/CPU)
include_directories(include/Kernel/Matrix/GPU)
include_directories(include/Kernel/Tensor)
include_directories(include/Kernel/Tensor/CPU)
include_directories(include/Kernel/Tensor/GPU)
include_directories(include/Testing)
include_directories(include/SparseVizLog)
include_directories(include/IO)
include_directories(include/ConfigurationFiles)
include_directories(include/Matrix)
include_directories(include/Matrix/Base)
include_directories(include/Matrix/Orderings)
include_directories(include/Matrix/Visualization)
include_directories(include/Tensor)
include_directories(include/Tensor/Base)
include_directories(include/Tensor/Orderings)
include_directories(include/Tensor/Visualization)
include_directories(include/Kernel)
include_directories(include/Kernel/Matrix)
include_directories(include/Kernel/Matrix/CPU)
include_directories(include/Kernel/Matrix/GPU)
include_directories(include/Kernel/Tensor)
include_directories(include/Kernel/Tensor/CPU)
include_directories(include/Kernel/Tensor/GPU)
include_directories(include/SparseVizTest)
include_directories(include/SparseVizLog)
include_directories(include/SparseVizPerformance)
include_directories(include/IO)
include_directories(src)
include_directories(src/Matrix)
include_directories(src/Matrix/Base)
include_directories(src/Matrix/Orderings)
include_directories(src/Matrix/Visualization)
include_directories(src/Tensor)
include_directories(src/Tensor/Base)
include_directories(src/Tensor/Orderings)
include_directories(src/Tensor/Visualization)
include_directories(src/Kernel)
include_directories(src/Kernel/Matrix)
include_directories(src/Kernel/Matrix/CPU)
include_directories(src/Kernel/Matrix/GPU)
include_directories(src/Kernel/Tensor)
include_directories(src/Kernel/Tensor/CPU)
include_directories(src/Kernel/Tensor/GPU)
include_directories(src/Testing)
include_directories(src/SparseVizLog)
include_directories(src/IO)
include_directories(src/Matrix)
include_directories(src/Matrix/Base)
include_directories(src/Matrix/Orderings)
include_directories(src/Matrix/Visualization)
include_directories(src/Tensor)
include_directories(src/Tensor/Base)
include_directories(src/Tensor/Orderings)
include_directories(src/Tensor/Visualization)
include_directories(src/Kernel)
include_directories(src/Kernel/Matrix)
include_directories(src/Kernel/Matrix/CPU)
include_directories(src/Kernel/Matrix/GPU)
include_directories(src/Kernel/Tensor)
include_directories(src/Kernel/Tensor/CPU)
include_directories(src/Kernel/Tensor/GPU)
include_directories(src/SparseVizTest)
include_directories(src/SparseVizLog)
include_directories(src/SparseVizPerformance)
include_directories(src/IO)
include_directories(MatrixVisualizationFiles)
include_directories(TensorVisualizationFiles)
include_directories(TestFiles)
Expand All @@ -76,12 +102,10 @@ set(HEADER_FILES
include/Matrix/Orderings/amd.h
include/Matrix/Orderings/AMDOrdering.h
include/Tensor/Base/SparseTensor.h
include/Matrix/Base/MatrixMarketIOLibrary.h
include/Matrix/Base/Nonzero.h
include/Tensor/Base/Nonzero3D.h
include/IO/MatrixMarketIOLibrary.h
include/Tensor/Orderings/TensorOrdering.h
include/Tensor/Orderings/TensorNaturalOrdering.h
include/Tensor/Orderings/TensorKPartiteOrdering.h
include/Tensor/Orderings/COOKPartiteOrdering.h
include/Tensor/Visualization/TensorVisualizer.h
include/Kernel/Matrix/CPU/MatrixKernelFunction.h
include/Kernel/Tensor/CPU/TensorKernelFunction.h
Expand All @@ -93,18 +117,20 @@ set(HEADER_FILES
include/Kernel/Matrix/CPU/SequentialBfs.h
include/SparseVizLog/SparseVizLogger.h
include/IO/SparseVizIO.h
include/IO/pigo.hpp
include/Kernel/Matrix/CPU/Dijkstra.h
include/Kernel/Matrix/CPU/Bellman_Ford.h
include/Kernel/Matrix/CPU/Floyd_Warshall.h
include/Testing/SparseVizTest.h
include/SparseVizTest/SparseVizTest.h
include/SparseVizPerformance/SparseVizPerformance.h
include/Tensor/Base/SparseTensorCOO.h
include/sort.h
)

set(SOURCE_FILES
src/main.cpp
include/ConfigurationFiles/config.cpp
include/ConfigurationFiles/SparseVizEngine.cpp
src/Matrix/Base/MatrixMarketIOLibrary.cpp
src/IO/MatrixMarketIOLibrary.cpp
src/Matrix/Orderings/TrivialOrdering.cpp
src/Matrix/Orderings/MatrixOrdering.cpp
src/Matrix/Base/SparseMatrix.cpp
Expand All @@ -123,7 +149,7 @@ set(SOURCE_FILES
src/Tensor/Base/SparseTensor.cpp
src/Tensor/Orderings/TensorOrdering.cpp
src/Tensor/Orderings/TensorNaturalOrdering.cpp
src/Tensor/Orderings/TensorKPartiteOrdering.cpp
src/Tensor/Orderings/COOKPartiteOrdering.cpp
src/Tensor/Visualization/TensorVisualizer.cpp
src/Kernel/Matrix/CPU/MatrixKernelFunction.cpp
src/Kernel/Tensor/CPU/TensorKernelFunction.cpp
Expand All @@ -137,49 +163,65 @@ set(SOURCE_FILES
src/Kernel/Matrix/CPU/Dijkstra.cpp
src/Kernel/Matrix/CPU/Bellman_Ford.cpp
src/Kernel/Matrix/CPU/Floyd_Warshall.cpp
src/Testing/SparseVizTest.cpp
src/SparseVizTest/SparseVizTest.cpp
src/SparseVizPerformance/SparseVizPerformance.cpp
src/Tensor/Base/SparseTensorCOO.cpp
src/sort.cpp
)

file(READ " -- YOUR CONFIG FILE TO GET PROJECT INFO -- " configContent)
file(READ "/home/delbek/sparseviz/deniz_matrix_config" configContent)
string(REGEX MATCH "RABBIT_LICENCE = ([^\n]*)" _ ${configContent})
set(rabbitLicence ${CMAKE_MATCH_1})
string(STRIP ${rabbitLicence} rabbitLicence)

if (NOT rabbitLicence STREQUAL "None")
add_definitions(-DRABBIT_AVAILABLE)
list(APPEND HEADER_FILES include/Matrix/Orderings/rabbit_order.hpp)
list(APPEND HEADER_FILES include/Matrix/Orderings/RabbitOrdering.h)
list(APPEND SOURCE_FILES src/Matrix/Orderings/RabbitOrdering.cpp)
add_definitions(-DRABBIT_AVAILABLE)
list(APPEND HEADER_FILES include/Matrix/Orderings/rabbit_order.hpp)
list(APPEND HEADER_FILES include/Matrix/Orderings/RabbitOrdering.h)
list(APPEND SOURCE_FILES src/Matrix/Orderings/RabbitOrdering.cpp)
endif()

include(CheckLanguage)
check_language(CUDA)
if(CMAKE_CUDA_COMPILER)
enable_language(CUDA)
add_definitions(-DCUDA_ENABLED)
list(APPEND HEADER_FILES include/Kernel/Matrix/GPU/MatrixGPUKernel.h)
list(APPEND HEADER_FILES include/Kernel/Tensor/GPU/TensorGPUKernel.h)
list(APPEND HEADER_FILES include/Kernel/Tensor/GPU/COOTensorGPUKernelSoA.h)
list(APPEND HEADER_FILES include/Kernel/Tensor/GPU/COOTensorGPUKernelAoS.h)
list(APPEND HEADER_FILES include/Kernel/GPUKernelResult.h)
list(APPEND HEADER_FILES include/Kernel/GPUKernels.cuh)
list(APPEND HEADER_FILES include/Kernel/Matrix/GPU/CudaHelloWorld.h)
list(APPEND HEADER_FILES include/Kernel/Matrix/GPU/GPUSpmvRowBased.h)
list(APPEND SOURCE_FILES src/Kernel/Matrix/GPU/MatrixGPUKernel.cu)
list(APPEND SOURCE_FILES src/Kernel/Tensor/GPU/TensorGPUKernel.cu)
list(APPEND SOURCE_FILES src/Kernel/Tensor/GPU/COOTensorGPUKernelAoS.cu)
list(APPEND SOURCE_FILES src/Kernel/Tensor/GPU/COOTensorGPUKernelSoA.cu)
list(APPEND SOURCE_FILES src/Kernel/GPUKernels.cu)
list(APPEND SOURCE_FILES src/Kernel/Matrix/GPU/CudaHelloWorld.cu)
list(APPEND SOURCE_FILES src/Kernel/Matrix/GPU/GPUSpmvRowBased.cu)
list(APPEND HEADER_FILES include/Kernel/GPUHelpers.h)
list(APPEND HEADER_FILES include/Kernel/GPUKernelResult.h)
list(APPEND HEADER_FILES include/Kernel/Matrix/GPU/MatrixGPUKernel.h)
list(APPEND HEADER_FILES include/Kernel/Matrix/GPU/JackardWeights.h)
list(APPEND HEADER_FILES include/Kernel/Tensor/GPU/TensorGPUKernel.h)
list(APPEND HEADER_FILES include/Kernel/Tensor/GPU/COOTensorGPUKernelSoA.h)
list(APPEND HEADER_FILES include/Kernel/Tensor/GPU/COOTensorGPUKernelAoS.h)
list(APPEND SOURCE_FILES src/Kernel/GPUHelpers.cu)
list(APPEND SOURCE_FILES src/Kernel/Matrix/GPU/MatrixGPUKernel.cu)
list(APPEND SOURCE_FILES src/Kernel/Matrix/GPU/JackardWeights.cu)
list(APPEND SOURCE_FILES src/Kernel/Tensor/GPU/TensorGPUKernel.cu)
list(APPEND SOURCE_FILES src/Kernel/Tensor/GPU/COOTensorGPUKernelAoS.cu)
list(APPEND SOURCE_FILES src/Kernel/Tensor/GPU/COOTensorGPUKernelSoA.cu)
endif()

if(MPI_FOUND)

endif()

add_executable(SparseViz
${SOURCE_FILES}
README.md
)

target_link_libraries(SparseViz ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} ${CUDA_cusparse_LIBRARY})
target_link_libraries(SparseViz --YOUR_PATOH_LIBRARY_FOLDER--/libpatoh.a)
target_link_libraries(SparseViz --YOUR_AMD_BUILD_FOLDER--/libamd.a)
target_link_libraries(SparseViz libnuma.a)
target_link_libraries(SparseViz
OpenMP::OpenMP_CXX
cuda
${CUDA_LIBRARIES}
${CUDA_CUBLAS_LIBRARIES}
${CUDA_cusparse_LIBRARY}
)

if(MPI_FOUND)
target_link_libraries(SparseViz
MPI::MPI_CXX
)
endif()

target_link_libraries(SparseViz /home/delbek/sparseviz/lib/libpatoh.a)
target_link_libraries(SparseViz /home/delbek/sparseviz/lib/libamd.a)
#target_link_libraries(SparseViz libnuma.a)

target_compile_options(SparseViz PRIVATE -O3)
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SparseViz

SparseViz s a library built in C++ that orders and visualizes sparse data structures, i.e., matrices and tensors seamlessly. It also supports parallel CPU/GPU kernel execution and reports execution times of the kernels on the ordered data structures.
SparseViz s a library built in C++ that orders and visualizes sparse data structures, i.e., matrices and tensors seamlessly. It also supports parallel CPU/GPU kernel execution and reports execution times of the kernels on the ordered data structures.

The library is still in early stages of development. As a result, it may not stable and likely to change in the near future.

Expand Down
Loading

0 comments on commit ad1ec2c

Please sign in to comment.