Skip to content

Commit f38d677

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
authored
Merge pull request #542 from syby119/yy/windows_compliation
2 parents 3d6576a + 458c87f commit f38d677

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

‎CHOLMOD/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,13 +504,13 @@ if ( SUITESPARSE_CUDA )
504504
endif ( )
505505
if ( BUILD_SHARED_LIBS )
506506
target_link_libraries ( CHOLMOD PRIVATE CUDA::nvrtc CUDA::cudart_static
507-
CUDA::nvToolsExt CUDA::cublas )
507+
CUDA::nvtx3 CUDA::cublas )
508508
target_include_directories ( CHOLMOD INTERFACE
509509
$<TARGET_PROPERTY:CUDA::cublas,INTERFACE_INCLUDE_DIRECTORIES> )
510510
endif ( )
511511
if ( BUILD_STATIC_LIBS )
512512
target_link_libraries ( CHOLMOD_static PUBLIC CUDA::nvrtc CUDA::cudart_static
513-
CUDA::nvToolsExt CUDA::cublas )
513+
CUDA::nvtx3 CUDA::cublas )
514514
endif ( )
515515

516516
set ( old_CMAKE_EXTRA_INCLUDE_FILES CMAKE_EXTRA_INCLUDE_FILES )
@@ -804,7 +804,7 @@ add_test ( NAME CHOLMOD_int64_single_supernodal
804804
if ( WIN32 AND BUILD_SHARED_LIBS )
805805
# Set PATH to pick up the necessary libraries for all tests
806806

807-
set ( CHOLMOD_CTEST_NAMES
807+
set ( CHOLMOD_CTEST_NAMES
808808
CHOLMOD_int32_double_bcsstk01 CHOLMOD_int64_double_bcsstk01 CHOLMOD_int32_single_bcsstk01 CHOLMOD_int64_single_bcsstk01
809809
CHOLMOD_int32_double_lp_afiro CHOLMOD_int64_double_lp_afiro CHOLMOD_int32_single_lp_afiro CHOLMOD_int64_single_lp_afiro
810810
CHOLMOD_int32_double_can24 CHOLMOD_int64_double_can24 CHOLMOD_int32_single_can24 CHOLMOD_int64_single_can24

‎CHOLMOD/GPU/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ endif ( )
9090

9191
if ( BUILD_SHARED_LIBS )
9292
target_link_libraries ( CHOLMOD_CUDA PRIVATE CUDA::nvrtc CUDA::cudart_static
93-
CUDA::nvToolsExt CUDA::cublas )
93+
CUDA::nvtx3 CUDA::cublas )
9494
endif ( )
9595
if ( BUILD_STATIC_LIBS )
9696
target_link_libraries ( CHOLMOD_CUDA_static PUBLIC CUDA::nvrtc CUDA::cudart_static
97-
CUDA::nvToolsExt CUDA::cublas )
97+
CUDA::nvtx3 CUDA::cublas )
9898
endif ( )
9999

100100
#-------------------------------------------------------------------------------

‎SPQR/GPUQREngine/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ message ( STATUS "Building SPQR/GPUQRENGINE version: v"
2121
# define the project
2222
#-------------------------------------------------------------------------------
2323

24-
project ( gpuqrengine
24+
project ( gpuqrengine
2525
VERSION "${SPQR_VERSION_MAJOR}.${SPQR_VERSION_MINOR}.${SPQR_VERSION_SUB}"
2626
LANGUAGES CXX CUDA )
2727

@@ -100,7 +100,7 @@ if ( BUILD_SHARED_LIBS )
100100
CUDA_RESOLVE_DEVICE_SYMBOLS ON
101101
CUDA_RUNTIME_LIBRARY Static )
102102
target_link_libraries ( GPUQREngine PRIVATE
103-
CUDA::nvrtc CUDA::cudart_static CUDA::nvToolsExt CUDA::cublas )
103+
CUDA::nvrtc CUDA::cudart_static CUDA::nvtx3 CUDA::cublas )
104104
target_compile_definitions ( GPUQREngine PRIVATE "SUITESPARSE_CUDA" )
105105

106106
target_include_directories ( GPUQREngine
@@ -138,7 +138,7 @@ if ( BUILD_STATIC_LIBS )
138138
CUDA_RESOLVE_DEVICE_SYMBOLS ON
139139
CUDA_RUNTIME_LIBRARY Static )
140140
target_link_libraries ( GPUQREngine_static PUBLIC
141-
CUDA::nvrtc CUDA::cudart_static CUDA::nvToolsExt CUDA::cublas )
141+
CUDA::nvrtc CUDA::cudart_static CUDA::nvtx3 CUDA::cublas )
142142
target_compile_definitions ( GPUQREngine_static PRIVATE "SUITESPARSE_CUDA" )
143143

