Skip to content

Commit

Permalink
Merge pull request #17 from jchristopherson/v1.2.6
Browse files Browse the repository at this point in the history
Bug fix in Box-Muller code
  • Loading branch information
jchristopherson authored Feb 3, 2025
2 parents b5fa290 + 31e6180 commit e55dae1
Show file tree
Hide file tree
Showing 117 changed files with 426 additions and 429 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
toolchain: {compiler: intel, version: '2023.2'}

steps:
- uses: awvwgk/setup-fortran@v1
- uses: awvwgk/setup-fortran@v1.6.1
id: setup-fortran
with:
compiler: ${{ matrix.toolchain.compiler }}
Expand Down
116 changes: 61 additions & 55 deletions .github/workflows/fpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
gcc_v: [10] # Version of GFortran we want to use.
gcc_v: [12] # Version of GFortran we want to use.
include:
- os: ubuntu-latest
os-arch: linux-x86_64
Expand All @@ -22,26 +22,25 @@ jobs:
- name: Checkout code
uses: actions/checkout@v1

- name: Install GFortran macOS
if: contains(matrix.os, 'macos')
run: |
ln -s /usr/local/bin/gfortran-${GCC_V} /usr/local/bin/gfortran
which gfortran-${GCC_V}
which gfortran
- name: Install GFortran Linux
if: contains(matrix.os, 'ubuntu')
run: |
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
--slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
- name: Install BLAS & LAPACK
if: contains(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install libopenblas-dev liblapack-dev
- name: Install fpm
uses: fortran-lang/setup-fpm@v3
uses: fortran-lang/setup-fpm@v5
with:
fpm-version: 'v0.10.0'
fpm-version: 'v0.10.1'

- name: Build the library
- name: Build LINALG
run: |
gfortran --version
fpm build
Expand Down Expand Up @@ -80,47 +79,54 @@ jobs:
run: |
fpm test
intel-build:
runs-on: ubuntu-latest
strategy:
fail-fast: false

env:
FPM_FC: ifx
FC: ifx

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Add Intel repository (Linux)
run: |
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo apt-get update
- name: Install Intel oneAPI compiler (Linux)
run: |
sudo apt-get install intel-oneapi-compiler-fortran
- name: Setup Intel oneAPI environment
run: |
source /opt/intel/oneapi/setvars.sh
printenv >> $GITHUB_ENV
- name: Install fpm
uses: fortran-lang/setup-fpm@v3
with:
fpm-version: 'v0.10.0'

- name: fpm build
run: |
ifx --version
fpm --version
fpm build --profile debug --flag "-warn nointerfaces"
- name: fpm test
run: |
fpm test --profile debug --flag "-warn nointerfaces"
# intel-build:
# runs-on: ubuntu-latest
# strategy:
# fail-fast: false

# env:
# FPM_FC: ifx
# FC: ifx

# steps:
# - name: Checkout code
# uses: actions/checkout@v3

# - name: Add Intel repository (Linux)
# run: |
# wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
# sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
# rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
# echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
# sudo apt-get update

# - name: Install Intel oneAPI compiler (Linux)
# run: |
# sudo apt-get install intel-oneapi-compiler-fortran

# - name: Setup Intel oneAPI environment
# run: |
# source /opt/intel/oneapi/setvars.sh
# printenv >> $GITHUB_ENV

# - name: Install MKL
# run: |
# sudo apt-get update
# sudo apt-get -y install intel-mkl
# sudo apt update
# sudo apt -y install intel-mkl

# - name: Install fpm
# uses: fortran-lang/setup-fpm@v3
# with:
# fpm-version: 'v0.8.2'

# - name: fpm build
# run: |
# ifx --version
# fpm --version
# fpm build --profile debug --flag "-warn nointerfaces"

# - name: fpm test
# run: |
# fpm test --profile debug --flag "-warn nointerfaces"
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.24)
project(
fstats
LANGUAGES Fortran
VERSION 1.2.5
VERSION 1.2.6
)

# Confgiure everything
Expand Down
4 changes: 2 additions & 2 deletions doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,14 @@ <h3>Derived Types</h3>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/anova.html
Original file line number Diff line number Diff line change
Expand Up @@ -467,14 +467,14 @@ <h4>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/bootstrap_resampling_routine.html
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,14 @@ <h3>Description</h3>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/bootstrap_statistic_routine.html
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,14 @@ <h3>Description</h3>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
6 changes: 3 additions & 3 deletions doc/interface/box_muller_sample.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h1>box_muller_sample
<li id="statements"><i class="fa fa-list-ol"></i>
<a data-toggle="tooltip"
data-placement="bottom" data-html="true"
title="<p> 0.3% of total for procedures.</p>Including implementation: 31 statements, 2.0% of total for procedures.">4 statements</a>
title="<p> 0.3% of total for procedures.</p>Including implementation: 30 statements, 1.9% of total for procedures.">4 statements</a>
</li>

<li id="source-file">
Expand Down Expand Up @@ -351,14 +351,14 @@ <h4>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/confidence_interval.html
Original file line number Diff line number Diff line change
Expand Up @@ -386,14 +386,14 @@ <h4>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/distribution_function.html
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,14 @@ <h3>Description</h3>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/distribution_property.html
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,14 @@ <h3>Description</h3>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/doe_evaluate_model.html
Original file line number Diff line number Diff line change
Expand Up @@ -424,14 +424,14 @@ <h4>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/iteration_update.html
Original file line number Diff line number Diff line change
Expand Up @@ -257,14 +257,14 @@ <h3>Arguments</h3>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/pooled_variance.html
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,14 @@ <h4>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/interface/regression_function.html
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,14 @@ <h3>Arguments</h3>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
4 changes: 2 additions & 2 deletions doc/lists/files.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ <h1>Source Files</h1>
<footer>
<div class="container">
<div class="row">
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2024
<div class="col-xs-6 col-md-6"><p>FSTATS was developed by Jason Christopherson<br>&copy; 2025
</p>
</div>
<div class="col-xs-6 col-md-6">
<p class="text-right">
Documentation generated by
<a href="https://github.com/Fortran-FOSS-Programmers/ford">FORD</a>
on 2024-10-08 06:55 </p>
on 2025-02-03 12:00 </p>
</div>
</div>
<br>
Expand Down
Loading

0 comments on commit e55dae1

Please sign in to comment.