Skip to content

Commit e208c2b

Browse files
committed
Merge remote-tracking branch 'upstream/master' into extract_demo
2 parents bf00288 + 78a680a commit e208c2b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,14 @@ Important options are
133133
Compiling with maximum rank 15 can be resource intensive and requires at least 16 GB of memory to allow parallel compilation or 4 GB memory for sequential compilation.
134134
- `-DBUILD_SHARED_LIBS` set to `on` in case you want link your application dynamically against the standard library (default: `off`).
135135
- `-DBUILD_TESTING` set to `off` in case you want to disable the stdlib tests (default: `on`).
136+
- `-DCMAKE_VERBOSE_MAKEFILE` is by default set to `Off`, but if set to `On` will show commands used to compile the code.
137+
- `-DCMAKE_BUILD_TYPE` is by default set to `RelWithDebInfo`, which uses compiler flags suitable for code development (but with only `-O2` optimization). Beware the compiler flags set this way will override any compiler flags specified via `FFLAGS`. To prevent this, use `-DCMAKE_BUILD_TYPE=NoConfig` in conjunction with `FFLAGS`.
136138

137-
For example, to configure a build using the Ninja backend while specifying compiler flags `FFLAGS`, generating procedures up to rank 7, and installing to your home directory, use
139+
For example, to configure a build using the Ninja backend while specifying compiler optimization via `FFLAGS`, generating procedures up to rank 7, installing to your home directory, using the `NoConfig` compiler flags, and printing the compiler commands, use
138140

139141
```sh
140142
export FFLAGS="-O3"
141-
cmake -B build -G Ninja -DCMAKE_MAXIMUM_RANK:String=7 -DCMAKE_INSTALL_PREFIX=$HOME/.local
143+
cmake -B build -G Ninja -DCMAKE_MAXIMUM_RANK:String=7 -DCMAKE_INSTALL_PREFIX=$HOME/.local -DCMAKE_VERBOSE_MAKEFILE=On -DCMAKE_BUILD_TYPE=NoConfig
142144
```
143145

144146
To build the standard library run

doc/specs/stdlib_hashmaps.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This document discusses the hash maps in the Fortran Standard Library.
2121

2222
The Fortran Standard Library is distributed under the MIT License.
2323
However components of the library should be evaluated as to whether
24-
they are compatible with the MTI License.
24+
they are compatible with the MIT License.
2525
The current hash maps were inspired by an
2626
[implementation](http://chasewoerner.org/src/hasht/) of David
2727
Chase. While the code has been greatly modified from his
@@ -485,7 +485,7 @@ an allocatable of `class(*)`. It is an `intent(out)` argument.
485485
```
486486

487487

488-
#### `hasher_fun`- serves aa a function prototype.
488+
#### `hasher_fun`- serves as a function prototype.
489489

490490
##### Status
491491

@@ -1337,7 +1337,7 @@ Subroutine
13371337
error code.
13381338

13391339
* If `slots_bits` is absent then the effective value for `slots_bits`
1340-
is `default_slots_bits`.
1340+
is `default_bits`.
13411341

13421342
`status` (optional): shall be a scalar integer variable of kind
13431343
`int32`. It is an `intent(out)` argument. On return if present it

0 commit comments

Comments
 (0)