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

WIP: Experimental fpm build #753

Draft
wants to merge 31 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9275b82
feat: rm installation script & supporting scripts
rouson Mar 23, 2022
040f5fa
refac: mv tests to fpm-defualt location
rouson Mar 23, 2022
cd15f1b
rm legacy gasnet-1 layer
rouson Mar 23, 2022
9b88425
rm static Makefile/make.inc files
rouson Mar 23, 2022
574c60d
rm iso-fortran-bindin dir
rouson Mar 23, 2022
1198df8
rm opencoarrays.F90 wrappers
rouson Mar 23, 2022
b4ad48d
temporarily hide tests from fpm
rouson Mar 25, 2022
cda9e57
build(fpm): add experimental fpm build
rouson Mar 25, 2022
fddc89b
feat(fpm): add experimental run-fpm.sh script
rouson Apr 23, 2022
1935b64
feat(fpm): run-fpm.sh accepts arguments
rouson Apr 24, 2022
e70895f
feat(fpm): add library installation to manifest
rouson Apr 24, 2022
85c699f
feat(fpm): add install.sh
rouson Apr 24, 2022
74d7313
WIP: customize caf script
rouson Apr 25, 2022
5983fa9
Update install.sh
rouson Apr 26, 2022
33d2f01
fix(install.sh): rm typ in mpicc invocation
rouson Apr 26, 2022
b9f8ba3
feat(install.sh): write working caf script
rouson Apr 26, 2022
e7370f9
feat(install.sh): write working cafrun script
rouson Apr 26, 2022
aec955e
refac: mv script templates to script-templates dir
rouson Apr 27, 2022
5ec6ea2
fix(install.sh): correct cafrun args
rouson Apr 27, 2022
d4e463e
update version to 3.0.0
rouson Apr 27, 2022
19a3f04
doc(install.sh): better post-install output
rouson Apr 27, 2022
1eaad36
feat(install.sh): write & verify pkg-config file
rouson Apr 27, 2022
67c9598
doc(AUTHORS.md): add Brad Richardson
rouson Apr 28, 2022
36c0b41
git mv script-templates to src
rouson Apr 28, 2022
448252f
WIP: add Garden unit tests; single-image runs pass
rouson Apr 28, 2022
2a64b1f
WIP: replace run-fpm.sh with install.rsp-template
rouson May 1, 2022
ad2bfc8
fix(install.sh): support Linux in sed command
rouson May 1, 2022
41fd892
fix(install.sh): mixed up MPICC and MPIFC
everythingfunctional May 2, 2022
5e7c0a3
feat(install.sh): set -o pipefail
rouson May 2, 2022
8f1de42
install.sh: fix #756
rouson May 2, 2022
9c9380f
fix(install.sh): update user/developer directions
rouson May 23, 2022
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
2 changes: 1 addition & 1 deletion .VERSION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$Format:%d%n%n$
# Fall back version, probably last release:
2.9.2
3.0.0

# OpenCoarrays version file. This project uses semantic
# versioning. For details see http://semver.org
Expand Down
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Download this file as a PDF document
- [X] Götz Waschk <goetz.waschk@desy.de> @LaHaine
- [ ] John C. Linford <jlinford@paratools.com>
- [ ] Daniel Carrera <dcarrera@gmail.com>
- [ ] Brad Richardson <brad@archaeologic.codes>

[top]

Expand Down
5 changes: 5 additions & 0 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,8 @@ Configure options
For a look at all of the possible CMake settings, many/most of which are
default CMake options, please run `ccmake /path/to/source` or
`cmake-gui /path/to/source`.

Experimental fpm build
----------------------

./run-fpm.sh
4 changes: 4 additions & 0 deletions example/hello.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
program main
implicit none
print*,"Hello from image ",this_image()
end program
3 changes: 3 additions & 0 deletions example/support-test/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Test Support
------------
The programs in this directory intentionally error-terminate to support the `error stop` tests in `test/caf_error_stop.f90`, which use Fortran's `execute_command_line` to run the programms in this directory and check for the expected non-zero stop codes. Running the tests in this manner enables the Vegetable tests to continue executing in the presence of error-terminating tests.
7 changes: 7 additions & 0 deletions example/support-test/error_stop_character_code.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
program error_stop_character_code
implicit none

error stop ""

stop 0 ! ../../test/error_stop_test.f90 will report a test failure if this line runs
end program
7 changes: 7 additions & 0 deletions example/support-test/error_stop_integer_code.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
program error_stop_integer_code
implicit none

error stop

stop 0 ! caffeine/test/error_stop_test.f90 reports a failure if this line runs
end program
7 changes: 7 additions & 0 deletions example/support-test/normal_termination.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
program normal_termination
implicit none

stop 0

stop 1 ! opencoarrays/test/zzz_finalization_test.f90 reports a failure if this line runs
end program
13 changes: 13 additions & 0 deletions fpm.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name = "opencoarrays"
version = "3.0.0"
license = "BSD"
author = ["Sourcery Institute"]
maintainer = "damian@archaeologic.codes"
copyright = "2015-2022 Sourcery Institute"

[install]
library = true

[dev-dependencies]
garden = {git = "https://gitlab.com/everythingfunctional/garden", tag = "v1.0.1"}
assert= {git = "https://github.com/sourceryinstitute/assert", tag = "1.3.0"}
Loading