Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes in issue in the qsort comparison function #1997

Merged
merged 22 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
try this
  • Loading branch information
jedwards4b committed Jan 28, 2025
commit 3fb330044e442c8e514146d4d8eed65cecbf3aa4
3 changes: 2 additions & 1 deletion .github/actions/intelcompilers/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description: 'Install Intel Compilers'
runs:
using: composite
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup repo
shell: bash
run: |
Expand All @@ -19,5 +19,6 @@ runs:
sudo apt-get install -y intel-oneapi-mkl
sudo apt-get install -y intel-oneapi-mpi
sudo apt-get install -y intel-oneapi-mpi-devel
find /opt/intel -name setvars.sh
source /opt/intel/oneapi/setvars.sh
printenv >> $GITHUB_ENV
34 changes: 18 additions & 16 deletions .github/workflows/intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,36 @@ jobs:
runs-on: ubuntu-latest

env:
CC: icc
FC: ifort
CC: mpicc
FC: mpiifort
# Versions should match the github tag names
PNETCDF_VERSION: checkpoint.1.14.0
NETCDF_C_VERSION: v4.9.2
NETCDF_FORTRAN_VERSION: v4.6.1
HDF5_VERSION: hdf5_1_12_2
steps:
- uses: actions/checkout@v4
- name: Set up Intel OneAPI
run: |
source /opt/intel/oneapi/setvars.sh
export CC=/opt/intel/oneapi/compiler/latest/linux/bin/intel64/icc
export FC=/opt/intel/oneapi/compiler/latest/linux/bin/intel64/ifort
- name: Installs
run: |
set -x
sudo apt-get update
sudo apt-get install libcurl4-gnutls-dev
sudo apt-get install libz-dev
# - name: Install Intel OneAPI
# if: steps.cache-intel.outputs.cache-hit != 'true'
# uses: ./.github/actions/intelcompilers
# - name: Prep Intel OneAPI
# if: steps.cache-intel.outputs.cache-hit == 'true'
# run: |
# source /opt/intel/oneapi/setvars.sh
# printenv >> $GITHUB_ENV
# echo "/opt/intel/oneapi/compiler/2023.2.1/linux/bin/intel64/" >> $GITHUB_PATH
- name: cache intel compiler
id: cache-intel
uses: actions/cache@v4
with:
path: /opt/intel/oneapi
key: intel-${{ runner.os }}
- name: Install Intel OneAPI
if: steps.cache-intel.outputs.cache-hit != 'true'
uses: ./.github/actions/intelcompilers
- name: Prep Intel OneAPI
if: steps.cache-intel.outputs.cache-hit == 'true'
run: |
source /opt/intel/oneapi/setvars.sh
printenv >> $GITHUB_ENV

- name: cache-hdf5
id: cache-hdf5
Expand Down Expand Up @@ -126,4 +128,4 @@ jobs:
# see https://github.com/marketplace/actions/debugging-with-tmate for further details
# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v4
# uses: mxschmitt/action-tmate@v3
Loading