144144
target_include_directories ( GPUQREngine_static

‎SPQR/GPUQREngine/Include/GPUQREngine_BucketList.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ template <typename Int = int64_t> class BucketList
7272
int VThead; // Index of the first available entry in VTlist
7373

7474
// Constructors
75-
void *operator new(long unsigned int, BucketList <Int>* p)
75+
void *operator new(size_t, BucketList <Int>* p)
7676
{
7777
return p;
7878
}

‎SPQR/GPUQREngine/Include/GPUQREngine_Front.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ template <typename Int = int64_t> class Front
5353
/* Debug Fields */
5454
bool printMe;
5555

56-
void* operator new(long unsigned int reqMem, Front* ptr){ return ptr; }
56+
void* operator new(size_t reqMem, Front* ptr){ return ptr; }
5757

5858
Front(
5959
Int fids_arg, // the front identifier

‎SPQR/GPUQREngine/Include/GPUQREngine_LLBundle.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ template <typename Int = int64_t> class LLBundle
7676

7777
TaskType CurrentTask;
7878

79-
void *operator new(long unsigned int, LLBundle <Int>* p){ return p; }
79+
void *operator new(size_t, LLBundle <Int>* p){ return p; }
8080
//------------------------------------------------------------------------------
8181
//
8282
// This file contains the constructor and destructor for the LLBundle class.

‎SPQR/GPUQREngine/Include/GPUQREngine_Scheduler.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Scheduler
9797
cudaStream_t memoryStreamD2H;
9898

9999
/* Scheduler.cpp */
100-
void *operator new(long unsigned int, Scheduler <Int>* p){ return p; }
100+
void *operator new(size_t, Scheduler <Int>* p){ return p; }
101101
Scheduler(Front <Int> *fronts, Int numFronts, size_t gpuMemorySize);
102102
~Scheduler();
103103

‎SPQR/GPURuntime/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ message ( STATUS "Building SPQR/GPURUNTIME version: v"
2121
# define the project
2222
#-------------------------------------------------------------------------------
2323

24-
project ( suitesparse_gpuruntime
24+
project ( suitesparse_gpuruntime
2525
VERSION "${SPQR_VERSION_MAJOR}.${SPQR_VERSION_MINOR}.${SPQR_VERSION_SUB}"
2626
LANGUAGES C CXX CUDA )
2727

@@ -78,10 +78,10 @@ if ( BUILD_SHARED_LIBS )
7878
CUDA_SEPARABLE_COMPILATION ON
7979
CUDA_RUNTIME_LIBRARY Static )
8080
target_link_libraries ( GPURuntime PRIVATE
81-
CUDA::nvrtc CUDA::cudart_static CUDA::nvToolsExt CUDA::cublas )
81+
CUDA::nvrtc CUDA::cudart_static CUDA::nvtx3 CUDA::cublas )
8282
target_compile_definitions ( GPURuntime PRIVATE "SUITESPARSE_CUDA" )
8383

84-
target_include_directories ( GPURuntime
84+
target_include_directories ( GPURuntime
8585
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
8686
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )
8787
endif ( )
@@ -114,10 +114,10 @@ if ( BUILD_STATIC_LIBS )
114114
CUDA_SEPARABLE_COMPILATION ON
115115
CUDA_RUNTIME_LIBRARY Static )
116116
target_link_libraries ( GPURuntime_static PUBLIC
117-
CUDA::nvrtc CUDA::cudart_static CUDA::nvToolsExt CUDA::cublas )
117+
CUDA::nvrtc CUDA::cudart_static CUDA::nvtx3 CUDA::cublas )
118118
target_compile_definitions ( GPURuntime_static PRIVATE "SUITESPARSE_CUDA" )
119119

120-
target_include_directories ( GPURuntime_static
120+
target_include_directories ( GPURuntime_static
121121
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
122122
$<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )
123123
endif ( )

‎SPQR/SPQRGPU/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ message ( STATUS "Building SPQR_CUDA version: v"
2020

2121
include ( SuiteSparsePolicy )
2222

23-
project ( spqr_cuda
23+
project ( spqr_cuda
2424
VERSION "${SPQR_VERSION_MAJOR}.${SPQR_VERSION_MINOR}.${SPQR_VERSION_SUB}"
2525
LANGUAGES CXX )
2626
message ( STATUS "C++ flags for CUDA: ${CMAKE_CXX_FLAGS}" )
@@ -71,7 +71,7 @@ if ( BUILD_SHARED_LIBS )
7171
target_link_libraries ( SPQR_CUDA PRIVATE SuiteSparse::CHOLMOD )
7272

7373
target_link_libraries ( SPQR_CUDA PRIVATE CUDA::nvrtc CUDA::cudart_static
74-
CUDA::nvToolsExt CUDA::cublas )
74+
CUDA::nvtx3 CUDA::cublas )
7575
endif ( )
7676

7777
if ( BUILD_STATIC_LIBS )
@@ -93,7 +93,7 @@ if ( BUILD_STATIC_LIBS )
9393
endif ( )
9494

9595
target_link_libraries ( SPQR_CUDA_static PUBLIC CUDA::nvrtc CUDA::cudart_static
96-
CUDA::nvToolsExt CUDA::cublas )
96+
CUDA::nvtx3 CUDA::cublas )
9797
endif ( )
9898

9999
#-------------------------------------------------------------------------------

0 commit comments

Comments
 (0)