From 55005feeba81c55e2ad0c42afa2a2956117f7007 Mon Sep 17 00:00:00 2001 From: syby119 Date: Wed, 29 Nov 2023 00:22:14 +0800 Subject: [PATCH 1/2] Change CUDA::nvToolsExt to CUDA::nvtx3 --- CHOLMOD/CMakeLists.txt | 6 +++--- CHOLMOD/GPU/CMakeLists.txt | 4 ++-- SPQR/GPUQREngine/CMakeLists.txt | 6 +++--- SPQR/GPURuntime/CMakeLists.txt | 10 +++++----- SPQR/SPQRGPU/CMakeLists.txt | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt index a967945ed8..3c9140b984 100644 --- a/CHOLMOD/CMakeLists.txt +++ b/CHOLMOD/CMakeLists.txt @@ -504,13 +504,13 @@ if ( SUITESPARSE_CUDA ) endif ( ) if ( BUILD_SHARED_LIBS ) target_link_libraries ( CHOLMOD PRIVATE CUDA::nvrtc CUDA::cudart_static - CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvtx3 CUDA::cublas ) target_include_directories ( CHOLMOD INTERFACE $ ) endif ( ) if ( BUILD_STATIC_LIBS ) target_link_libraries ( CHOLMOD_static PUBLIC CUDA::nvrtc CUDA::cudart_static - CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvtx3 CUDA::cublas ) endif ( ) set ( old_CMAKE_EXTRA_INCLUDE_FILES CMAKE_EXTRA_INCLUDE_FILES ) @@ -804,7 +804,7 @@ add_test ( NAME CHOLMOD_int64_single_supernodal if ( WIN32 AND BUILD_SHARED_LIBS ) # Set PATH to pick up the necessary libraries for all tests - set ( CHOLMOD_CTEST_NAMES + set ( CHOLMOD_CTEST_NAMES CHOLMOD_int32_double_bcsstk01 CHOLMOD_int64_double_bcsstk01 CHOLMOD_int32_single_bcsstk01 CHOLMOD_int64_single_bcsstk01 CHOLMOD_int32_double_lp_afiro CHOLMOD_int64_double_lp_afiro CHOLMOD_int32_single_lp_afiro CHOLMOD_int64_single_lp_afiro CHOLMOD_int32_double_can24 CHOLMOD_int64_double_can24 CHOLMOD_int32_single_can24 CHOLMOD_int64_single_can24 diff --git a/CHOLMOD/GPU/CMakeLists.txt b/CHOLMOD/GPU/CMakeLists.txt index e16822b971..1df8286431 100644 --- a/CHOLMOD/GPU/CMakeLists.txt +++ b/CHOLMOD/GPU/CMakeLists.txt @@ -90,11 +90,11 @@ endif ( ) if ( BUILD_SHARED_LIBS ) target_link_libraries ( CHOLMOD_CUDA PRIVATE CUDA::nvrtc CUDA::cudart_static - CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvtx3 CUDA::cublas ) endif ( ) if ( BUILD_STATIC_LIBS ) target_link_libraries ( CHOLMOD_CUDA_static PUBLIC CUDA::nvrtc CUDA::cudart_static - CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvtx3 CUDA::cublas ) endif ( ) #------------------------------------------------------------------------------- diff --git a/SPQR/GPUQREngine/CMakeLists.txt b/SPQR/GPUQREngine/CMakeLists.txt index 7a9cc82278..5592914f8b 100644 --- a/SPQR/GPUQREngine/CMakeLists.txt +++ b/SPQR/GPUQREngine/CMakeLists.txt @@ -21,7 +21,7 @@ message ( STATUS "Building SPQR/GPUQRENGINE version: v" # define the project #------------------------------------------------------------------------------- -project ( gpuqrengine +project ( gpuqrengine VERSION "${SPQR_VERSION_MAJOR}.${SPQR_VERSION_MINOR}.${SPQR_VERSION_SUB}" LANGUAGES CXX CUDA ) @@ -100,7 +100,7 @@ if ( BUILD_SHARED_LIBS ) CUDA_RESOLVE_DEVICE_SYMBOLS ON CUDA_RUNTIME_LIBRARY Static ) target_link_libraries ( GPUQREngine PRIVATE - CUDA::nvrtc CUDA::cudart_static CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvrtc CUDA::cudart_static CUDA::nvtx3 CUDA::cublas ) target_compile_definitions ( GPUQREngine PRIVATE "SUITESPARSE_CUDA" ) target_include_directories ( GPUQREngine @@ -138,7 +138,7 @@ if ( BUILD_STATIC_LIBS ) CUDA_RESOLVE_DEVICE_SYMBOLS ON CUDA_RUNTIME_LIBRARY Static ) target_link_libraries ( GPUQREngine_static PUBLIC - CUDA::nvrtc CUDA::cudart_static CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvrtc CUDA::cudart_static CUDA::nvtx3 CUDA::cublas ) target_compile_definitions ( GPUQREngine_static PRIVATE "SUITESPARSE_CUDA" ) target_include_directories ( GPUQREngine_static diff --git a/SPQR/GPURuntime/CMakeLists.txt b/SPQR/GPURuntime/CMakeLists.txt index a22095f6dc..aed876f09e 100644 --- a/SPQR/GPURuntime/CMakeLists.txt +++ b/SPQR/GPURuntime/CMakeLists.txt @@ -21,7 +21,7 @@ message ( STATUS "Building SPQR/GPURUNTIME version: v" # define the project #------------------------------------------------------------------------------- -project ( suitesparse_gpuruntime +project ( suitesparse_gpuruntime VERSION "${SPQR_VERSION_MAJOR}.${SPQR_VERSION_MINOR}.${SPQR_VERSION_SUB}" LANGUAGES C CXX CUDA ) @@ -78,10 +78,10 @@ if ( BUILD_SHARED_LIBS ) CUDA_SEPARABLE_COMPILATION ON CUDA_RUNTIME_LIBRARY Static ) target_link_libraries ( GPURuntime PRIVATE - CUDA::nvrtc CUDA::cudart_static CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvrtc CUDA::cudart_static CUDA::nvtx3 CUDA::cublas ) target_compile_definitions ( GPURuntime PRIVATE "SUITESPARSE_CUDA" ) - target_include_directories ( GPURuntime + target_include_directories ( GPURuntime INTERFACE $ $ ) endif ( ) @@ -114,10 +114,10 @@ if ( BUILD_STATIC_LIBS ) CUDA_SEPARABLE_COMPILATION ON CUDA_RUNTIME_LIBRARY Static ) target_link_libraries ( GPURuntime_static PUBLIC - CUDA::nvrtc CUDA::cudart_static CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvrtc CUDA::cudart_static CUDA::nvtx3 CUDA::cublas ) target_compile_definitions ( GPURuntime_static PRIVATE "SUITESPARSE_CUDA" ) - target_include_directories ( GPURuntime_static + target_include_directories ( GPURuntime_static INTERFACE $ $ ) endif ( ) diff --git a/SPQR/SPQRGPU/CMakeLists.txt b/SPQR/SPQRGPU/CMakeLists.txt index 1d6ce518b4..44485753db 100644 --- a/SPQR/SPQRGPU/CMakeLists.txt +++ b/SPQR/SPQRGPU/CMakeLists.txt @@ -20,7 +20,7 @@ message ( STATUS "Building SPQR_CUDA version: v" include ( SuiteSparsePolicy ) -project ( spqr_cuda +project ( spqr_cuda VERSION "${SPQR_VERSION_MAJOR}.${SPQR_VERSION_MINOR}.${SPQR_VERSION_SUB}" LANGUAGES CXX ) message ( STATUS "C++ flags for CUDA: ${CMAKE_CXX_FLAGS}" ) @@ -71,7 +71,7 @@ if ( BUILD_SHARED_LIBS ) target_link_libraries ( SPQR_CUDA PRIVATE SuiteSparse::CHOLMOD ) target_link_libraries ( SPQR_CUDA PRIVATE CUDA::nvrtc CUDA::cudart_static - CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvtx3 CUDA::cublas ) endif ( ) if ( BUILD_STATIC_LIBS ) @@ -93,7 +93,7 @@ if ( BUILD_STATIC_LIBS ) endif ( ) target_link_libraries ( SPQR_CUDA_static PUBLIC CUDA::nvrtc CUDA::cudart_static - CUDA::nvToolsExt CUDA::cublas ) + CUDA::nvtx3 CUDA::cublas ) endif ( ) #------------------------------------------------------------------------------- From 458c87f516a549d9230facca236af759fe9465dd Mon Sep 17 00:00:00 2001 From: syby119 Date: Wed, 29 Nov 2023 00:53:13 +0800 Subject: [PATCH 2/2] Change operator new definition for GPUQREngine --- SPQR/GPUQREngine/Include/GPUQREngine_BucketList.hpp | 2 +- SPQR/GPUQREngine/Include/GPUQREngine_Front.hpp | 2 +- SPQR/GPUQREngine/Include/GPUQREngine_LLBundle.hpp | 2 +- SPQR/GPUQREngine/Include/GPUQREngine_Scheduler.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SPQR/GPUQREngine/Include/GPUQREngine_BucketList.hpp b/SPQR/GPUQREngine/Include/GPUQREngine_BucketList.hpp index d7ce56167a..ec4386f473 100644 --- a/SPQR/GPUQREngine/Include/GPUQREngine_BucketList.hpp +++ b/SPQR/GPUQREngine/Include/GPUQREngine_BucketList.hpp @@ -72,7 +72,7 @@ template class BucketList int VThead; // Index of the first available entry in VTlist // Constructors - void *operator new(long unsigned int, BucketList * p) + void *operator new(size_t, BucketList * p) { return p; } diff --git a/SPQR/GPUQREngine/Include/GPUQREngine_Front.hpp b/SPQR/GPUQREngine/Include/GPUQREngine_Front.hpp index 7bae8b8944..38320cbf6e 100644 --- a/SPQR/GPUQREngine/Include/GPUQREngine_Front.hpp +++ b/SPQR/GPUQREngine/Include/GPUQREngine_Front.hpp @@ -53,7 +53,7 @@ template class Front /* Debug Fields */ bool printMe; - void* operator new(long unsigned int reqMem, Front* ptr){ return ptr; } + void* operator new(size_t reqMem, Front* ptr){ return ptr; } Front( Int fids_arg, // the front identifier diff --git a/SPQR/GPUQREngine/Include/GPUQREngine_LLBundle.hpp b/SPQR/GPUQREngine/Include/GPUQREngine_LLBundle.hpp index 2ea869e64c..e785640137 100644 --- a/SPQR/GPUQREngine/Include/GPUQREngine_LLBundle.hpp +++ b/SPQR/GPUQREngine/Include/GPUQREngine_LLBundle.hpp @@ -76,7 +76,7 @@ template class LLBundle TaskType CurrentTask; - void *operator new(long unsigned int, LLBundle * p){ return p; } + void *operator new(size_t, LLBundle * p){ return p; } //------------------------------------------------------------------------------ // // This file contains the constructor and destructor for the LLBundle class. diff --git a/SPQR/GPUQREngine/Include/GPUQREngine_Scheduler.hpp b/SPQR/GPUQREngine/Include/GPUQREngine_Scheduler.hpp index 22513e7e22..5c642ca41a 100644 --- a/SPQR/GPUQREngine/Include/GPUQREngine_Scheduler.hpp +++ b/SPQR/GPUQREngine/Include/GPUQREngine_Scheduler.hpp @@ -97,7 +97,7 @@ class Scheduler cudaStream_t memoryStreamD2H; /* Scheduler.cpp */ - void *operator new(long unsigned int, Scheduler * p){ return p; } + void *operator new(size_t, Scheduler * p){ return p; } Scheduler(Front *fronts, Int numFronts, size_t gpuMemorySize); ~Scheduler();