Merge branch 'master' of https://github.com/fortran-lang/stdlib

Author: arjenmarkus

.github/workflows/ci_windows.yml

@@ -41,3 +41,82 @@ jobs:
       with:
         name: WindowsCMakeTestlog
         path: build/Testing/Temporary/LastTest.log
+
+  msys2-build:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          { msystem: MSYS,    arch: x86_64 },
+          { msystem: MINGW64, arch: x86_64 },
+          { msystem: MINGW32, arch: i686   }
+        ]
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup MinGW native environment
+      uses: msys2/setup-msys2@v2
+      if: contains(matrix.msystem, 'MINGW')
+      with:
+        msystem: ${{ matrix.msystem }}
+        update: false
+        install: >-
+          git
+          mingw-w64-${{ matrix.arch }}-gcc
+          mingw-w64-${{ matrix.arch }}-gcc-fortran
+          mingw-w64-${{ matrix.arch }}-python
+          mingw-w64-${{ matrix.arch }}-python-pip
+          mingw-w64-${{ matrix.arch }}-cmake
+          mingw-w64-${{ matrix.arch }}-ninja
+
+    - name: Setup msys POSIX environment
+      uses: msys2/setup-msys2@v2
+      if: contains(matrix.msystem, 'MSYS')
+      with:
+        msystem: MSYS
+        update: false
+        install: >-
+          git
+          gcc
+          gcc-fortran
+          python
+          python-pip
+          cmake
+          ninja
+
+    - name: Install fypp
+      run: pip install fypp
+
+    - run: >-
+        cmake -G Ninja
+        -DCMAKE_SH="CMAKE_SH-NOTFOUND"
+        -Wdev
+        -B build
+        -DCMAKE_BUILD_TYPE=Debug
+        -DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
+        -DCMAKE_MAXIMUM_RANK=4
+      env:
+        FC: gfortran
+        CC: gcc
+        CXX: g++
+
+    - name: CMake build
+      run: cmake --build build --parallel
+
+    - name: catch build fail
+      run: cmake --build build --verbose --parallel 1
+      if: failure()
+
+    - name: CTest
+      run: ctest --output-on-failure --parallel -V -LE quadruple_precision
+      working-directory: build
+
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: WindowsCMakeTestlog
+        path: build/Testing/Temporary/LastTest.log

README.md

