From c673e9b3bff32c496f49dc9e275a642e0ff44197 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Wed, 11 Feb 2026 13:56:09 -0600 Subject: [PATCH 01/18] Changed handling of math slots to work with SDK 26.2.2 approach of adding math-slots subdir to PKG_CONFIG_PATH --- make/setup-depends.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/make/setup-depends.mk b/make/setup-depends.mk index e856312f3..e94e08839 100644 --- a/make/setup-depends.mk +++ b/make/setup-depends.mk @@ -2,17 +2,12 @@ INTERNAL_DEPENDS_ON := $(addprefix mesa-,$(INTERNAL_DEPENDS_ON)) include $(MAKE_DIR)/subdirs.mk -PKG_CONFIG_FLAGS = - ifneq ($(MESASDK_ROOT),) ifeq ($(WITH_CRLIBM),yes) - PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=crmath - MESASDK_MATH_SLOT = crmath + PKG_CONFIG_PATH := $(MESASDK_ROOT)/math-slots/crmath/lib/pkgconfig:$(PKG_CONFIG_PATH) else - PKG_CONFIG_FLAGS += --define-variable=MATH_SLOT=default - MESASDK_MATH_SLOT = default + PKG_CONFIG_PATH := $(MESASDK_ROOT)/math-slots/default/lib/pkgconfig:$(PKG_CONFIG_PATH) endif - export MESASDK_MATH_SLOT endif PKG_CONFIG_PATH := $(shell BUILD_DIR=$(BUILD_DIR_) $(MAKE_DIR)/gen-pkgconfig-path $(SUBDIRS)):$(PKG_CONFIG_PATH) @@ -20,7 +15,7 @@ export PKG_CONFIG_PATH define pkg-config-inner ifneq ($(2),) - TMP_VAR := $$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_CONFIG_FLAGS) $(1) $(2) || echo "failed") + TMP_VAR := $$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(1) $(2) || echo "failed") ifeq ($$(TMP_VAR),failed) $$(warning PKG_CONFIG_PATH is $$(PKG_CONFIG_PATH)) $$(error pkg-config failed to find some of $(2), check PKG_CONFIG_PATH is correct) From ddf40d24e7c23e10a72d657f2a483fd03e3d8453 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Wed, 11 Feb 2026 13:57:00 -0600 Subject: [PATCH 02/18] Added blas to EXTERNAL_DEPENDS_ON --- gyre/Makefile | 2 +- mtx/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gyre/Makefile b/gyre/Makefile index fbec74fc8..4d513e8fc 100644 --- a/gyre/Makefile +++ b/gyre/Makefile @@ -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 diff --git a/mtx/Makefile b/mtx/Makefile index b6bf23a07..ec98001e6 100644 --- a/mtx/Makefile +++ b/mtx/Makefile @@ -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 From b3c972010341f9a4f166be2973bd0a4148573362 Mon Sep 17 00:00:00 2001 From: Vincent Vanlaer Date: Thu, 12 Feb 2026 17:07:54 +0100 Subject: [PATCH 03/18] mtx: fix undefined behaviour in `b` pivot swaps The omp simd directive assumes that all loop iterations are independent. This is not the case for swapping elements of a single row/column. Hence, this causes UB. --- mtx/public/mtx_solve_routines.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/mtx/public/mtx_solve_routines.inc b/mtx/public/mtx_solve_routines.inc index a3138bfac..736220990 100644 --- a/mtx/public/mtx_solve_routines.inc +++ b/mtx/public/mtx_solve_routines.inc @@ -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)) @@ -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)) @@ -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)) From c649882bbefadad648cc5d782f241ff6c64b9b45 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Thu, 19 Feb 2026 15:01:37 -0600 Subject: [PATCH 04/18] Switched to forum-HEAD (2026/2/19) --- forum/Makefile | 2 +- forum/forum-HEAD.tar.gz | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 forum/forum-HEAD.tar.gz diff --git a/forum/Makefile b/forum/Makefile index 3b2adbd6c..de956a064 100644 --- a/forum/Makefile +++ b/forum/Makefile @@ -41,7 +41,7 @@ $(BUILD_DIR_FORUM_BUILD): forum-1.0.4.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUIL cp $(BUILD_DIR_FORUM_BUILD)/src/include/forum.inc $(BUILD_DIR_MODULE)/include/forum.inc $(BUILD_DIR_FORUM_BUILD)/build-complete: $(BUILD_DIR_FORUM_BUILD) - $(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=$(DYNAMIC) DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=no VERSION_CHECK=passed FPP="$(FPP)" LDFLAGS="$(LIB_DEP_ARGS)" FFLAGS="$(_FFLAGS) -std=f2018" + $(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=$(DYNAMIC) DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=no VERSION_CHECK=passed FPP="$(FPP)" TESTS=yes touch $@ $(OBJ_OUT): $(BUILD_DIR_FORUM_BUILD)/build-complete | $(BUILD_DIR_MODULE)/lib/. diff --git a/forum/forum-HEAD.tar.gz b/forum/forum-HEAD.tar.gz new file mode 100644 index 000000000..f3304aff9 --- /dev/null +++ b/forum/forum-HEAD.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc0005b56953d101eedac8936337babf63fcd4cb9a356686ce6f4381303c97cf +size 36431 From 8e1d5a493a6ddd68ee8f0346f9ac667a56a50359 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Fri, 20 Feb 2026 16:00:46 -0600 Subject: [PATCH 05/18] Initial chages to prepare for update to gyre-9.0 --- gyre/Makefile | 11 +++-------- gyre/gyre-HEAD.tar.gz | 3 +++ 2 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 gyre/gyre-HEAD.tar.gz diff --git a/gyre/Makefile b/gyre/Makefile index 4d513e8fc..9e6eda51e 100644 --- a/gyre/Makefile +++ b/gyre/Makefile @@ -43,19 +43,14 @@ else GYRE_DEBUG = false endif -ifeq ($(MESASDK_ROOT),) - FPP=./fypp_deps $(FLAGS_DEPS) -else - FPP= PYTHONPATH=$(MESASDK_ROOT)/lib/python ./fypp_deps $(FLAGS_DEPS) -endif - BUILD_DIR_GYRE_BUILD := $(BUILD_DIR_MODULE)/src -$(BUILD_DIR_GYRE_BUILD): gyre-8.1.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/. +$(BUILD_DIR_GYRE_BUILD): gyre-HEAD.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/. tar --strip-components=1 -xf $< -C $(BUILD_DIR_GYRE_BUILD) $(BUILD_DIR_GYRE_BUILD)/build-complete: $(BUILD_DIR_GYRE_BUILD) - $(MAKE) -C $(BUILD_DIR_GYRE_BUILD) SHARED=$(DYNAMIC) DEBUG=$(GYRE_DEBUG) OMP=$(WITH_OPENMP) CRMATH=$(WITH_CRLIBM) VERSION_CHECK=passed FPP="$(FPP)" LDFLAGS="$(LIB_DEP_ARGS)" FFLAGS="$(_FFLAGS) -std=f2018" FRONTENDS=no TOOLS=no FORUM=no IFACES=yes + $(MAKE) -C $(BUILD_DIR_GYRE_BUILD) SHARED=$(DYNAMIC) DEBUG=$(GYRE_DEBUG) OMP=$(WITH_OPENMP) \ + CRMATH=$(WITH_CRLIBM) FRONTENDS=no TOOLS=no EXTERNAL_FORUM=yes EXTERNAL_FORUM_PKG=mesa-forum IFACES=yes touch $@ diff --git a/gyre/gyre-HEAD.tar.gz b/gyre/gyre-HEAD.tar.gz new file mode 100644 index 000000000..627c3ede5 --- /dev/null +++ b/gyre/gyre-HEAD.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:483a3ebe1c2e7c7920eb0577ef283b00b2769b5cbc326cd3b0dcb2a644757e42 +size 4833323 From 8944cb09a2a22f45736bf9697bd6c1324309cc63 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Fri, 6 Mar 2026 08:24:27 -0600 Subject: [PATCH 06/18] Changed to ForUM 1.2.1 --- forum/Makefile | 2 +- forum/forum-1.0.4.tar.gz | 3 --- forum/forum-1.2.1.tar.gz | 3 +++ forum/forum-HEAD.tar.gz | 3 --- make/setup-depends.mk | 6 +++--- 5 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 forum/forum-1.0.4.tar.gz create mode 100644 forum/forum-1.2.1.tar.gz delete mode 100644 forum/forum-HEAD.tar.gz diff --git a/forum/Makefile b/forum/Makefile index de956a064..5f8f81aa2 100644 --- a/forum/Makefile +++ b/forum/Makefile @@ -36,7 +36,7 @@ endif BUILD_DIR_FORUM_BUILD := $(BUILD_DIR_MODULE)/src INSTALL_INCLUDES_BUILD += $(BUILD_DIR_MODULE)/include/forum.inc -$(BUILD_DIR_FORUM_BUILD): forum-1.0.4.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/. +$(BUILD_DIR_FORUM_BUILD): forum-1.2.1.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/. tar --strip-components=1 -xf $< -C $(BUILD_DIR_FORUM_BUILD) cp $(BUILD_DIR_FORUM_BUILD)/src/include/forum.inc $(BUILD_DIR_MODULE)/include/forum.inc diff --git a/forum/forum-1.0.4.tar.gz b/forum/forum-1.0.4.tar.gz deleted file mode 100644 index 71a652ae5..000000000 --- a/forum/forum-1.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9db9523926ce3d390f722255b4c683307ced2933f497fbb66f2f2dfcbf70d8a -size 32659 diff --git a/forum/forum-1.2.1.tar.gz b/forum/forum-1.2.1.tar.gz new file mode 100644 index 000000000..2f93c8dcc --- /dev/null +++ b/forum/forum-1.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d97021daaa6b0a3f002ccc86e658963e7fb48901d4e717ec2f2aea07f9f538a5 +size 36574 diff --git a/forum/forum-HEAD.tar.gz b/forum/forum-HEAD.tar.gz deleted file mode 100644 index f3304aff9..000000000 --- a/forum/forum-HEAD.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc0005b56953d101eedac8936337babf63fcd4cb9a356686ce6f4381303c97cf -size 36431 diff --git a/make/setup-depends.mk b/make/setup-depends.mk index e94e08839..07ffc4d68 100644 --- a/make/setup-depends.mk +++ b/make/setup-depends.mk @@ -4,9 +4,9 @@ include $(MAKE_DIR)/subdirs.mk ifneq ($(MESASDK_ROOT),) ifeq ($(WITH_CRLIBM),yes) - PKG_CONFIG_PATH := $(MESASDK_ROOT)/math-slots/crmath/lib/pkgconfig:$(PKG_CONFIG_PATH) + PKG_CONFIG_FLAGS += --define-variable=math_slot=crmath else - PKG_CONFIG_PATH := $(MESASDK_ROOT)/math-slots/default/lib/pkgconfig:$(PKG_CONFIG_PATH) + PKG_CONFIG_FLAGS += --define-variable=math_slot=default endif endif @@ -15,7 +15,7 @@ export PKG_CONFIG_PATH define pkg-config-inner ifneq ($(2),) - TMP_VAR := $$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(1) $(2) || echo "failed") + TMP_VAR := $$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_CONFIG_FLAGS) $(1) $(2) || echo "failed") ifeq ($$(TMP_VAR),failed) $$(warning PKG_CONFIG_PATH is $$(PKG_CONFIG_PATH)) $$(error pkg-config failed to find some of $(2), check PKG_CONFIG_PATH is correct) From 7550366306f047fe53e680f58a96c6f2ee5b42e2 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Fri, 6 Mar 2026 08:50:53 -0600 Subject: [PATCH 07/18] Tweaked pkgconfig invocation to align with latest SDK --- make/setup-depends.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/make/setup-depends.mk b/make/setup-depends.mk index e94e08839..a2c9b8781 100644 --- a/make/setup-depends.mk +++ b/make/setup-depends.mk @@ -4,9 +4,11 @@ include $(MAKE_DIR)/subdirs.mk ifneq ($(MESASDK_ROOT),) ifeq ($(WITH_CRLIBM),yes) - PKG_CONFIG_PATH := $(MESASDK_ROOT)/math-slots/crmath/lib/pkgconfig:$(PKG_CONFIG_PATH) + PKG_CONFIG_FLAGS += --define-variable=math_slot=crmath + MESASDK_MATH_SLOT = crmath else - PKG_CONFIG_PATH := $(MESASDK_ROOT)/math-slots/default/lib/pkgconfig:$(PKG_CONFIG_PATH) + PKG_CONFIG_FLAGS += --define-variable=math_slot=default + MESASDK_MATH_SLOT = default endif endif From addc58b702239727ab21a85bde522b2fcbd9221f Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Fri, 6 Mar 2026 09:50:08 -0600 Subject: [PATCH 08/18] Added missing flags for pkgconfig --- make/setup-depends.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/setup-depends.mk b/make/setup-depends.mk index a2c9b8781..37c6bf4f2 100644 --- a/make/setup-depends.mk +++ b/make/setup-depends.mk @@ -2,13 +2,13 @@ INTERNAL_DEPENDS_ON := $(addprefix mesa-,$(INTERNAL_DEPENDS_ON)) include $(MAKE_DIR)/subdirs.mk +PKG_CONFIG_FLAGS = + ifneq ($(MESASDK_ROOT),) ifeq ($(WITH_CRLIBM),yes) PKG_CONFIG_FLAGS += --define-variable=math_slot=crmath - MESASDK_MATH_SLOT = crmath else PKG_CONFIG_FLAGS += --define-variable=math_slot=default - MESASDK_MATH_SLOT = default endif endif @@ -17,7 +17,7 @@ export PKG_CONFIG_PATH define pkg-config-inner ifneq ($(2),) - TMP_VAR := $$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(1) $(2) || echo "failed") + TMP_VAR := $$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_CONFIG_FLAGS) $(1) $(2) || echo "failed") ifeq ($$(TMP_VAR),failed) $$(warning PKG_CONFIG_PATH is $$(PKG_CONFIG_PATH)) $$(error pkg-config failed to find some of $(2), check PKG_CONFIG_PATH is correct) From 704d368d7ae1e6ef5f567ef6821646d6bc2be4e8 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Fri, 6 Mar 2026 11:11:19 -0600 Subject: [PATCH 09/18] Updated to ForUM 1.2.2 --- forum/Makefile | 4 ++-- forum/forum-1.2.1.tar.gz | 3 --- forum/forum-1.2.2.tar.gz | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 forum/forum-1.2.1.tar.gz create mode 100644 forum/forum-1.2.2.tar.gz diff --git a/forum/Makefile b/forum/Makefile index 5f8f81aa2..b4fc96130 100644 --- a/forum/Makefile +++ b/forum/Makefile @@ -36,12 +36,12 @@ endif BUILD_DIR_FORUM_BUILD := $(BUILD_DIR_MODULE)/src INSTALL_INCLUDES_BUILD += $(BUILD_DIR_MODULE)/include/forum.inc -$(BUILD_DIR_FORUM_BUILD): forum-1.2.1.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/. +$(BUILD_DIR_FORUM_BUILD): forum-1.2.2.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/. tar --strip-components=1 -xf $< -C $(BUILD_DIR_FORUM_BUILD) cp $(BUILD_DIR_FORUM_BUILD)/src/include/forum.inc $(BUILD_DIR_MODULE)/include/forum.inc $(BUILD_DIR_FORUM_BUILD)/build-complete: $(BUILD_DIR_FORUM_BUILD) - $(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=$(DYNAMIC) DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=no VERSION_CHECK=passed FPP="$(FPP)" TESTS=yes + $(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=$(DYNAMIC) DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=no VERSION_CHECK=passed FPP="$(FPP)" touch $@ $(OBJ_OUT): $(BUILD_DIR_FORUM_BUILD)/build-complete | $(BUILD_DIR_MODULE)/lib/. diff --git a/forum/forum-1.2.1.tar.gz b/forum/forum-1.2.1.tar.gz deleted file mode 100644 index 2f93c8dcc..000000000 --- a/forum/forum-1.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d97021daaa6b0a3f002ccc86e658963e7fb48901d4e717ec2f2aea07f9f538a5 -size 36574 diff --git a/forum/forum-1.2.2.tar.gz b/forum/forum-1.2.2.tar.gz new file mode 100644 index 000000000..30ff7144d --- /dev/null +++ b/forum/forum-1.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:292ebd589ec689d41e09191171815a0296bf9ff48023748ef15a9cf5a9b6d96b +size 36640 From 7249ecc69650e39014459cc56d86cf1a8ca8c27e Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Tue, 26 May 2026 15:35:12 -0500 Subject: [PATCH 10/18] Updated GYRE to 9.1 release --- gyre/Makefile | 2 +- gyre/gyre-8.1.tar.gz | 3 --- gyre/gyre-9.1.tar.gz | 3 +++ gyre/gyre-HEAD.tar.gz | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 gyre/gyre-8.1.tar.gz create mode 100644 gyre/gyre-9.1.tar.gz delete mode 100644 gyre/gyre-HEAD.tar.gz diff --git a/gyre/Makefile b/gyre/Makefile index 9e6eda51e..cd2664935 100644 --- a/gyre/Makefile +++ b/gyre/Makefile @@ -45,7 +45,7 @@ endif BUILD_DIR_GYRE_BUILD := $(BUILD_DIR_MODULE)/src -$(BUILD_DIR_GYRE_BUILD): gyre-HEAD.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/. +$(BUILD_DIR_GYRE_BUILD): gyre-9.1.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/. tar --strip-components=1 -xf $< -C $(BUILD_DIR_GYRE_BUILD) $(BUILD_DIR_GYRE_BUILD)/build-complete: $(BUILD_DIR_GYRE_BUILD) diff --git a/gyre/gyre-8.1.tar.gz b/gyre/gyre-8.1.tar.gz deleted file mode 100644 index 1c3623161..000000000 --- a/gyre/gyre-8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c82f440ed952401c9a308555cc950fb770abc4b62957895ba546964e732d54f5 -size 4807156 diff --git a/gyre/gyre-9.1.tar.gz b/gyre/gyre-9.1.tar.gz new file mode 100644 index 000000000..8b4b32864 --- /dev/null +++ b/gyre/gyre-9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8705023f258141b646fa2289dc81ed313609e24c9edf62fb79e88ba7c8fc86ca +size 4850501 diff --git a/gyre/gyre-HEAD.tar.gz b/gyre/gyre-HEAD.tar.gz deleted file mode 100644 index 627c3ede5..000000000 --- a/gyre/gyre-HEAD.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:483a3ebe1c2e7c7920eb0577ef283b00b2769b5cbc326cd3b0dcb2a644757e42 -size 4833323 From e2fef014289563f741fdd85ed42276eb004371ad Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Thu, 2 Apr 2026 13:58:32 -0500 Subject: [PATCH 11/18] Bumped to forum 1.2.3, which includes the -ftrampoline-impl=heap build flag --- forum/Makefile | 2 +- forum/forum-1.2.2.tar.gz | 3 --- forum/forum-1.2.3.tar.gz | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 forum/forum-1.2.2.tar.gz create mode 100644 forum/forum-1.2.3.tar.gz diff --git a/forum/Makefile b/forum/Makefile index b4fc96130..8efe9159e 100644 --- a/forum/Makefile +++ b/forum/Makefile @@ -36,7 +36,7 @@ endif BUILD_DIR_FORUM_BUILD := $(BUILD_DIR_MODULE)/src INSTALL_INCLUDES_BUILD += $(BUILD_DIR_MODULE)/include/forum.inc -$(BUILD_DIR_FORUM_BUILD): forum-1.2.2.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/. +$(BUILD_DIR_FORUM_BUILD): forum-1.2.3.tar.gz | $(BUILD_DIR_FORUM_BUILD)/. $(BUILD_DIR_MODULE)/include/. tar --strip-components=1 -xf $< -C $(BUILD_DIR_FORUM_BUILD) cp $(BUILD_DIR_FORUM_BUILD)/src/include/forum.inc $(BUILD_DIR_MODULE)/include/forum.inc diff --git a/forum/forum-1.2.2.tar.gz b/forum/forum-1.2.2.tar.gz deleted file mode 100644 index 30ff7144d..000000000 --- a/forum/forum-1.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:292ebd589ec689d41e09191171815a0296bf9ff48023748ef15a9cf5a9b6d96b -size 36640 diff --git a/forum/forum-1.2.3.tar.gz b/forum/forum-1.2.3.tar.gz new file mode 100644 index 000000000..4f4df30c1 --- /dev/null +++ b/forum/forum-1.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9abf4c25e846c3e30b2880e0bb984bfd37ba7d6a7fc2400346ef149214b35622 +size 36655 From 685325e03c521f82d074248d8c79b4c8bbfda7ad Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Wed, 10 Jun 2026 07:55:57 -0500 Subject: [PATCH 12/18] Bumped to gyre-9.1.1 --- gyre/Makefile | 2 +- gyre/gyre-9.1.1.tar.gz | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 gyre/gyre-9.1.1.tar.gz diff --git a/gyre/Makefile b/gyre/Makefile index cd2664935..7fc992dd8 100644 --- a/gyre/Makefile +++ b/gyre/Makefile @@ -45,7 +45,7 @@ endif BUILD_DIR_GYRE_BUILD := $(BUILD_DIR_MODULE)/src -$(BUILD_DIR_GYRE_BUILD): gyre-9.1.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/. +$(BUILD_DIR_GYRE_BUILD): gyre-9.1.1.tar.gz | $(BUILD_DIR_GYRE_BUILD)/. $(BUILD_DIR_MODULE)/include/. tar --strip-components=1 -xf $< -C $(BUILD_DIR_GYRE_BUILD) $(BUILD_DIR_GYRE_BUILD)/build-complete: $(BUILD_DIR_GYRE_BUILD) diff --git a/gyre/gyre-9.1.1.tar.gz b/gyre/gyre-9.1.1.tar.gz new file mode 100644 index 000000000..9d0f328ce --- /dev/null +++ b/gyre/gyre-9.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c6ece36c2565a3cfb266c961e276f914fead0ec6edef7b4a00b995bd0688a0b +size 4850811 From 715cfbd21af2db9dc945541f09728141f7e8a1a4 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Wed, 10 Jun 2026 08:01:14 -0500 Subject: [PATCH 13/18] Updated installation action to use SDK 26.6.1 --- .github/actions/install-mesa/action.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 49937fba7..43f961606 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -7,7 +7,7 @@ inputs: sdk: description: 'The version of the MESA SDK to install' required: false - default: '25.12.1' + default: '26.6.1' runs: @@ -60,10 +60,10 @@ 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.6.1' + if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '26.6.1') && (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/20598423/files/mesasdk-x86_64-linux-26.6.1.tar.gz shell: bash - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}} @@ -72,16 +72,16 @@ runs: tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz 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.6.1' + if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '26.6.1') && (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/20598224/files/mesasdk-aarch64-macos-26.6.1.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-${{inputs.sdk}}.pkg -target / ln -s /Applications/mesasdk mesasdk shell: bash From 77921e06e07af594e154f99ff051d13e157d319f Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Wed, 10 Jun 2026 09:02:39 -0500 Subject: [PATCH 14/18] Updated actions to follow the new conventions in main --- .github/actions/install-mesa/action.yml | 61 +++++--------------- .github/actions/install-sdk-linux/action.yml | 46 +++++++++++++++ .github/actions/install-sdk-macos/action.yml | 45 +++++++++++++++ 3 files changed, 104 insertions(+), 48 deletions(-) create mode 100644 .github/actions/install-sdk-linux/action.yml create mode 100644 .github/actions/install-sdk-macos/action.yml diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml index 43f961606..3f09fda82 100644 --- a/.github/actions/install-mesa/action.yml +++ b/.github/actions/install-mesa/action.yml @@ -10,26 +10,23 @@ inputs: default: '26.6.1' + runs: using: 'composite' steps: - - name: Install dependencies Linux - if: runner.os == 'Linux' - run: | - sudo apt-get -y update - sudo apt-get -y install wget binutils make perl libx11-6 libx11-dev zlib1g zlib1g-dev tcsh - sudo apt-get -y autoremove - sudo apt-get clean - shell: bash + - name: Install SDK Linux + if: ${{ (runner.os == 'Linux') }} + uses: ./.github/actions/install-sdk-linux + with: + sdk: ${{inputs.sdk}} - - name: Install dependencies MacOS - if: runner.os == 'macOS' - run: | - brew install --cask xquartz - brew install gnu-sed - shell: bash + - name: Install SDK MacOS + if: ${{ (runner.os == 'Macos') }} + uses: ./.github/actions/install-sdk-macos + with: + sdk: ${{inputs.sdk}} - name: Create LFS file list run: | @@ -41,7 +38,7 @@ runs: id: lfs-cache with: path: .git/lfs - key: ${{ runner.os }}-${{ hashFiles('.lfs-assets-id') }}-v1 + key: lfs-${{ hashFiles('.lfs-assets-id') }}-v1 - name: Git LFS Pull run: git lfs pull @@ -53,42 +50,10 @@ runs: shell: bash if: steps.lfs-cache.outputs.cache-hit == 'true' - - uses: actions/cache@v4 - id: cache - with: - path: | - mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz - key: ${{ runner.os }}-${{inputs.sdk}} - - - name: Get SDK ${{ runner.os }} '26.6.1' - if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '26.6.1') && (runner.os == 'Linux') }} - run: | - wget -q https://zenodo.org/records/20598423/files/mesasdk-x86_64-linux-26.6.1.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 - shell: bash - - - name: Get SDK ${{ runner.os }} '26.6.1' - if: ${{ (steps.cache.outputs.cache-hit != 'true') && ( inputs.sdk == '26.6.1') && (runner.os == 'macOS') }} - run: | - wget -q https://zenodo.org/records/20598224/files/mesasdk-aarch64-macos-26.6.1.pkg - shell: bash - - - name: Unpack SDK ${{ runner.os }} ${{inputs.sdk}} - if: runner.os == 'macOS' - run: | - sudo installer -pkg mesasdk-aarch64-macos-${{inputs.sdk}}.pkg -target / - ln -s /Applications/mesasdk mesasdk - shell: bash - - name: Set MESA environment variables shell: bash run: | - echo "MESASDK_ROOT=$(readlink -f mesasdk)" >> $GITHUB_ENV + echo "$MESASDK_ROOT/bin" >> $GITHUB_PATH echo "MESA_DIR=$PWD" >> $GITHUB_ENV - name: Setup environment Linux diff --git a/.github/actions/install-sdk-linux/action.yml b/.github/actions/install-sdk-linux/action.yml new file mode 100644 index 000000000..dab909987 --- /dev/null +++ b/.github/actions/install-sdk-linux/action.yml @@ -0,0 +1,46 @@ +--- +name: 'install-sdk-linux' +description: 'Download and unpack the Linux MESA SDK and its required dependencies' + +inputs: + sdk: + description: 'The version of the MESA SDK to install' + required: true + +runs: + using: 'composite' + steps: + - name: Install dependencies + run: | + sudo apt-get -y update + sudo apt-get -y install wget binutils make perl libx11-6 libx11-dev zlib1g zlib1g-dev tcsh + sudo apt-get -y autoremove + sudo apt-get clean + shell: bash + + - uses: actions/cache@v4 + id: cache + with: + path: | + mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz + key: sdk-linux-${{inputs.sdk}} + + - name: Download SDK '${{ inputs.sdk }}' + shell: bash + if: ${{ (steps.cache.outputs.cache-hit != 'true') }} + run: | + declare -A version + version[26.3.2]="https://zenodo.org/records/19210930" + version[26.6.1]="https://zenodo.org/records/20598423" + + curl -O ${version[${{inputs.sdk}}]}/files/mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz + + - name: Unpack SDK + run: | + tar xvf mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz + shell: bash + + - name: Set SDK environment + run: | + echo "MESASDK_ROOT=$(readlink -f mesasdk-${{ inputs.sdk }})" >> $GITHUB_ENV + shell: bash diff --git a/.github/actions/install-sdk-macos/action.yml b/.github/actions/install-sdk-macos/action.yml new file mode 100644 index 000000000..17aa38729 --- /dev/null +++ b/.github/actions/install-sdk-macos/action.yml @@ -0,0 +1,45 @@ +--- +name: 'install-sdk-macos' +description: 'Download and unpack the MacOS MESA SDK and its required dependencies' + +inputs: + sdk: + description: 'The version of the MESA SDK to install' + required: true + +runs: + using: 'composite' + steps: + - name: Install dependencies + run: | + brew install --cask xquartz + brew install gnu-sed bash + shell: bash + + - uses: actions/cache@v4 + id: cache + with: + path: | + mesasdk-aarch64-macos-${{inputs.sdk}}.pkg + key: sdk-macos-${{inputs.sdk}} + + - name: Download SDK + shell: bash + if: ${{ (steps.cache.outputs.cache-hit != 'true') }} + run: | + declare -A version + version[26.3.2]="https://zenodo.org/records/19210744" + version[26.6.1]="https://zenodo.org/records/20598224" + + curl -O ${version[${{inputs.sdk}}]}/files/mesasdk-aarch64-macos-${{inputs.sdk}}.pkg + + - name: Unpack SDK + run: | + sudo installer -pkg mesasdk-aarch64-macos-${{inputs.sdk}}.pkg -target / + ln -s /Applications/mesasdk mesasdk + shell: bash + + - name: Set SDK environment + run: | + echo "MESASDK_ROOT=$(readlink -f mesasdk)" >> $GITHUB_ENV + shell: bash From 68ae56f910ad95b3109efc06a7558f0f6e32cd88 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Wed, 10 Jun 2026 09:26:07 -0500 Subject: [PATCH 15/18] Changed SDK to 26.6.1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b7471b87..9e43f5c0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - sdk: ["26.3.2"] # pick 2 or 3 most recent. + sdk: ["26.6.1"] # pick 2 or 3 most recent. os: [ubuntu-latest, macos-latest] dynamic: ["yes", "no"] runs-on: ${{ matrix.os }} From 77c2d828ef61c9ff0430439833792a83fa7db3b6 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Thu, 11 Jun 2026 08:06:24 -0500 Subject: [PATCH 16/18] Removed stale gyre-9.1 archive --- gyre/gyre-9.1.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 gyre/gyre-9.1.tar.gz diff --git a/gyre/gyre-9.1.tar.gz b/gyre/gyre-9.1.tar.gz deleted file mode 100644 index 8b4b32864..000000000 --- a/gyre/gyre-9.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8705023f258141b646fa2289dc81ed313609e24c9edf62fb79e88ba7c8fc86ca -size 4850501 From b1b9e01fbf0d40489c39f263d6f0a09d0c9163be Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Thu, 11 Jun 2026 14:35:03 -0500 Subject: [PATCH 17/18] Updated changelog to mention GYRE 9.1.1 and the bit-for-bit capabilities of MESA SDK 26.6.1 --- docs/source/changelog.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index b8dc582e5..587b97564 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -35,6 +35,10 @@ Diffusive overshooting (overmixing) prescriptions now support a MESA no longer stops when reactions for which special rates are set are not in the nuclear network, only a warning is printed. This is intended to make it easier to test various network sizes without having to also change the list of special reactions. +GYRE has been upgraded to 9.1.1, the most recent stable release. Changes since the previous release (8.1) included in MESA can be seen `here `__. + +The `MESA SDK `__ recommended for compiling MESA has been updated to 26.6.1. Although this newer SDK is not required to successfully build MESA, it brings the benefit of restoring the cross-platform bit-for-bit compatibility that MESA once enjoyed (meaning that runs on Linux/Intel, MacOS/Intel and MacOS/ARM give identical results). + .. _Bug Fixes main: Bug Fixes @@ -48,7 +52,6 @@ The parameter ``report_max_infall_inside_fe_core`` was ignored in versions r25.1 ``fe_core_infall_limit`` now obeys ``when_to_stop_rtol`` and ``when_to_stop_atol`` again (broken since r11532). - .. note:: Before releasing a new version of MESA, move `Changes in main` to a new section below with the version number as the title, and add a new `Changes in main` section at the top of the file (see ``changelog_template.rst``). Changes in r26.4.1 From bab48b86215d264e4ad43c785377ceaff06ecb30 Mon Sep 17 00:00:00 2001 From: Rich Townsend Date: Thu, 11 Jun 2026 14:36:04 -0500 Subject: [PATCH 18/18] Removed old SDK links from build actions --- .github/actions/install-sdk-linux/action.yml | 1 - .github/actions/install-sdk-macos/action.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/actions/install-sdk-linux/action.yml b/.github/actions/install-sdk-linux/action.yml index dab909987..4b2a94831 100644 --- a/.github/actions/install-sdk-linux/action.yml +++ b/.github/actions/install-sdk-linux/action.yml @@ -30,7 +30,6 @@ runs: if: ${{ (steps.cache.outputs.cache-hit != 'true') }} run: | declare -A version - version[26.3.2]="https://zenodo.org/records/19210930" version[26.6.1]="https://zenodo.org/records/20598423" curl -O ${version[${{inputs.sdk}}]}/files/mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz diff --git a/.github/actions/install-sdk-macos/action.yml b/.github/actions/install-sdk-macos/action.yml index 17aa38729..b3475d9c0 100644 --- a/.github/actions/install-sdk-macos/action.yml +++ b/.github/actions/install-sdk-macos/action.yml @@ -28,7 +28,6 @@ runs: if: ${{ (steps.cache.outputs.cache-hit != 'true') }} run: | declare -A version - version[26.3.2]="https://zenodo.org/records/19210744" version[26.6.1]="https://zenodo.org/records/20598224" curl -O ${version[${{inputs.sdk}}]}/files/mesasdk-aarch64-macos-${{inputs.sdk}}.pkg