Merge remote-tracking branch 'upstream/master' into add_sort_adj

Author: jvdp1

.github/collab.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+echo "📦 GitHub Fork Collaboration Setup Script"
+
+# Prompt for User's GitHub username
+
+read -p "Enter the GitHub username of the fork owner (e.g., alice): " USER
+
+# Prompt for the branch name
+
+read -p "Enter the PR branch name (e.g., feature-branch): " BRANCH
+
+# Add remotes
+
+echo "🔗 Adding remotes..."
+
+git remote add $USER https://github.com/$USER/stdlib.git
+
+# Fetch and checkout the PR branch
+
+echo "📥 Fetching branch '$BRANCH'..."
+
+git fetch $USER
+
+git checkout -b $BRANCH $USER/$BRANCH
+
+# Done
+
+echo "✅ Repo set up. You're now on '$BRANCH'."
+
+echo "You can now make changes and push directly to $USER/stdlib:$BRANCH"

.github/workflows/CI.yml

@@ -19,24 +19,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-12]
+        os: [ubuntu-latest, macos-13]
         toolchain:
           - {compiler: gcc, version: 10}
           - {compiler: gcc, version: 11}
           - {compiler: gcc, version: 12}
           - {compiler: gcc, version: 13}
-          - {compiler: intel, version: '2024.1'}
-          - {compiler: intel-classic, version: '2021.9'}
-        build: [cmake]
+          - {compiler: intel, version: '2024.1'}          
+        build: [cmake]        
         include:
+          - os: ubuntu-22.04
+            build: cmake
+            toolchain: {compiler: intel-classic, version: '2021.10'}            
           - os: ubuntu-latest
             build: cmake-inline
-            toolchain:
-              - {compiler: gcc, version: 10}
+            toolchain: {compiler: gcc, version: 10}
         exclude:
-          - os: macos-12
+          - os: macos-13
             toolchain: {compiler: intel, version: '2024.1'}
-          - os: macos-12
+          - os: macos-13
             toolchain: {compiler: gcc, version: 13}
     env:
       BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}
@@ -54,28 +55,30 @@ jobs:
       run: pip install --upgrade fypp ninja
 
     - name: Setup Fortran compiler
-      uses: fortran-lang/[email protected].1
+      uses: fortran-lang/[email protected].2
       id: setup-fortran
       with:
         compiler: ${{ matrix.toolchain.compiler }}
         version: ${{ matrix.toolchain.version }}
 
+    # Build and test with built-in BLAS and LAPACK
     - name: Configure with CMake
       if: ${{ contains(matrix.build, 'cmake') }}
       run: >-
         cmake -Wdev -G Ninja
         -DCMAKE_BUILD_TYPE=Release
         -DCMAKE_MAXIMUM_RANK:String=4
         -DCMAKE_INSTALL_PREFIX=$PWD/_dist
+        -DFIND_BLAS:STRING=FALSE
         -S . -B ${{ env.BUILD_DIR }}
 
     - name: Build and compile
       if: ${{ contains(matrix.build, 'cmake') }}
       run: cmake --build ${{ env.BUILD_DIR }} --parallel
 
     - name: catch build fail
-      run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
       if: ${{ failure() && contains(matrix.build, 'cmake') }}
+      run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
 
     - name: test
       if: ${{ contains(matrix.build, 'cmake') }}

.github/workflows/ci_BLAS.yml

