Skip to content

Commit

Permalink
Merge pull request #174 from DrTimothyAldenDavis/dev2
Browse files Browse the repository at this point in the history 
demo options
  • Loading branch information
@DrTimothyAldenDavis
DrTimothyAldenDavis authored Nov 10, 2022
2 parents 891f861 + 6276edd commit d42beeb
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 1 deletion.
1 change: 1 addition & 0 deletions AMD/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions CAMD/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions CCOLAMD/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions CHOLMOD/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions COLAMD/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions CSparse/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions CXSparse/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
15 changes: 14 additions & 1 deletion GraphBLAS/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ endif ( )

option ( NOPENMP "ON: do not use OpenMP. OFF (default): use OpenMP" off )
if ( NOPENMP )
# OpenMP has been disabled
# OpenMP has been disabled.

set ( OPENMP_FOUND false )
else ( )
find_package ( OpenMP )
Expand Down Expand Up @@ -372,6 +373,17 @@ if ( OPENMP_FOUND )
message ( STATUS "CMAKE OpenMP C flags: " ${OpenMP_C_FLAGS} )
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS} " )
include_directories ( ${OpenMP_C_INCLUDE_DIRS} )
else ( )
message ( WARNING
"WARNING: OpenMP was not found (or was disabled with NOPENMP). See the "
"GrapBLAS user guide on the consequences of compiling GraphBLAS without "
"OpenMP. GraphBLAS will work but may not be thread-safe, since it relies "
"on '#pragma omp flush' to ensure the work performed by one user thread is "
"available to another, in GrB_wait. If OpenMP is not in use, the "
"thread-safety of GrB_wait becomes the responsibilty of the user "
"application (perhaps through a pthreads construct). Compiling GraphBLAS "
"without OpenMP is not recommended for installation in a package manager "
"(Linux, conda-forge, spack, brew, vcpkg, etc). " )
endif ( )

if ( SUITESPARSE_CUDA )
Expand All @@ -391,6 +403,7 @@ message ( STATUS "CMAKE C flags: " ${CMAKE_C_FLAGS} )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
Binary file modified GraphBLAS/Doc/GraphBLAS_UserGuide.pdf
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions GraphBLAS/Doc/GraphBLAS_UserGuide.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8595,6 +8595,9 @@ \subsection{OpenMP parallelism}
if (!have_openmp) printf ("GraphBLAS not compiled with OpenMP\n") :
\end{verbatim}

Compiling GraphBLAS without OpenMP is not recommended for installation in a
package manager (Linux, conda-forge, spack, brew, vcpkg, etc).

%-------------------------------------------------------------------------------
\subsection{Storing a matrix by row or by column}
%-------------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions KLU/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions LDL/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions RBio/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,11 @@ Module. Debug mode will be used. The static libraries will not be built
Note that BLAS and LAPACK may still use OpenMP
internally; if you wish to disable OpenMP in an entire
application, select a single-threaded BLAS/LAPACK.
WARNING: GraphBLAS may not be thread-safe if built
without OpenMP (see the User Guide for details).

DEMO if true: build the demo programs for each package.
Default: false.

Additional options are available within specific packages:

Expand Down
1 change: 1 addition & 0 deletions SPEX/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions SPQR/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions UMFPACK/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ endif ( )
# Demo library and programs
#-------------------------------------------------------------------------------

option ( DEMO "ON: Build the demo programs. OFF (default): do not build the demo programs." off )
if ( DEMO )

#---------------------------------------------------------------------------
Expand Down

0 comments on commit d42beeb

Please sign in to comment.