Skip to content

Updates to work with latest SDK (26.3.2) #931

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.

Sign up for GitHub

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

Open
rhdtownsend wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Updates to work with latest SDK (26.3.2) #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c673e9b
Changed handling of math slots to work with SDK 26.2.2 approach of ad…
rhdtownsend Feb 11, 2026
ddf40d2
Added blas to EXTERNAL_DEPENDS_ON
rhdtownsend Feb 11, 2026
b3c9720
mtx: fix undefined behaviour in `b` pivot swaps
VincentVanlaer Feb 12, 2026
7550366
Tweaked pkgconfig invocation to align with latest SDK
rhdtownsend Mar 6, 2026
addc58b
Added missing flags for pkgconfig
rhdtownsend Mar 6, 2026
2ab252c
Updated github actions
rhdtownsend Mar 25, 2026
3714d73
Added symlink for linux installs
rhdtownsend Mar 25, 2026
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
17 changes: 9 additions & 8 deletions .github/actions/install-mesa/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inputs:
sdk:
description: 'The version of the MESA SDK to install'
required: false
default: '25.12.1'
default: '26.3.2'


runs:
Expand Down Expand Up @@ -60,28 +60,29 @@ runs:
mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz
key: ${{ runner.os }}-${{inputs.sdk}}

- name: Get SDK ${{ runner.os }} '25.12.1'
if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '25.12.1') && (runner.os == 'Linux') }}
- name: Get SDK ${{ runner.os }} '26.3.2'
if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '26.3.2') && (runner.os == 'Linux') }}
run: |
wget -q https://zenodo.org/records/18163992/files/mesasdk-x86_64-linux-25.12.1.tar.gz
wget -q https://zenodo.org/records/19210930/files/mesasdk-x86_64-linux-26.3.2.tar.gz
shell: bash

- name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}}
if: runner.os == 'Linux'
run: |
tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz
ln -s mesasdk-${{inputs.sdk}} mesasdk
shell: bash

- name: Get SDK ${{ runner.os }} '25.12.1'
if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '25.12.1') && (runner.os == 'macOS') }}
- name: Get SDK ${{ runner.os }} '26.3.2'
if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '26.3.2') && (runner.os == 'macOS') }}
run: |
wget --user-agent="" -q http://user.astro.wisc.edu/~townsend/resource/download/mesasdk/mesasdk-aarch64-macos-25.12.1.pkg
wget -q https://zenodo.org/records/19210744/files/mesasdk-aarch64-macos-26.3.2.pkg
shell: bash

- name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}}
if: runner.os == 'macOS'
run: |
sudo installer -pkg mesasdk-aarch64-macos-25.12.1.pkg -target /
sudo installer -pkg mesasdk-aarch64-macos-26.3.2.pkg -target /
ln -s /Applications/mesasdk mesasdk
shell: bash

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
sdk: ["25.12.1"] # pick 2 or 3 most recent.
sdk: ["26.3.2"] # pick 2 or 3 most recent.
os: [ubuntu-latest, macos-latest]
dynamic: ["yes", "no"]
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion gyre/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ifeq ($(WITH_GYRE),yes)
SRCS :=
SRCS_CHECK := test/src/test_gyre.f90
INTERNAL_DEPENDS_ON := forum const
EXTERNAL_DEPENDS_ON := hdf5_fortran lapack95 lapack
EXTERNAL_DEPENDS_ON := hdf5_fortran lapack95 lapack blas
CHECK_RESULTS_GOLDEN := test/test_output
CHECK_DIFF_PROG := ndiff -quiet -relerr 1.0e-6
BINTYPE := lib
Expand Down
7 changes: 2 additions & 5 deletions make/setup-depends.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ PKG_CONFIG_FLAGS =

ifneq ($(MESASDK_ROOT),)
ifeq ($(WITH_CRLIBM),yes)
PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=crmath
MESASDK_MATH_SLOT = crmath
PKG_CONFIG_FLAGS += --define-variable=math_slot=crmath
else
PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=default
MESASDK_MATH_SLOT = default
PKG_CONFIG_FLAGS += --define-variable=math_slot=default
endif
export MESASDK_MATH_SLOT
endif

PKG_CONFIG_PATH := $(shell BUILD_DIR=$(BUILD_DIR_) $(MAKE_DIR)/gen-pkgconfig-path $(SUBDIRS)):$(PKG_CONFIG_PATH)
Expand Down
2 changes: 1 addition & 1 deletion mtx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SRCS_CHECK := test/src/test_mtx.f90 \
test/src/test_block_tridiagonal.f90
# TODO: Also contains test dependencies sadly, I should fix this at some point
INTERNAL_DEPENDS_ON := const utils math
EXTERNAL_DEPENDS_ON := lapack
EXTERNAL_DEPENDS_ON := lapack blas
BINTYPE := lib

# Testing
Expand Down
3 changes: 0 additions & 3 deletions mtx/public/mtx_solve_routines.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@
real(dp) :: temp
integer :: i, k
info = 0
!$omp simd private(temp)
do i = 1,n
temp = b(i)
b(i) = b(ipiv(i))
Expand Down Expand Up @@ -251,7 +250,6 @@
real(dp) :: temp
integer :: i, k
info = 0
!$omp simd private(temp)
do i = 1,n
temp = b(i)
b(i) = b(ipiv(i))
Expand Down Expand Up @@ -287,7 +285,6 @@
real(dp) :: temp
integer :: i, k
info = 0
!$omp simd private(temp)
do i = 1,n
temp = b(i)
b(i) = b(ipiv(i))
Expand Down
Loading