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.

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

Add CMake functionality #12

Open
wants to merge 48 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9ad92e0
Copy .VERSION & main CMakeLists from OpenCoarrays
rouson Dec 13, 2017
c889077
Copy "cmake/" subdirectory from OpenCoarrays
rouson Dec 13, 2017
79dd803
Adapt "cmake/" subdirectory to PSBLAS
rouson Dec 13, 2017
7b8e929
Adapt .VERSION & CMakeLists.txt to PSBLAS
rouson Dec 13, 2017
ee2cb24
Add base library build
rouson Dec 13, 2017
3612330
Move add_library from main CMakeLists to base dir
rouson Dec 13, 2017
9f06a73
cmake base build fails @34% on finidng psb_sxdotvs
rouson Dec 14, 2017
51e89d0
Remove legacy file: psb_sxdot.f90
rouson Dec 14, 2017
5c72f3f
Remove unnecessary -DSERIAL_MPI
rouson Dec 14, 2017
a1daf4e
Work around CMake bug: #if (defined)->#ifdef
rouson Dec 14, 2017
936ee0f
Add subdirectories
rouson Dec 14, 2017
9d15f21
CMake build works for base, krylov, prec, util
rouson Dec 14, 2017
b63f63b
Correct typo in a comment
rouson Dec 14, 2017
37c4024
Match CMake lib OUTPUT_NAME to current practice
rouson Dec 14, 2017
c171e9a
WIP: Add test subdirectory; tests fail to link
rouson Dec 15, 2017
5a582ac
Only build static OR shared libs
zbeekman Dec 18, 2017
2ec9106
Build a smaller subset of tests
zbeekman Dec 18, 2017
fe2569e
mv aux->auxil for windows & abstract/trim buildsys
zbeekman Jan 2, 2018
e5571d1
Fix CMake errors
zbeekman Jan 2, 2018
dde3bb6
White space changes only
zbeekman Feb 6, 2018
dcf61f9
Commit old changes, this may be a partially functional WIP
zbeekman Jun 5, 2018
ee1b2f6
Clean/refactor CMake build to add upstream changes
zbeekman Dec 17, 2018
f939763
Install and stage module files to includedir
zbeekman Dec 17, 2018
08b653e
Handle cross-platform eol correctly in git
zbeekman Jan 3, 2019
3290dcf
Add missing srcs & alphabetize in base CMakeLists
zbeekman Jan 8, 2019
7ee5a6a
This should fix psblas errors on windows
zbeekman Jan 18, 2019
d8f7e0e
Tell git to ignore psblas build directory
zbeekman Jan 18, 2019
104a827
Correctly set defines when METIS found
zbeekman Jan 18, 2019
db917d5
Fix finding metis header
zbeekman Jan 18, 2019
0fe562b
Attempt fix for missing windows includes
zbeekman Jan 18, 2019
cdf006c
Try to define a header for mpi_wtime
zbeekman Jan 18, 2019
ac57216
Fix _WIN32 macro
zbeekman Jan 18, 2019
bb45b40
Re-order include and try typedef
zbeekman Jan 18, 2019
7b3422a
Try Salvatore's timer function on windows
zbeekman Jan 18, 2019
4866275
Add back Windows.h header
zbeekman Jan 18, 2019
e5708f3
Try pre-compiled headers? maybe?
zbeekman Jan 18, 2019
73faf63
Try using Int64 instead of LARGE_INTEGER
zbeekman Jan 18, 2019
90fefd6
Try different type definition
zbeekman Jan 18, 2019
08450e5
Use static libs for C code instead of object libs
zbeekman Jan 21, 2019
3fba296
Fix bad include/libname in CMake
zbeekman Jan 21, 2019
8173b8c
Fix logic for windows & METIS
zbeekman Jan 21, 2019
b397587
Remove define breaking windows build
zbeekman Jan 21, 2019
9cac875
Fix typecast fake MPI_wtime on WIN32
zbeekman Jan 21, 2019
9d0edab
Fix setting/detecting Fortran name-mangling
zbeekman Jan 21, 2019
3578761
Fix missing symbols when using fakempi.c
zbeekman Jan 21, 2019
ce8b054
Attempt static linking of BLAS
zbeekman Jan 22, 2019
b6fe5e9
On macOS use system LAPACK (no static libs)
zbeekman Jan 22, 2019
8166256
Enable PSBLAS to find & build w/ OpenCoarrays
zbeekman May 21, 2019
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
12 changes: 12 additions & 0 deletions .VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
$Format:%d%n%n$
# Fall back version, probably last release:
3.5.0

# PSBLAS version file.
#
# Release archive created from commit:
# $Format:%H %d$
# $Format:Created on %ci by %cN, and$
# $Format:signed by %GS using %GK.$
# $Format:Signature status: %G?$
$Format:%GG$
47 changes: 47 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Handle eol correctly: Commit unix-style, checkout as native
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text
*.f90 text
*.F90 text
*.md text
*.txt text
*.sh text
*.cu text
*.x64 text

# Denote all files that are truly binary and should not be modified.
*.mod binary
*.o binary
*.a binary
*.tar binary
*.gz binary
*.tgz binary
*.enc binary
*.pdf binary
*.png binary
*.jpg binary
*.bmp binary
*.gig binary

# Handle windows specific files correctly
*.sln eol=crlf
*.suo eol=crlf
*.vcxproj eol=crlf
*.vcxitems eol=crlf

# Prevent dev-ops files from making it into the release archives
.travis.yml export-ignore
.pullapprove.yml export-ignore
.gitattributes export-ignore
.gitignore export-ignore
codecov.yml export-ignore
*.enc export-ignore
.github export-ignore
.Dockerfiles export-ignore

# Perform substitutions when `git export`ing these files
.VERSION export-subst
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*.mod
*~

build

# header files generated
cbind/*.h

Expand Down
Loading