@@ -66,6 +66,25 @@ Alternatively, you can build using provided Makefiles:
 make -f Makefile.manual
 ```
 
+## Limiting the maximum rank of generated procedures
+
+Stdlib's preprocessor (fypp) by default generates specific procedures for arrays of all ranks, up to rank 15.
+This can result in long compilation times and, on some computers, exceeding available memory.
+If you know that you won't need all 15 ranks, you can specify the maximum rank for which the specific procedures will be generated.
+For example, with CMake:
+
+```sh
+cmake -B build -DCMAKE_MAXIMUM_RANK=4
+cmake --build build
+cmake --build build --target test
+```
+or as follows with `make`:
+
+```sh
+make -f Makefile.manual FYPPFLAGS=-DMAXRANK=4
+```
+Note that currently the minimum value for maximum rank is 4.
+
 ## Documentation
 
 Documentation is a work in progress (see issue #4) but is currently available at https://stdlib.fortran-lang.org.

doc/specs/stdlib_logger.md

@@ -8,19 +8,20 @@ title: logger
 ## Introduction
 
 This module defines a derived type, its methods, a variable, and
-constants to be used for the reporting of errors and other
-information. The derived type, `logger_type`, is to be used to define
-both global and local logger variables. The `logger_type` methods serve
-to configure the loggers and use the logger variables to report
-messages to a variable specific list of I/O units termed
-`log_units`. The variable, `global_logger`, of type `logger_type`, is
-intended to serve as the default global logger. The constants serve as
-error flags returned by the optional integer `stat` argument.
+constants to be used for the reporting of errors, displaying messages,
+and other information. The derived type, `logger_type`, is to be used
+to define both global and local logger variables. The `logger_type`
+methods serve to configure the loggers and use the logger variables to
+report messages to a variable specific list of I/O units termed
+`log_units`. The variable, `global_logger`, of type `logger_type`,
+is intended to serve as the default global logger. The constants serve
+as error flags returned by the optional integer `stat` argument.
 
 The logger variables have the option to:
 
 * change which units receive the log messages;
 * report which units receive the log messages;
+* select which types of messages are logged;
 * precede messages by a blank line;
 * precede messages by a time stamp of the form
   `yyyy-mm-dd hh:mm:ss.sss`;
@@ -64,6 +65,18 @@ Error Code             | Description
 `unopened_in_error`    | the unit was not opened
 `write_fault`          | one of the writes to `log_units` failed
 
+The module also defines eight distinct public integer constants for
+selecting the messages that are logged. These constants, termed
+severity levels, are (sorted following their increasing order of
+severity): `all_level`, `debug_level`, `information_level`,
+`warning_level`, `error_level`, `io_error_level`, `text_error_level`,
+and `none_level`.
+All log messages with a level (e.g., `debug_level`) lower than a
+specified severity level (e.g., `information_level`) will be ignored.
+The levels `error_level` and `io_error_level` have the same severity.
+The default severity level is `information_level`.
+
+
 ## The derived type: logger_type
 
 ### Status
@@ -81,14 +94,15 @@ significant events encountered during the execution of a program.
 
 ### Private attributes
 
-| Attribute        | Type          | Description                                     | Initial value |
-|------------------|---------------|-------------------------------------------------|--------------|
-| `add_blank_line` | Logical       | Flag to precede output with a blank line        | `.false.`    |
-| `indent_lines`   | Logical       | Flag to indent subsequent lines by four columns | `.true.`     |
-| `log_units`      | Integer array | List of I/O units used for output               | Unallocated  |
-| `max_width`      | Integer       | Maximum column width of output                  | 0            |
-| `time_stamp`     | Logical       | Flag to precede output by a time stamp          | `.true.`     |
-| `units`          | Integer       | Count of the number of active output units      | 0            |
+| Attribute        | Type          | Description                                     | Initial value       |
+|------------------|---------------|-------------------------------------------------|---------------------|
+| `add_blank_line` | Logical       | Flag to precede output with a blank line        | `.false.`           |
+| `indent_lines`   | Logical       | Flag to indent subsequent lines by four columns | `.true.`            |
+| `level`          | Integer       | Severity level                                  | `information_level` |
+| `log_units`      | Integer array | List of I/O units used for output               | Unallocated         |
+| `max_width`      | Integer       | Maximum column width of output                  | 0                   |
+| `time_stamp`     | Logical       | Flag to precede output by a time stamp          | `.true.`            |
+| `units`          | Integer       | Count of the number of active output units      | 0                   |
 
 ## The `stdlib_logger` variable
 
@@ -284,7 +298,7 @@ Reports the configuration of a logger.
 
 #### Syntax
 
-`call self % [[logger_type(type):configuration(bound)]]( [ add_blankline, indent, max_width, time_stamp, log_units ] )`
+`call self % [[logger_type(type):configuration(bound)]]( [ add_blankline, indent, level, max_width, time_stamp, log_units ] )`
 
 #### Class
 
@@ -303,6 +317,10 @@ Pure subroutine
   is an `intent(out)` argument. A value of `.true.` indents subsequent
   lines by four spaces, and `.false.` otherwise.
 
+`level` (optional): shall be a scalar default integer variable. It is an
+  `intent(out)` argument. The value corresponds to the severity level for
+  ignoring a message.
+
 `max_width` (optional): shall be a scalar default integer
   variable. It is an `intent(out)` argument. A positive value bigger
   than four defines the maximum width of the output, otherwise there
@@ -355,7 +373,7 @@ Configures the logging process for self.
 
 #### Syntax
 
-`call self % [[logger_type(type):configure(bound)]]( [ add_blank_line, indent, max_width, time_stamp ] )`
+`call self % [[logger_type(type):configure(bound)]]( [ add_blank_line, indent, level, max_width, time_stamp ] )`
 
 #### Class
 
@@ -375,6 +393,10 @@ Pure subroutine
   indent subsequent lines by four spaces, and to `.false.` to
   not indent.
 
+`level` (optional): shall be a scalar default integer expression. It is
+  an `intent(in)` argument. Set the severity level for ignoring a log
+  message.
+
 `max_width` (optional): shall be a scalar default integer
   expression. It is an `intent(in)` argument. Set to a positive value
   bigger than four to define the maximum width of the output,
@@ -416,6 +438,8 @@ If time stamps are active, a time stamp is written, followed
 by `module` and `procedure` if present, and then
 `message` is written with the prefix `'DEBUG: '`.
 
+It is ignored if the `level` of `self` is higher than `debug_level`.
+
 #### Class
 
 Subroutine
@@ -486,6 +510,8 @@ followed by `module` and `procedure` if present, then
 `message` is written with the prefix `'ERROR: '`, and then
 if `stat` or `errmsg` are present they are written.
 
+It is ignored if the `level` of `self` is higher than `error_level`.
+
 #### Class
 
 Subroutine
@@ -569,6 +595,8 @@ If time stamps are active, a time stamp is written, followed
 by `module` and `procedure` if present, and then
 `message` is written with the prefix `'INFO: '`.
 
+It is ignored if the `level` of `self` is higher than `information_level`.
+
 #### Class
 
 Subroutine
@@ -637,6 +665,8 @@ written. Then `message` is written with the prefix
 `'I/O ERROR: '`. Then if `iostat` or `iomsg` are present they are
 written.
 
+It is ignored if the `level` of `self` is higher than `io_error_level`.
+
 #### Syntax
 
 `call self % [[logger_type(type):log_io_error(bound)]]( message [, module, procedure, iostat, iomsg ] )`
@@ -714,6 +744,8 @@ If time stamps are active, a time stamp is written,
 then `module` and `procedure` are written if present,
 followed by `prefix \\ ': '`, if present, and finally `message`.
 
+No severity level is applied to `log_message`.
+
 #### Syntax
 
 `call self % [[logger_type(type):log_message(bound)]]( message [, module, procedure, prefix ] )`
@@ -790,6 +822,8 @@ written with `column`. Then `line` is written. Then a caret, '^', is
 written below `line` at the column indicated by `column`. Then
 `summary` is written below the caret.
 
+It is ignored if the `level` of `self` is higher than `text_error_level`.
+
 #### Syntax
 
 `call self % [[logger_type(type):log_text_error(bound)]]( line, column, summary [, filename, line_number, caret, stat ] )`

src/CMakeLists.txt

@@ -14,6 +14,9 @@ set(fppFiles
     stdlib_stats_cov.fypp
     stdlib_stats_mean.fypp
     stdlib_stats_moment.fypp
+    stdlib_stats_moment_all.fypp
+    stdlib_stats_moment_mask.fypp
+    stdlib_stats_moment_scalar.fypp
     stdlib_stats_var.fypp
     stdlib_quadrature.fypp
     stdlib_quadrature_trapz.fypp

src/Makefile.manual

@@ -15,6 +15,9 @@ SRC = f18estop.f90 \
       stdlib_stats.f90 \
       stdlib_stats_mean.f90 \
       stdlib_stats_moment.f90 \
+      stdlib_stats_moment_all.f90 \
+      stdlib_stats_moment_mask.f90 \
+      stdlib_stats_moment_scalar.f90 \
       stdlib_stats_var.f90
 
 LIB = libstdlib.a
@@ -79,4 +82,7 @@ stdlib_quadrature.f90: stdlib_quadrature.fypp
 stdlib_stats.f90: stdlib_stats.fypp
 stdlib_stats_mean.f90: stdlib_stats_mean.fypp
 stdlib_stats_moment.f90: stdlib_stats_moment.fypp
+stdlib_stats_moment_all.f90: stdlib_stats_moment_all.fypp
+stdlib_stats_moment_mask.f90: stdlib_stats_moment_mask.fypp
+stdlib_stats_moment_scalar.f90: stdlib_stats_moment_scalar.fypp
 stdlib_stats_var.f90: stdlib_stats_var.fypp