diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 12f654b..67d3f6e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -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 }} diff --git a/.github/workflows/fpm.yml b/.github/workflows/fpm.yml index ab50703..7a001b8 100644 --- a/.github/workflows/fpm.yml +++ b/.github/workflows/fpm.yml @@ -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 @@ -22,13 +22,6 @@ 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: | @@ -36,12 +29,18 @@ jobs: --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 @@ -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" \ No newline at end of file + # 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" \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 137dbe9..2bd0240 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.24) project( fstats LANGUAGES Fortran - VERSION 1.2.5 + VERSION 1.2.6 ) # Confgiure everything diff --git a/doc/index.html b/doc/index.html index 851a5a8..b7d7a45 100644 --- a/doc/index.html +++ b/doc/index.html @@ -157,14 +157,14 @@

Derived Types