@@ -0,0 +1,136 @@
+name: CI_BLAS
+
+on: [push, pull_request]
+
+env:
+  CTEST_TIME_TIMEOUT: "5" # some failures hang forever
+  CMAKE_GENERATOR: Ninja
+
+jobs:
+  msys2-build:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [{ msystem: UCRT64, arch: x86_64 }]
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup MinGW native environment
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.msystem }}
+          update: false
+          install: >-
+            git
+            mingw-w64-ucrt-${{ matrix.arch }}-gcc
+            mingw-w64-ucrt-${{ matrix.arch }}-gcc-fortran
+            mingw-w64-ucrt-${{ matrix.arch }}-python
+            mingw-w64-ucrt-${{ matrix.arch }}-python-fypp
+            mingw-w64-ucrt-${{ matrix.arch }}-cmake
+            mingw-w64-ucrt-${{ matrix.arch }}-ninja
+            mingw-w64-ucrt-${{ matrix.arch }}-openblas
+
+      # Build and test with external BLAS and LAPACK (OpenBLAS on UCRT64)
+      - name: Configure with CMake and OpenBLAS
+        run: >-
+          PATH=$PATH:/ucrt64/bin/ cmake
+          -Wdev
+          -B build
+          -DCMAKE_BUILD_TYPE=Debug
+          -DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
+          -DCMAKE_MAXIMUM_RANK:String=4
+          -DCMAKE_INSTALL_PREFIX=$PWD/_dist
+          -DFIND_BLAS:STRING=TRUE
+        env:
+          FC: gfortran
+          CC: gcc
+          CXX: g++
+
+      - name: CMake build with OpenBLAS
+        run: PATH=$PATH:/ucrt64/bin/ cmake --build build --parallel
+
+      - name: catch build fail
+        if: failure()
+        run: PATH=$PATH:/ucrt64/bin/ cmake --build build --verbose --parallel 1
+
+      - name: CTest with OpenBLAS
+        run: PATH=$PATH:/ucrt64/bin/ ctest --test-dir build --output-on-failure --parallel -V -LE quadruple_precision
+
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: WindowsCMakeTestlog_openblas
+          path: build/Testing/Temporary/LastTest.log
+
+      - name: Install project with OpenBLAS
+        run: PATH=$PATH:/ucrt64/bin/ cmake --install build
+
+  Build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        toolchain:
+          - { compiler: intel, version: "2024.1" }
+        build: [cmake]
+    env:
+      BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}
+      APT_PACKAGES: >-
+        intel-oneapi-mkl
+        intel-oneapi-mkl-devel
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v5 # Use pip to install latest CMake, & FORD/Jin2For, etc.
+        with:
+          python-version: 3.x
+
+      - name: Install fypp
+        run: pip install --upgrade fypp ninja
+
+      - name: Setup Fortran compiler
+        uses: fortran-lang/[email protected]
+        id: setup-fortran
+        with:
+          compiler: ${{ matrix.toolchain.compiler }}
+          version: ${{ matrix.toolchain.version }}
+
+      - name: Install Intel oneAPI MKL
+        run: |
+          sudo apt-get install ${APT_PACKAGES}
+          source /opt/intel/oneapi/mkl/latest/env/vars.sh
+          printenv >> $GITHUB_ENV
+
+      # Build and test with external BLAS and LAPACK (MKL on Ubuntu with Intel compilers)
+      - name: Configure with CMake and MKL
+        run: >-
+          cmake -Wdev -G Ninja
+          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_MAXIMUM_RANK:String=4
+          -DCMAKE_INSTALL_PREFIX=$PWD/_dist
+          -DFIND_BLAS:STRING=TRUE
+          -S . -B ${{ env.BUILD_DIR }}
+
+      - name: Build and compile with MKL
+        run: cmake --build ${{ env.BUILD_DIR }} --parallel
+
+      - name: catch build fail with MKL
+        if: failure()
+        run: cmake --build ${{ env.BUILD_DIR }} --verbose --parallel 1
+
+      - name: test with MKL
+        run: >-
+          ctest
+          --test-dir ${{ env.BUILD_DIR }}
+          --parallel
+          --output-on-failure
+          --no-tests=error
+
+      - name: Install project with MKL
+        run: cmake --install ${{ env.BUILD_DIR }}

.github/workflows/ci_windows.yml

@@ -13,9 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         include: [
-          { msystem: MSYS,    arch: x86_64 },
-          { msystem: MINGW64, arch: x86_64 },
-          { msystem: MINGW32, arch: i686   }
+          { msystem: MINGW64, arch: x86_64 }
         ]
     defaults:
       run:
@@ -25,7 +23,6 @@ jobs:
 
     - name: Setup MinGW native environment
       uses: msys2/setup-msys2@v2
-      if: contains(matrix.msystem, 'MINGW')
       with:
         msystem: ${{ matrix.msystem }}
         update: false
@@ -34,29 +31,10 @@ jobs:
           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 }}-python-setuptools
+          mingw-w64-${{ matrix.arch }}-python-fypp
           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
-          mingw-w64-x86_64-gcc
-          mingw-w64-x86_64-gcc-fortran
-          python
-          python-pip
-          cmake
-          ninja
-
-    - name: Install fypp
-      run: pip install fypp
-
     - run: >-
         PATH=$PATH:/mingw64/bin/ cmake
         -Wdev
@@ -65,6 +43,7 @@ jobs:
         -DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
         -DCMAKE_MAXIMUM_RANK:String=4
         -DCMAKE_INSTALL_PREFIX=$PWD/_dist
+        -DFIND_BLAS:STRING=FALSE
       env:
         FC: gfortran
         CC: gcc
@@ -80,7 +59,7 @@ jobs:
     - name: CTest
       run: PATH=$PATH:/mingw64/bin/ ctest --test-dir build --output-on-failure --parallel -V -LE quadruple_precision
 
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: WindowsCMakeTestlog

.github/workflows/doc-deployment.yml

@@ -40,7 +40,7 @@ jobs:
           ford -r $(git describe --always) --debug ${MAYBE_SKIP_SEARCH} "${FORD_FILE}"
 
       - name: Upload Documentation
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: FORD-API-docs
           path: ./API-doc/

.github/workflows/fpm-deployment.yml

@@ -38,6 +38,9 @@ jobs:
       - run: | # Just for deployment: create stdlib-fpm folder
           python config/fypp_deployment.py --deploy_stdlib_fpm
 
+      - run: | # Just for deployment: create stdlib-fpm-ilp64 folder
+          python config/fypp_deployment.py --deploy_stdlib_fpm --with_ilp64
+
       - run: | # Use fpm gnu ci to check xdp and qp 
           python config/fypp_deployment.py --with_xdp --with_qp
           fpm test --profile release --flag '-DWITH_XDP -DWITH_QP'
@@ -48,4 +51,12 @@ jobs:
         if: github.event_name != 'pull_request'
         with:
           BRANCH: stdlib-fpm
-          FOLDER: stdlib-fpm
+          FOLDER: stdlib-fpm
+
+    # Update and deploy the f90 files generated by github-ci to the `stdlib-fpm-ilp64` branch.
+      - name: Deploy with 64-bit integer support 🚀
+        uses: JamesIves/[email protected]
+        if: github.event_name != 'pull_request'
+        with:
+          BRANCH: stdlib-fpm-ilp64
+          FOLDER: stdlib-fpm-ilp64