Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build system cleanup #743

Merged
merged 4 commits into from
Aug 31, 2023
Merged

Build system cleanup #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1dcc368
remove xsdk option, compatible by default
mkstoyanov Aug 23, 2023
48e37d1
updated some comments
mkstoyanov Aug 23, 2023
3212d02
fix old fortran library name
mkstoyanov Aug 23, 2023
d6f77d9
report 2 digit name in fortran
mkstoyanov Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.19)

cmake_policy(VERSION 3.19)
project(Tasmanian VERSION 7.10.0 LANGUAGES CXX)
set(Tasmanian_version_comment " (development)") # e.g., " (release candidate)", " (development)", ""
set(Tasmanian_version_comment " (release candidate)") # e.g., " (release candidate)", " (development)", ""
set(Tasmanian_license "BSD 3-Clause with UT-Battelle disclaimer") # used in some headers and python modules (only human readable)

########################################################################
Expand Down Expand Up @@ -70,22 +70,21 @@ set(Tasmanian_license "BSD 3-Clause with UT-Battelle disclaimer") # used in some
# 6. Print final messages
########################################################################

option(USE_XSDK_DEFAULTS "Enable xSDK compatibility" OFF)
option(BUILD_SHARED_LIBS "Specify shared or static libraries for Tasmanian" ON)
option(Tasmanian_ENABLE_RECOMMENDED "Enable (if found) OpenMP, BLAS, and Python, also set optimization flags" OFF)
option(Tasmanian_ENABLE_RECOMMENDED "Enable (if found) OpenMP, BLAS, and Python, also sets optimization flags" OFF)
option(Tasmanian_ENABLE_OPENMP "Enable OpenMP support for Tasmanian (recommended)" OFF)
option(Tasmanian_ENABLE_BLAS "Enable CPU Blas support for Tasmanian (recommended)" OFF)
option(Tasmanian_ENABLE_PYTHON "Enable Python interface for Tasmanian (recommended)" OFF)
option(Tasmanian_ENABLE_CUDA "Enable Nvidia CUDA kernels and libraries within Tasmanian (stable)" OFF)
option(Tasmanian_ENABLE_HIP "Enable AMD HIP kernels and ROCm libraries within Tasmanian (stable)" OFF)
option(Tasmanian_ENABLE_DPCPP "Enable Intel DPC++ kernels and libraries within Tasmanian (mostly stable)" OFF)
option(Tasmanian_ENABLE_DPCPP "Enable Intel DPC++ kernels and libraries within Tasmanian (stable)" OFF)
option(Tasmanian_ENABLE_MAGMA "Enable acceleration using UTK Magma library within Tasmanian (stable)" OFF)
option(Tasmanian_ENABLE_FORTRAN "Enable Fortran interface for Tasmanian (stable)" OFF)
option(Tasmanian_ENABLE_MPI "Enable MPI support for Tasmanian (stable)" OFF)
option(Tasmanian_ENABLE_SWIG "Regenerate Fortran 2003 bindings with SWIG" OFF)
option(Tasmanian_ENABLE_SWIG "Regenerate Fortran 2003 bindings with SWIG (developers only)" OFF)
option(Tasmanian_ENABLE_DOXYGEN "Enable Doxygen documentation for Tasmanian (complete)" OFF)

option(Tasmanian_ENABLE_FORTRAN90 "(deprecated) Enable the old Fortran 90 interface of Tasmanian" OFF)
option(Tasmanian_ENABLE_FORTRAN90 "(deprecated, untested) Enable the old Fortran 90 interface of Tasmanian" OFF)

# treat those similar to options, but give values other than ON/OFF
set(Tasmanian_MATLAB_WORK_FOLDER "" CACHE PATH "Enable MATLAB interface and use the path for the MATLAB work folder (stable)")
Expand Down
3 changes: 0 additions & 3 deletions Config/TasmanianConfig.in.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
#define Tasmanian_ENABLE_GPU // One GPU definition
#endif

// used mostly to suppress default cerr messages
#cmakedefine USE_XSDK_DEFAULTS

// handle variations in library standards
#cmakedefine Tasmanian_BLAS_HAS_ZGELQ

Expand Down
2 changes: 1 addition & 1 deletion Config/TasmanianMakefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Tasmanian_include = -I@Tasmanian_final_install_path@/include/
Tasmanian_link = -L@Tasmanian_final_install_path@/lib/
Tasmanian_libs = -ltasmaniandream -ltasmaniansparsegrid @Tasmanian_libs@
Tarmanian_fortran_libs = -ltasmanianfortran90 $(Tasmanian_libs) -lstdc++
Tarmanian_fortran_libs = -ltasmanianfortran $(Tasmanian_libs) -lstdc++
2 changes: 1 addition & 1 deletion InterfaceSwig/FortranTests/fortranswigtester.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ program FORSWIGTESTER
integer :: i

write(*,*)
write(*,'(a,i1,a,i1)') 'Testing Tasmanian Fortran 2003-SWIG interface: version ', &
write(*,'(a,i1,a,i2)') 'Testing Tasmanian Fortran 2003-SWIG interface: version ', &
grid%getVersionMajor(), ".", grid%getVersionMinor()
write(*,*)

Expand Down
Loading